Optimize addOutput

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>

2 files changed, 42 insertions, 24 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
index 9c227b8da7..57cfc44ff6 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
@@ -12,7 +12,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-import static gregtech.api.util.GT_Utility.*;
+import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
 
 public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch {
     public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier) {
@@ -110,6 +110,42 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch {
         }
     }
 
+    /**
+     * Attempt to store as many items as possible into the internal inventory of this output bus.
+     * If you need atomicity you should use {@link gregtech.api.interfaces.tileentity.IHasInventory#addStackToSlot(int, ItemStack)}
+     * @param aStack Assume valid.
+     *               Will be mutated.
+     *               Take over the ownership. Caller should not retain a reference to this stack if the call returns true.
+     * @return true if stack is fully accepted. false is stack is partially accepted or nothing is accepted
+     */
+    public boolean storeAll(ItemStack aStack) {
+        for (int i = 0, mInventoryLength = mInventory.length; i < mInventoryLength; i++) {
+            ItemStack tSlot = mInventory[i];
+            if (GT_Utility.isStackInvalid(tSlot)) {
+                if (aStack.stackSize <= getInventoryStackLimit()) {
+                    mInventory[i] = aStack;
+                    return true;
+                }
+                mInventory[i] = aStack.splitStack(getInventoryStackLimit());
+            } else {
+                int tRealStackLimit = Math.min(getInventoryStackLimit(), tSlot.getMaxStackSize());
+                if (tSlot.stackSize < tRealStackLimit &&
+                        tSlot.isItemEqual(aStack) &&
+                        ItemStack.areItemStackTagsEqual(tSlot, aStack)) {
+                    if (aStack.stackSize + tSlot.stackSize <= tRealStackLimit) {
+                        mInventory[i].stackSize += aStack.stackSize;
+                        return true;
+                    } else {
+                        // more to serve
+                        aStack.stackSize -= tRealStackLimit - tSlot.stackSize;
+                        mInventory[i].stackSize = tRealStackLimit;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
         return aSide == aBaseMetaTileEntity.getFrontFacing();
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index d4a32d20cc..6a5da54718 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -740,33 +740,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
     public boolean addOutput(ItemStack aStack) {
         if (GT_Utility.isStackInvalid(aStack)) return false;
         aStack = GT_Utility.copy(aStack);
+        for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) {
+            if (isValidMetaTileEntity(tHatch) && tHatch.storeAll(aStack)) {
+                return true;
+            }
+        }
         boolean outputSuccess = true;
         while (outputSuccess && aStack.stackSize > 0) {
             outputSuccess = false;
-
-            if (GregTech_API.mAE2) {
-                // this separate cycle may be refactored out, after this function will hopefully be totally refactored
-                // for now it is here to avoid splitting stack when we have ME output bus
-                for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) {
-                    // TODO: If ever there will be another hatch storing in some external storage, here should be an interface check
-                    if (tHatch instanceof GT_MetaTileEntity_Hatch_OutputBus_ME && isValidMetaTileEntity(tHatch)) {
-                        int rest = ((GT_MetaTileEntity_Hatch_OutputBus_ME) tHatch).store(aStack);
-                        if (rest != aStack.stackSize)
-                            outputSuccess = true;
-                        aStack.stackSize = rest;
-                        if (rest == 0)
-                            return true;
-                    }
-                }
-            }
             ItemStack single = aStack.splitStack(1);
-            for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) {
-                if (!outputSuccess && isValidMetaTileEntity(tHatch)) {
-                    for (int i = tHatch.getSizeInventory() - 1; i >= 0 && !outputSuccess; i--) {
-                        if (tHatch.getBaseMetaTileEntity().addStackToSlot(i, single)) outputSuccess = true;
-                    }
-                }
-            }
             for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) {
                 if (!outputSuccess && isValidMetaTileEntity(tHatch) && tHatch.outputsItems()) {
                     if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, single)) outputSuccess = true;