From b295d6545698eccc7e560a5404e7201664fe3d20 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 16 Aug 2017 22:55:51 -0400 Subject: [PATCH] Fixed machine energy usage bug. May be worth porting back to 1.11 --- .../common/tile/TileEntityChemicalDissolutionChamber.java | 3 +++ src/main/java/mekanism/common/tile/TileEntityFactory.java | 3 +++ .../java/mekanism/common/tile/prefab/TileEntityMachine.java | 4 ++++ .../common/tile/prefab/TileEntityOperationalMachine.java | 3 +++ 4 files changed, 13 insertions(+) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 883a79c57..211770d34 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -386,6 +386,9 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl switch(upgrade) { + case ENERGY: + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); // incorporate speed upgrades + break; case GAS: injectUsage = MekanismUtils.getSecondaryEnergyPerTickMean(this, BASE_INJECT_USAGE); break; diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 0ad8a8a4f..dbfb9d12f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -1045,6 +1045,9 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt switch(upgrade) { + case ENERGY: + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); // incorporate speed upgrades + break; case GAS: secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); break; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java index 2793c1316..659108639 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java @@ -126,6 +126,8 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements { clientActive = dataStream.readBoolean(); controlType = RedstoneControl.values()[dataStream.readInt()]; + energyPerTick = dataStream.readDouble(); + maxEnergy = dataStream.readDouble(); if(updateDelay == 0 && clientActive != isActive) { @@ -143,6 +145,8 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements data.add(isActive); data.add(controlType.ordinal()); + data.add(energyPerTick); + data.add(maxEnergy); return data; } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java index 403225b62..28690a360 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java @@ -77,6 +77,9 @@ public class TileEntityOperationalMachine extends TileEntityMachine switch(upgrade) { + case ENERGY: + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); // incorporate speed upgrades + break; case SPEED: ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK);