Fixed the network CME (badly), also added "dustWood" as an OreDict entry for Sawdust
This commit is contained in:
parent
229913d84a
commit
e032eb0370
4 changed files with 12 additions and 8 deletions
|
@ -6,14 +6,15 @@ import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import mekanism.api.Coord4D;
|
import mekanism.api.Coord4D;
|
||||||
import mekanism.api.util.ListUtils;
|
|
||||||
import mekanism.api.transmitters.DynamicNetwork;
|
import mekanism.api.transmitters.DynamicNetwork;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.api.transmitters.ITransmitterNetwork;
|
import mekanism.api.transmitters.ITransmitterNetwork;
|
||||||
import mekanism.api.transmitters.TransmissionType;
|
import mekanism.api.transmitters.TransmissionType;
|
||||||
|
import mekanism.api.util.ListUtils;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
@ -279,7 +280,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
|
||||||
Gas type = (Gas)data[0];
|
Gas type = (Gas)data[0];
|
||||||
Set<IGasHandler> toReturn = new HashSet<IGasHandler>();
|
Set<IGasHandler> toReturn = new HashSet<IGasHandler>();
|
||||||
|
|
||||||
for(IGasHandler acceptor : possibleAcceptors.values())
|
for(IGasHandler acceptor : ((Map<Coord4D, IGasHandler>)possibleAcceptors.clone()).values())
|
||||||
{
|
{
|
||||||
if(acceptorDirections.get(acceptor) == null)
|
if(acceptorDirections.get(acceptor) == null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package mekanism.common;
|
package mekanism.common;
|
||||||
|
|
||||||
import buildcraft.api.mj.IBatteryObject;
|
|
||||||
import buildcraft.api.mj.MjAPI;
|
|
||||||
import ic2.api.energy.EnergyNet;
|
import ic2.api.energy.EnergyNet;
|
||||||
import ic2.api.energy.tile.IEnergySink;
|
import ic2.api.energy.tile.IEnergySink;
|
||||||
|
|
||||||
|
@ -11,20 +9,23 @@ import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import mekanism.api.Coord4D;
|
import mekanism.api.Coord4D;
|
||||||
import mekanism.api.MekanismConfig.general;
|
import mekanism.api.MekanismConfig.general;
|
||||||
import mekanism.api.util.ListUtils;
|
|
||||||
import mekanism.api.energy.IStrictEnergyAcceptor;
|
import mekanism.api.energy.IStrictEnergyAcceptor;
|
||||||
import mekanism.api.transmitters.DynamicNetwork;
|
import mekanism.api.transmitters.DynamicNetwork;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.api.transmitters.TransmissionType;
|
import mekanism.api.transmitters.TransmissionType;
|
||||||
|
import mekanism.api.util.ListUtils;
|
||||||
import mekanism.common.util.CableUtils;
|
import mekanism.common.util.CableUtils;
|
||||||
import mekanism.common.util.MekanismUtils;
|
import mekanism.common.util.MekanismUtils;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
import buildcraft.api.mj.IBatteryObject;
|
||||||
|
import buildcraft.api.mj.MjAPI;
|
||||||
import cofh.api.energy.IEnergyHandler;
|
import cofh.api.energy.IEnergyHandler;
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.eventhandler.Event;
|
import cpw.mods.fml.common.eventhandler.Event;
|
||||||
|
@ -234,7 +235,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||||
return toReturn;
|
return toReturn;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(TileEntity acceptor : possibleAcceptors.values())
|
for(TileEntity acceptor : ((Map<Coord4D, TileEntity>)possibleAcceptors.clone()).values())
|
||||||
{
|
{
|
||||||
ForgeDirection side = acceptorDirections.get(acceptor);
|
ForgeDirection side = acceptorDirections.get(acceptor);
|
||||||
|
|
||||||
|
|
|
@ -6,14 +6,15 @@ import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import mekanism.api.Coord4D;
|
import mekanism.api.Coord4D;
|
||||||
import mekanism.api.util.ListUtils;
|
|
||||||
import mekanism.api.transmitters.DynamicNetwork;
|
import mekanism.api.transmitters.DynamicNetwork;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.api.transmitters.ITransmitterNetwork;
|
import mekanism.api.transmitters.ITransmitterNetwork;
|
||||||
import mekanism.api.transmitters.TransmissionType;
|
import mekanism.api.transmitters.TransmissionType;
|
||||||
|
import mekanism.api.util.ListUtils;
|
||||||
import mekanism.common.util.PipeUtils;
|
import mekanism.common.util.PipeUtils;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
@ -291,7 +292,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
|
||||||
FluidStack fluidToSend = (FluidStack)data[0];
|
FluidStack fluidToSend = (FluidStack)data[0];
|
||||||
Set<IFluidHandler> toReturn = new HashSet<IFluidHandler>();
|
Set<IFluidHandler> toReturn = new HashSet<IFluidHandler>();
|
||||||
|
|
||||||
for(IFluidHandler acceptor : possibleAcceptors.values())
|
for(IFluidHandler acceptor : ((Map<Coord4D, IFluidHandler>)possibleAcceptors.clone()).values())
|
||||||
{
|
{
|
||||||
if(acceptorDirections.get(acceptor) == null)
|
if(acceptorDirections.get(acceptor) == null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -779,6 +779,7 @@ public class Mekanism
|
||||||
OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0));
|
OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0));
|
||||||
OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem());
|
OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem());
|
||||||
OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust);
|
OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust);
|
||||||
|
OreDictionary.registerOre("dustWood", MekanismItems.Sawdust);
|
||||||
OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock);
|
OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock);
|
||||||
|
|
||||||
//Alloys!
|
//Alloys!
|
||||||
|
|
Loading…
Reference in a new issue