diff options
| author | miozune <miozune@gmail.com> | 2022-09-12 21:18:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 14:18:56 +0200 |
| commit | 1e57136017b7eba9e9c3aeaeb5ff0508636bcc8d (patch) | |
| tree | 706bd8f143b110449cc1c6bb6f2496c78b660c4c /src/main | |
| parent | 150d0185d7183b5840c58db8478728816f9b54b9 (diff) | |
| download | GT5-Unofficial-1e57136017b7eba9e9c3aeaeb5ff0508636bcc8d.tar.gz GT5-Unofficial-1e57136017b7eba9e9c3aeaeb5ff0508636bcc8d.tar.bz2 GT5-Unofficial-1e57136017b7eba9e9c3aeaeb5ff0508636bcc8d.zip | |
Fix machine item NBT not being saved (#344)
Diffstat (limited to 'src/main')
3 files changed, 16 insertions, 23 deletions
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 5113755c33..80a4efd515 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -41,7 +41,6 @@ public class CORE { public static Configuration Config; public static boolean DEVENV = false; - public static boolean NBT_PERSISTENCY_PATCH_APPLIED = false; // Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false; ; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index 22537dc5cf..f46ba27204 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -165,13 +165,11 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { @Override public void setItemNBT(NBTTagCompound aNBT) { - if (CORE.NBT_PERSISTENCY_PATCH_APPLIED) { - if (mFluid != null) { - Logger.WARNING("Setting item fluid nbt"); - aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound())); - if (aNBT.hasKey("mFluid")) { - Logger.WARNING("Set mFluid to NBT."); - } + if (mFluid != null) { + Logger.WARNING("Setting item fluid nbt"); + aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound())); + if (aNBT.hasKey("mFluid")) { + Logger.WARNING("Set mFluid to NBT."); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java index 775c10666e..04c75f52f8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java @@ -335,13 +335,11 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { @Override public void saveNBTData(final NBTTagCompound aNBT) { aNBT.setByte("aCurrentOutputAmperage", aCurrentOutputAmperage); - if (CORE.NBT_PERSISTENCY_PATCH_APPLIED) { - long aEU = this.getBaseMetaTileEntity().getStoredEU(); - if (aEU > 0) { - aNBT.setLong("aStoredEU", aEU); - if (aNBT.hasKey("aStoredEU")) { - Logger.WARNING("Set aStoredEU to NBT."); - } + long aEU = this.getBaseMetaTileEntity().getStoredEU(); + if (aEU > 0) { + aNBT.setLong("aStoredEU", aEU); + if (aNBT.hasKey("aStoredEU")) { + Logger.WARNING("Set aStoredEU to NBT."); } } } @@ -506,14 +504,12 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { @Override public void setItemNBT(NBTTagCompound aNBT) { - if (CORE.NBT_PERSISTENCY_PATCH_APPLIED) { - aNBT.setByte("aCurrentOutputAmperage", aCurrentOutputAmperage); - long aEU = this.getBaseMetaTileEntity().getStoredEU(); - if (aEU > 0) { - aNBT.setLong("aStoredEU", aEU); - if (aNBT.hasKey("aStoredEU")) { - Logger.WARNING("Set aStoredEU to NBT."); - } + aNBT.setByte("aCurrentOutputAmperage", aCurrentOutputAmperage); + long aEU = this.getBaseMetaTileEntity().getStoredEU(); + if (aEU > 0) { + aNBT.setLong("aStoredEU", aEU); + if (aNBT.hasKey("aStoredEU")) { + Logger.WARNING("Set aStoredEU to NBT."); } } } |