diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-08-31 01:48:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-30 17:48:23 +0000 |
| commit | 9fee35c065e197199f57ef1df31ac303e94d1d50 (patch) | |
| tree | 66437da0c2422d10ddfc9211040ebbd180af5f54 /src/main/java/com | |
| parent | 55ebcb3bdf0f54b76642c03b3a58112081138c10 (diff) | |
| download | GT5-Unofficial-9fee35c065e197199f57ef1df31ac303e94d1d50.tar.gz GT5-Unofficial-9fee35c065e197199f57ef1df31ac303e94d1d50.tar.bz2 GT5-Unofficial-9fee35c065e197199f57ef1df31ac303e94d1d50.zip | |
Add duration since last shutdown (#2977)
* machine message
* fix & prass channel
* machine message
* fix & prass channel
* fix machines that dont use regular onPostTick
* follow error fixes and fix hatch check
* oops
* sa
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/com')
2 files changed, 20 insertions, 4 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java index b6216f3c42..93d7318715 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java @@ -1,8 +1,11 @@ package com.github.bartimaeusnek.bartworks.util; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.util.StatCollector; +import org.jetbrains.annotations.NotNull; + import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.util.GT_Utility; @@ -21,7 +24,7 @@ public class ResultWrongSievert implements CheckRecipeResult { this.type = type; } - public String getID() { + public @NotNull String getID() { return "wrong_sievert"; } @@ -31,7 +34,7 @@ public class ResultWrongSievert implements CheckRecipeResult { } @Override - public String getDisplayString() { + public @NotNull String getDisplayString() { return switch (this.type) { case EXACTLY -> StatCollector.translateToLocalFormatted( "GT5U.gui.text.wrong_sievert_exactly", @@ -42,12 +45,24 @@ public class ResultWrongSievert implements CheckRecipeResult { } @Override - public CheckRecipeResult newInstance() { + public @NotNull NBTTagCompound writeToNBT(@NotNull NBTTagCompound tag) { + tag.setInteger("required", required); + tag.setInteger("type", type.ordinal()); + return tag; + } + + @Override + public void readFromNBT(@NotNull NBTTagCompound tag) { + required = tag.getInteger("required"); + } + + @Override + public @NotNull CheckRecipeResult newInstance() { return new ResultWrongSievert(0, NeededSievertType.EXACTLY); } @Override - public void encode(PacketBuffer buffer) { + public void encode(@NotNull PacketBuffer buffer) { buffer.writeVarIntToBuffer(this.required); buffer.writeVarIntToBuffer(this.type.ordinal()); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index ad0c5a0c97..fc91adb69f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -1073,6 +1073,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { + mTotalRunTime++; explodedThisTick = false; if (mEfficiency < 0) { mEfficiency = 0; |
