From d4625eb0284863725f4d978283ad8296ef89b502 Mon Sep 17 00:00:00 2001
From: Richard Hendricks <richardhendricks@pobox.com>
Date: Wed, 20 Jun 2018 02:12:04 -0500
Subject: New feature for chestbuffers/superbuffers:Transfer size mode. 
 Instead of matching the output inventory, this mode will only transfer fixed
 sizes to output invetory. Useful for input hatches to Amazon Packager or PA
 filled with packagers.

---
 .../implementations/GT_MetaTileEntity_Buffer.java  | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/main/java/gregtech/api/metatileentity')

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
index e0f7037cdf..73ab28822a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
@@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import static gregtech.api.enums.GT_Values.V;
 
 public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredMachineBlock {
-    public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false;
+    public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bStockingMode = true;
     public int mSuccess = 0, mTargetStackSize = 0;
 
     public GT_MetaTileEntity_Buffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
@@ -192,6 +192,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         aNBT.setBoolean("bInvert", bInvert);
         aNBT.setBoolean("bOutput", bOutput);
         aNBT.setBoolean("bRedstoneIfFull", bRedstoneIfFull);
+        aNBT.setBoolean("bStockingMode", bStockingMode);
         aNBT.setInteger("mTargetStackSize", mTargetStackSize);
     }
 
@@ -200,6 +201,9 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         bInvert = aNBT.getBoolean("bInvert");
         bOutput = aNBT.getBoolean("bOutput");
         bRedstoneIfFull = aNBT.getBoolean("bRedstoneIfFull");
+        if (aNBT.hasKey("bStockingMode")) { // Adding new key to existing NBT, need to protect if it is not there.
+            bStockingMode = aNBT.getBoolean("bStockingMode");
+        }
         mTargetStackSize = aNBT.getInteger("mTargetStackSize");
     }
 
@@ -253,10 +257,18 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     }
 
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
-        int tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, (byte) 64, (byte) 1);
-        if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
-            mSuccess = 50;
-            aBaseMetaTileEntity.decreaseStoredEnergyUnits(Math.abs(tCost), true);
+        if( bStockingMode ) {
+            int tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, (byte) 64, (byte) 1);
+            if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
+                mSuccess = 50;
+                aBaseMetaTileEntity.decreaseStoredEnergyUnits(Math.abs(tCost), true);
+            }
+        } else {
+            int tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, (byte) 64, (byte) 1, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize);
+            if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
+                mSuccess = 50;
+                aBaseMetaTileEntity.decreaseStoredEnergyUnits(Math.abs(tCost), true);
+            }
         }
     }
 
-- 
cgit