aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaffiX <32968022+StaffiX@users.noreply.github.com>2024-11-30 18:38:38 +0100
committerGitHub <noreply@github.com>2024-11-30 17:38:38 +0000
commit1e5222e826a78c1475a084533705f8c1eee40cef (patch)
tree6c952e3164e6e2d12248020348d6053dc59f4e56
parentc769fe87c7eea40656736cea289e62e9e49538ef (diff)
downloadGT5-Unofficial-1e5222e826a78c1475a084533705f8c1eee40cef.tar.gz
GT5-Unofficial-1e5222e826a78c1475a084533705f8c1eee40cef.tar.bz2
GT5-Unofficial-1e5222e826a78c1475a084533705f8c1eee40cef.zip
Fix turbines resetting to tight mode after server restart (#3577)
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java13
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java13
3 files changed, 2 insertions, 26 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java
index 725cf50d44..43086c3340 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java
@@ -271,11 +271,13 @@ public abstract class MTELargeTurbine extends MTEEnhancedMultiBlockBase<MTELarge
@Override
public void saveNBTData(NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
+ aNBT.setBoolean("turbineFitting", looseFit);
}
@Override
public void loadNBTData(NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
+ looseFit = aNBT.getBoolean("turbineFitting");
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java
index 731d6daeb9..6e5404f992 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineHPSteam.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
@@ -195,16 +194,4 @@ public class MTELargeTurbineHPSteam extends MTELargeTurbine {
public int getDamageToComponent(ItemStack aStack) {
return (looseFit && XSTR_INSTANCE.nextInt(4) == 0) ? 0 : 1;
}
-
- @Override
- public void saveNBTData(NBTTagCompound aNBT) {
- super.saveNBTData(aNBT);
- aNBT.setBoolean("turbineFitting", looseFit);
- }
-
- @Override
- public void loadNBTData(NBTTagCompound aNBT) {
- super.loadNBTData(aNBT);
- looseFit = aNBT.getBoolean("turbineFitting");
- }
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java
index b0ad701cc9..d2f34d144e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
@@ -208,16 +207,4 @@ public class MTELargeTurbineSteam extends MTELargeTurbine {
public String[] getInfoData() {
return super.getInfoData();
}
-
- @Override
- public void saveNBTData(NBTTagCompound aNBT) {
- super.saveNBTData(aNBT);
- aNBT.setBoolean("turbineFitting", looseFit);
- }
-
- @Override
- public void loadNBTData(NBTTagCompound aNBT) {
- super.loadNBTData(aNBT);
- looseFit = aNBT.getBoolean("turbineFitting");
- }
}