From 15b6f7e70c0fdcc142aa8d7b01fcbfc5617dd2de Mon Sep 17 00:00:00 2001 From: Brian Lewis Date: Fri, 28 Nov 2014 12:13:34 -0600 Subject: [PATCH 1/3] Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned --- .../common/tile/TileEntityGasGenerator.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 8f6dbd8ee..8f895b1a7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -74,7 +74,12 @@ 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; + } } } @@ -95,6 +100,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { burnTicks = fuel.burnTicks - 1; generationRate = fuel.energyPerTick; + //output = generationRate * 2; fuelTank.draw(1, true); setEnergy(getEnergy() + generationRate); } @@ -208,6 +214,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } generationRate = dataStream.readDouble(); + output = dataStream.readDouble(); } @Override @@ -226,6 +233,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } data.add(generationRate); + data.add(output); return data; } @@ -233,9 +241,14 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public int receiveGas(ForgeDirection side, GasStack stack) { - if(fuelTank.getGas() == null || fuelTank.getGas().isGasEqual(stack)) + boolean isTankEmpty = (fuelTank.getGas() == null); + if (isTankEmpty || fuelTank.getGas().isGasEqual(stack)) { - return fuelTank.receive(stack, true); + int fuelReceived = fuelTank.receive(stack, true); + if (isTankEmpty && fuelReceived > 0) { + output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick * 2; + } + return fuelReceived; } return 0; @@ -247,6 +260,10 @@ 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 From 681d7e99636b920358c5a5a3c7241f7d13196758 Mon Sep 17 00:00:00 2001 From: Brian Lewis Date: Fri, 28 Nov 2014 12:20:29 -0600 Subject: [PATCH 2/3] Removed commented out test line --- .../mekanism/generators/common/tile/TileEntityGasGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 8f895b1a7..9cdf82744 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -100,7 +100,6 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { burnTicks = fuel.burnTicks - 1; generationRate = fuel.energyPerTick; - //output = generationRate * 2; fuelTank.draw(1, true); setEnergy(getEnergy() + generationRate); } From 0cef7492492a08682a1133a0ca0c20f6e61d3099 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 13 Feb 2015 14:40:14 +0000 Subject: [PATCH 3/3] Actually increment the Mod classes' versions --- src/main/java/mekanism/common/Mekanism.java | 4 ++-- .../java/mekanism/generators/common/MekanismGenerators.java | 4 ++-- src/main/java/mekanism/tools/common/MekanismTools.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index cbbb1daaa..c4e7a1f5d 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -161,7 +161,7 @@ import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "7.1.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "7.1.2", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraftAPI|power;after:BuildCraftAPI|tools;after:BuildCraftAPI|transport;after:IC2API;after:CoFHAPI|energy;after:ComputerCraft;after:Galacticraft API;" + "after:MineFactoryReloaded;after:MetallurgyCore;after:EnderIO;after:ExtraUtilities;after:Railcraft;after:Forestry;after:RedstoneArsenal") public class Mekanism @@ -190,7 +190,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(7, 1, 1); + public static Version versionNumber = new Version(7, 1, 2); /** Map of Teleporters */ public static Map> teleporters = new HashMap>(); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f1490815d..a9214f326 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -42,7 +42,7 @@ import io.netty.buffer.ByteBuf; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "7.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "7.1.2", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -52,7 +52,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(7, 1, 1); + public static Version versionNumber = new Version(7, 1, 2); //Items public static Item SolarPanel; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 6fe739d72..d8a46f1d2 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import io.netty.buffer.ByteBuf; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.1.2", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -47,7 +47,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(7, 1, 1); + public static Version versionNumber = new Version(7, 1, 2); //Enums: Tools public static ToolMaterial toolOBSIDIAN;