From 590da72fbb5f5c4170eff27336fcfedc90467f70 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 12 Jun 2025 16:11:02 +0200 Subject: [PATCH] whatever, go my jerma --- changelog | 4 +++- src/main/java/com/hbm/blocks/network/BlockCableGauge.java | 6 +++--- src/main/java/com/hbm/blocks/network/FluidDuctGauge.java | 6 +++--- .../machine/TileEntityMachineChemicalPlant.java | 8 ++++++-- src/main/java/com/hbm/util/ShadyUtil.java | 3 +-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/changelog b/changelog index 5fcf22212..dd49c2343 100644 --- a/changelog +++ b/changelog @@ -2,4 +2,6 @@ * The DNT suit now has a damage threshold of 1,000 ## Fixed -* Chemical plant ports. For real this time. \ No newline at end of file +* Chemical plant ports. For real this time. +* Fixed cable and pipe gauges returning the incomplete delta second value for OC and ROR readers +* Fixed new chemical plant not saving power values to disk \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/network/BlockCableGauge.java b/src/main/java/com/hbm/blocks/network/BlockCableGauge.java index 42e3a6573..2e7048be3 100644 --- a/src/main/java/com/hbm/blocks/network/BlockCableGauge.java +++ b/src/main/java/com/hbm/blocks/network/BlockCableGauge.java @@ -155,13 +155,13 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass, @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getTransfer(Context context, Arguments args) { - return new Object[] {deltaTick, deltaSecond}; + return new Object[] {deltaTick, deltaLastSecond}; } @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getInfo(Context context, Arguments args) { - return new Object[] {deltaTick, deltaSecond, xCoord, yCoord, zCoord}; + return new Object[] {deltaTick, deltaLastSecond, xCoord, yCoord, zCoord}; } @Override @@ -175,7 +175,7 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass, @Override public String provideRORValue(String name) { if((PREFIX_VALUE + "deltatick").equals(name)) return "" + deltaTick; - if((PREFIX_VALUE + "deltasecond").equals(name)) return "" + deltaSecond; + if((PREFIX_VALUE + "deltasecond").equals(name)) return "" + deltaLastSecond; return null; } } diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java b/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java index 122d9031d..5e9e0b483 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java @@ -155,7 +155,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getTransfer(Context context, Arguments args) { - return new Object[] {deltaTick, deltaSecond}; + return new Object[] {deltaTick, deltaLastSecond}; } @Callback(direct = true) @@ -167,7 +167,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getInfo(Context context, Arguments args) { - return new Object[] {deltaTick, deltaSecond, getType().getName(), xCoord, yCoord, zCoord}; + return new Object[] {deltaTick, deltaLastSecond, getType().getName(), xCoord, yCoord, zCoord}; } @Override @@ -181,7 +181,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL @Override public String provideRORValue(String name) { if((PREFIX_VALUE + "deltatick").equals(name)) return "" + deltaTick; - if((PREFIX_VALUE + "deltasecond").equals(name)) return "" + deltaSecond; + if((PREFIX_VALUE + "deltasecond").equals(name)) return "" + deltaLastSecond; return null; } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java index ef7bdd827..7d6c0d0e3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java @@ -158,7 +158,9 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem this.inputTanks[i].readFromNBT(nbt, "i" + i); this.outputTanks[i].readFromNBT(nbt, "o" + i); } - + + this.power = nbt.getLong("power"); + this.maxPower = nbt.getLong("maxPower"); this.chemplantModule.readFromNBT(nbt); } @@ -170,7 +172,9 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem this.inputTanks[i].writeToNBT(nbt, "i" + i); this.outputTanks[i].writeToNBT(nbt, "o" + i); } - + + nbt.setLong("power", power); + nbt.setLong("maxPower", maxPower); this.chemplantModule.writeToNBT(nbt); } diff --git a/src/main/java/com/hbm/util/ShadyUtil.java b/src/main/java/com/hbm/util/ShadyUtil.java index de5bedf6a..03a2390ab 100644 --- a/src/main/java/com/hbm/util/ShadyUtil.java +++ b/src/main/java/com/hbm/util/ShadyUtil.java @@ -3,7 +3,6 @@ package com.hbm.util; import com.google.common.collect.Sets; import com.hbm.config.GeneralConfig; import com.hbm.main.MainRegistry; -import com.hbm.main.ModEventHandler; import cpw.mods.fml.relauncher.ReflectionHelper; import java.lang.reflect.Field; @@ -147,7 +146,7 @@ public class ShadyUtil { System.out.println("TEST SECTION START"); Class toLoad = Class.forName(decode(offset(testCase, -2))); Field toRead = ReflectionHelper.findField(toLoad, decode(offset(testValue, -2))); - if(new Random().nextInt(4) == 0) ModEventHandler.reference = toRead; + //ModEventHandler.reference = toRead; System.out.println("TEST SECTION END"); } } catch(Throwable e) { }