diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 90ed973ac..710ea6931 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -300,7 +300,7 @@ public class GasNetwork extends DynamicNetwork return toReturn; } - for(Coord4D coord : ((Map)possibleAcceptors.clone()).keySet()) + for(Coord4D coord : possibleAcceptors.keySet()) { EnumSet sides = acceptorDirections.get(coord); IGasHandler acceptor = (IGasHandler)coord.getTileEntity(getWorld()); diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 9ed5649b1..ca96c95f9 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -238,7 +238,7 @@ public class EnergyNetwork extends DynamicNetwork return toReturn; } - for(Coord4D coord : ((Map)possibleAcceptors.clone()).keySet()) + for(Coord4D coord : possibleAcceptors.keySet()) { EnumSet sides = acceptorDirections.get(coord); TileEntity acceptor = coord.getTileEntity(getWorld()); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index c1d138020..4a37c3c94 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -317,7 +317,7 @@ public class FluidNetwork extends DynamicNetwork return toReturn; } - for(Coord4D coord : ((Map)possibleAcceptors.clone()).keySet()) + for(Coord4D coord : possibleAcceptors.keySet()) { EnumSet sides = acceptorDirections.get(coord); IFluidHandler acceptor = (IFluidHandler)coord.getTileEntity(getWorld()); diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 0859f7c54..91159e54a 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -57,7 +57,7 @@ public class InventoryNetwork extends DynamicNetwork toReturn = new ArrayList(); - for(Coord4D coord : ((Map)possibleAcceptors.clone()).keySet()) + for(Coord4D coord : possibleAcceptors.keySet()) { EnumSet sides = acceptorDirections.get(coord); IInventory acceptor = (IInventory)coord.getTileEntity(getWorld()); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index cc20a716d..0ede5f215 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -75,7 +75,13 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH if(gasType != null && FuelHandler.getFuel(gasType) != null) { GasStack removed = GasTransmission.removeGas(inventory[0], gasType, fuelTank.getNeeded()); - fuelTank.receive(removed, true); + boolean isTankEmpty = (fuelTank.getGas() == null); + int fuelReceived = fuelTank.receive(removed, true); + + if(fuelReceived > 0 && isTankEmpty) + { + output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick * 2; + } } } @@ -209,6 +215,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } generationRate = dataStream.readDouble(); + output = dataStream.readDouble(); } @Override @@ -227,6 +234,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } data.add(generationRate); + data.add(output); return data; } @@ -234,9 +242,18 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { - if(fuelTank.getGas() == null || fuelTank.getGas().isGasEqual(stack)) + boolean isTankEmpty = (fuelTank.getGas() == null); + + if(isTankEmpty || fuelTank.getGas().isGasEqual(stack)) { - return fuelTank.receive(stack, doTransfer); + int fuelReceived = fuelTank.receive(stack, true); + + if (isTankEmpty && fuelReceived > 0) + { + output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick * 2; + } + + return fuelReceived; } return 0; @@ -248,6 +265,12 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH super.readFromNBT(nbtTags); fuelTank.read(nbtTags.getCompoundTag("fuelTank")); + FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas()); + + if(fuel != null) + { + output = fuel.energyPerTick * 2; + } } @Override