xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

whatever, go my jerma

Browse Source
This commit is contained in:
Boblet 2025-06-12 16:11:02 +02:00
parent f4af494d2a
commit 590da72fbb
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog
View File

@ -2,4 +2,6 @@
* The DNT suit now has a damage threshold of 1,000 * The DNT suit now has a damage threshold of 1,000
## Fixed ## Fixed
* Chemical plant ports. For real this time. * 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

6
src/main/java/com/hbm/blocks/network/BlockCableGauge.java
View File

@ -155,13 +155,13 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass,
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] getTransfer(Context context, Arguments args) { public Object[] getTransfer(Context context, Arguments args) {
return new Object[] {deltaTick, deltaSecond}; return new Object[] {deltaTick, deltaLastSecond};
} }
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] getInfo(Context context, Arguments args) { public Object[] getInfo(Context context, Arguments args) {
return new Object[] {deltaTick, deltaSecond, xCoord, yCoord, zCoord}; return new Object[] {deltaTick, deltaLastSecond, xCoord, yCoord, zCoord};
} }
@Override @Override
@ -175,7 +175,7 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass,
@Override @Override
public String provideRORValue(String name) { public String provideRORValue(String name) {
if((PREFIX_VALUE + "deltatick").equals(name)) return "" + deltaTick; 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; return null;
} }
} }

6
src/main/java/com/hbm/blocks/network/FluidDuctGauge.java
View File

@ -155,7 +155,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] getTransfer(Context context, Arguments args) { public Object[] getTransfer(Context context, Arguments args) {
return new Object[] {deltaTick, deltaSecond}; return new Object[] {deltaTick, deltaLastSecond};
} }
@Callback(direct = true) @Callback(direct = true)
@ -167,7 +167,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] getInfo(Context context, Arguments args) { 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 @Override
@ -181,7 +181,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL
@Override @Override
public String provideRORValue(String name) { public String provideRORValue(String name) {
if((PREFIX_VALUE + "deltatick").equals(name)) return "" + deltaTick; 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; return null;
} }
} }

8
src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java
View File

@ -158,7 +158,9 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem
this.inputTanks[i].readFromNBT(nbt, "i" + i); this.inputTanks[i].readFromNBT(nbt, "i" + i);
this.outputTanks[i].readFromNBT(nbt, "o" + i); this.outputTanks[i].readFromNBT(nbt, "o" + i);
} }
this.power = nbt.getLong("power");
this.maxPower = nbt.getLong("maxPower");
this.chemplantModule.readFromNBT(nbt); this.chemplantModule.readFromNBT(nbt);
} }
@ -170,7 +172,9 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem
this.inputTanks[i].writeToNBT(nbt, "i" + i); this.inputTanks[i].writeToNBT(nbt, "i" + i);
this.outputTanks[i].writeToNBT(nbt, "o" + i); this.outputTanks[i].writeToNBT(nbt, "o" + i);
} }
nbt.setLong("power", power);
nbt.setLong("maxPower", maxPower);
this.chemplantModule.writeToNBT(nbt); this.chemplantModule.writeToNBT(nbt);
} }

3
src/main/java/com/hbm/util/ShadyUtil.java
View File

@ -3,7 +3,6 @@ package com.hbm.util;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.hbm.config.GeneralConfig; import com.hbm.config.GeneralConfig;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
import com.hbm.main.ModEventHandler;
import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.ReflectionHelper;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -147,7 +146,7 @@ public class ShadyUtil {
System.out.println("TEST SECTION START"); System.out.println("TEST SECTION START");
Class toLoad = Class.forName(decode(offset(testCase, -2))); Class toLoad = Class.forName(decode(offset(testCase, -2)));
Field toRead = ReflectionHelper.findField(toLoad, decode(offset(testValue, -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"); System.out.println("TEST SECTION END");
} }
} catch(Throwable e) { } } catch(Throwable e) { }