Merge pull request #820 from GTNewHorizons/patch-multistack-preference

Add allow multistack to client preference

3 files changed, 13 insertions, 3 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
index c8ba101b9e..d4f19c5fbe 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
@@ -430,8 +430,10 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
         mMainFacing = -1;
         if (!getBaseMetaTileEntity().getWorld().isRemote) {
             GT_ClientPreference tPreference = GT_Mod.gregtechproxy.getClientPreference(getBaseMetaTileEntity().getOwnerUuid());
-            if (tPreference != null)
+            if (tPreference != null) {
                 mDisableFilter = !tPreference.isSingleBlockInitialFilterEnabled();
+                mDisableMultiStack = !tPreference.isSingleBlockInitialMultiStackEnabled();
+            }
         }
     }
 
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
index a97cfb207b..5f2549d13c 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_ClientPreference.java
@@ -43,11 +43,12 @@ public class GT_Packet_ClientPreference extends GT_Packet_New {
     @Override
     public void encode(ByteBuf aOut) {
         aOut.writeBoolean(mPreference.isSingleBlockInitialFilterEnabled());
+        aOut.writeBoolean(mPreference.isSingleBlockInitialMultiStackEnabled());
         aOut.writeBoolean(mPreference.isInputBusInitialFilterEnabled());
     }
 
     @Override
     public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_ClientPreference(new GT_ClientPreference(aData.readBoolean(), aData.readBoolean()));
+        return new GT_Packet_ClientPreference(new GT_ClientPreference(aData.readBoolean(), aData.readBoolean(), aData.readBoolean()));
     }
 }
diff --git a/src/main/java/gregtech/api/util/GT_ClientPreference.java b/src/main/java/gregtech/api/util/GT_ClientPreference.java
index e679f4ece6..26c7fa3da5 100644
--- a/src/main/java/gregtech/api/util/GT_ClientPreference.java
+++ b/src/main/java/gregtech/api/util/GT_ClientPreference.java
@@ -2,15 +2,18 @@ package gregtech.api.util;
 
 public class GT_ClientPreference {
     private final boolean mSingleBlockInitialFilter;
+    private final boolean mSingleBlockInitialMultiStack;
     private final boolean mInputBusInitialFilter;
 
-    public GT_ClientPreference(boolean mSingleBlockInitialFilter, boolean mInputBusInitialFilter) {
+    public GT_ClientPreference(boolean mSingleBlockInitialFilter, boolean mSingleBlockInitialMultiStack, boolean mInputBusInitialFilter) {
         this.mSingleBlockInitialFilter = mSingleBlockInitialFilter;
+        this.mSingleBlockInitialMultiStack = mSingleBlockInitialMultiStack;
         this.mInputBusInitialFilter = mInputBusInitialFilter;
     }
 
     public GT_ClientPreference(GT_Config aClientDataFile) {
         this.mSingleBlockInitialFilter = aClientDataFile.get("preference", "mSingleBlockInitialFilter", false);
+        this.mSingleBlockInitialMultiStack = aClientDataFile.get("preference", "mSingleBlockInitialAllowMultiStack", false);
         this.mInputBusInitialFilter = aClientDataFile.get("preference", "mInputBusInitialFilter", true);
     }
 
@@ -18,6 +21,10 @@ public class GT_ClientPreference {
         return mSingleBlockInitialFilter;
     }
 
+    public boolean isSingleBlockInitialMultiStackEnabled() {
+        return mSingleBlockInitialMultiStack;
+    }
+
     public boolean isInputBusInitialFilterEnabled() {
         return mInputBusInitialFilter;
     }