diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 79dbb845d..abc97366a 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -6,14 +6,15 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.ListUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; @@ -279,7 +280,7 @@ public class GasNetwork extends DynamicNetwork Gas type = (Gas)data[0]; Set toReturn = new HashSet(); - for(IGasHandler acceptor : possibleAcceptors.values()) + for(IGasHandler acceptor : ((Map)possibleAcceptors.clone()).values()) { if(acceptorDirections.get(acceptor) == null) { diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index b25c77792..029d358ef 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -1,7 +1,5 @@ package mekanism.common; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.MjAPI; import ic2.api.energy.EnergyNet; import ic2.api.energy.tile.IEnergySink; @@ -11,20 +9,23 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.ListUtils; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.mj.IBatteryObject; +import buildcraft.api.mj.MjAPI; import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; @@ -234,7 +235,7 @@ public class EnergyNetwork extends DynamicNetwork return toReturn; } - for(TileEntity acceptor : possibleAcceptors.values()) + for(TileEntity acceptor : ((Map)possibleAcceptors.clone()).values()) { ForgeDirection side = acceptorDirections.get(acceptor); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index fdfe22d94..edc8bea87 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -6,14 +6,15 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.ListUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; @@ -291,7 +292,7 @@ public class FluidNetwork extends DynamicNetwork FluidStack fluidToSend = (FluidStack)data[0]; Set toReturn = new HashSet(); - for(IFluidHandler acceptor : possibleAcceptors.values()) + for(IFluidHandler acceptor : ((Map)possibleAcceptors.clone()).values()) { if(acceptorDirections.get(acceptor) == null) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 7424ed88b..41055208a 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -779,6 +779,7 @@ public class Mekanism OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0)); OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem()); OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust); + OreDictionary.registerOre("dustWood", MekanismItems.Sawdust); OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock); //Alloys!