Merge back the network fixes
This commit is contained in:
parent
a3c6b9dac2
commit
98ee002472
4 changed files with 7 additions and 3 deletions
|
@ -6,6 +6,7 @@ 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;
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,6 +9,7 @@ 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;
|
||||||
|
@ -233,7 +234,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,6 +6,7 @@ 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;
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1088,6 +1088,7 @@ public class Mekanism
|
||||||
OreDictionary.registerOre("universalCable", new ItemStack(PartTransmitter, 8, 0));
|
OreDictionary.registerOre("universalCable", new ItemStack(PartTransmitter, 8, 0));
|
||||||
OreDictionary.registerOre("battery", EnergyTablet.getUnchargedItem());
|
OreDictionary.registerOre("battery", EnergyTablet.getUnchargedItem());
|
||||||
OreDictionary.registerOre("pulpWood", Sawdust);
|
OreDictionary.registerOre("pulpWood", Sawdust);
|
||||||
|
OreDictionary.registerOre("dustWood", Sawdust);
|
||||||
OreDictionary.registerOre("blockSalt", SaltBlock);
|
OreDictionary.registerOre("blockSalt", SaltBlock);
|
||||||
|
|
||||||
//Alloys!
|
//Alloys!
|
||||||
|
|
Loading…
Reference in a new issue