Fix missing overrides for input separation (#593)

5 files changed, 31 insertions, 11 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
index c3f408e8c9..7aea74c777 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
@@ -275,4 +275,9 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
     public void setCoilLevel(HeatingCoilLevel aCoilLevel) {
         mHeatingCapacity = aCoilLevel;
     }
+
+    @Override
+    protected boolean isInputSeparationEnabled() {
+        return true;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index 6bbedc823a..cb204181bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -209,4 +209,9 @@ public class GregtechMetaTileEntity_IndustrialExtruder extends
     public byte getCasingTextureIndex() {
         return (byte) TAE.GTPP_INDEX(33);
     }
+
+    @Override
+    protected boolean isInputSeparationEnabled() {
+        return true;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index f9b6055ac0..49fa530a74 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -425,4 +425,9 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
         this.mInternalMode = aNBT.getInteger("mInternalMode");
         super.loadNBTData(aNBT);
     }
+
+    @Override
+    protected boolean isInputSeparationEnabled() {
+        return true;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
index f8b3534031..9ab3b26f87 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -217,4 +217,9 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends
         }
         mLastRecipe = null;
     }
+
+    @Override
+    protected boolean isInputSeparationEnabled() {
+        return true;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
index ff2c6b73bc..6be3a57f8c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -44,7 +44,6 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
 
     private int mMode = 0;
     private boolean isUsingControllerCircuit = false;
-    private boolean isBussesSeparate = false;
     private static Item circuit;
     private int mCasing;
     private static IStructureDefinition<GregtechMetaTileEntity_AlloyBlastSmelter> STRUCTURE_DEFINITION = null;
@@ -68,15 +67,11 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
     }
 
     @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-        aNBT.setBoolean("isBussesSeparate", isBussesSeparate);
-    }
-
-    @Override
     public void loadNBTData(final NBTTagCompound aNBT) {
         super.loadNBTData(aNBT);
-        isBussesSeparate = aNBT.getBoolean("isBussesSeparate");
+        if (!aNBT.hasKey(INPUT_SEPARATION_NBT_KEY)) {
+            inputSeparation = aNBT.getBoolean("isBussesSeparate");
+        }
     }
 
     @Override
@@ -195,7 +190,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
             final FluidStack[] tFluids = getCompactedFluids();
             GT_Recipe tRecipe = null;
 
-            if (isBussesSeparate) {
+            if (inputSeparation) {
                 for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) {
                     tInputList = new ArrayList<>();
                     tBus.mRecipeMap = getRecipeMap();
@@ -290,10 +285,10 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
 
     @Override
     public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        isBussesSeparate = !isBussesSeparate;
+        inputSeparation = !inputSeparation;
         GT_Utility.sendChatToPlayer(
                 aPlayer,
-                StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + isBussesSeparate);
+                StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
     }
 
     @Override
@@ -330,4 +325,9 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends
     public boolean explodesOnComponentBreak(final ItemStack aStack) {
         return false;
     }
+
+    @Override
+    protected boolean isInputSeparationButtonEnabled() {
+        return true;
+    }
 }