From 6f3bddfb296a249040835e5f90bc45f5f7c8b024 Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Sat, 31 Jul 2021 02:16:02 -0600
Subject: Fix iteration over invalid slots

---
 .../common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java | 4 ++--
 .../tileentities/automation/GT_MetaTileEntity_ItemDistributor.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/automation')

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index 3830cd3497..ddcea0267e 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -125,9 +125,9 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
     protected void fillStacksIntoFirstSlots() {
         sortStacks();
         // Merge small stacks together
-        for (int i = 0; i < this.mInventory.length-1;) {
+        for (int i = 0; i < this.mInventory.length - 2;) {
             //GT_FML_LOGGER.info( (this.mInventory[i] == null) ? "Slot empty " + i : "Slot " + i + " holds " + this.mInventory[i].getDisplayName());
-            for (int j = i + 1; j < this.mInventory.length; j++) {
+            for (int j = i + 1; j < this.mInventory.length - 1; j++) {
                 if ((this.mInventory[j] != null) && ((GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j])))) {
                     GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
                     //GT_FML_LOGGER.info( "Moving slot " + j + " into slot " +  i );
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
index d3b124b79f..af6bda03a3 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
 
     @Override
     protected void fillStacksIntoFirstSlots() {
-        for (int i = 0; i < this.mInventory.length - 1; i++) {
+        for (int i = 0; i < this.mInventory.length - 2; i++) {
             for (int j = i + 1; j < this.mInventory.length - 1; j++) {
                 if ((this.mInventory[j] != null)
                         && ((this.mInventory[i] == null) || (GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j])))) {
-- 
cgit 


From 2e47483ecf90b8bb6e12aaa8849980bde597a1d4 Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Sat, 31 Jul 2021 03:52:44 -0600
Subject: Add comments

---
 .../common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java   | 2 ++
 .../tileentities/automation/GT_MetaTileEntity_ItemDistributor.java      | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/main/java/gregtech/common/tileentities/automation')

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index ddcea0267e..9da0eace39 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -125,6 +125,8 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
     protected void fillStacksIntoFirstSlots() {
         sortStacks();
         // Merge small stacks together
+        // The last slot of mInventory is invalid, so we need to avoid iterating over it.
+        // Thus all max indices are reduced by 1 here.
         for (int i = 0; i < this.mInventory.length - 2;) {
             //GT_FML_LOGGER.info( (this.mInventory[i] == null) ? "Slot empty " + i : "Slot " + i + " holds " + this.mInventory[i].getDisplayName());
             for (int j = i + 1; j < this.mInventory.length - 1; j++) {
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
index af6bda03a3..3cf5adff99 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
@@ -51,6 +51,8 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
 
     @Override
     protected void fillStacksIntoFirstSlots() {
+        // The last slot of mInventory is invalid, so we need to avoid iterating over it.
+        // Thus all max indices are reduced by 1 here.
         for (int i = 0; i < this.mInventory.length - 2; i++) {
             for (int j = i + 1; j < this.mInventory.length - 1; j++) {
                 if ((this.mInventory[j] != null)
-- 
cgit 


From a3a540cc6e37ec9a8169146552caae037d70b37e Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Thu, 5 Aug 2021 20:57:30 -0600
Subject: Update GT_MetaTileEntity_ChestBuffer.java

---
 .../automation/GT_MetaTileEntity_ChestBuffer.java       | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/automation')

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index 9da0eace39..774639401a 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -124,22 +124,7 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
     @Override
     protected void fillStacksIntoFirstSlots() {
         sortStacks();
-        // Merge small stacks together
-        // The last slot of mInventory is invalid, so we need to avoid iterating over it.
-        // Thus all max indices are reduced by 1 here.
-        for (int i = 0; i < this.mInventory.length - 2;) {
-            //GT_FML_LOGGER.info( (this.mInventory[i] == null) ? "Slot empty " + i : "Slot " + i + " holds " + this.mInventory[i].getDisplayName());
-            for (int j = i + 1; j < this.mInventory.length - 1; j++) {
-                if ((this.mInventory[j] != null) && ((GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j])))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
-                    //GT_FML_LOGGER.info( "Moving slot " + j + " into slot " +  i );
-                }
-                else {
-                    i=j;
-                    break; // No more matching items for this i, do next i
-                }
-            }
-        }
+        super.fillStacksIntoFirstSlots();
     }
 
     @Override
-- 
cgit 


From 0c5284cdff6a2bc8e9e409e61d0a290b1ea3b9d0 Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Thu, 5 Aug 2021 21:53:49 -0600
Subject: Remove bSortStacks check

---
 .../implementations/GT_MetaTileEntity_Buffer.java    | 20 +++++++++-----------
 .../GT_MetaTileEntity_ItemDistributor.java           | 15 ---------------
 2 files changed, 9 insertions(+), 26 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/automation')

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 faea347c67..21cf0d73f1 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
@@ -329,20 +329,18 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     }
 
     protected void fillStacksIntoFirstSlots() {
-        if (bSortStacks) {
-            for (int i = 0; i < mInventory.length - 1; i++) {
-                if (!isValidSlot(i)) {
+        for (int i = 0; i < mInventory.length - 1; i++) {
+            if (!isValidSlot(i)) {
+                continue;
+            }
+
+            for (int j = i + 1; j < mInventory.length; j++) {
+                if (!isValidSlot(j)) {
                     continue;
                 }
 
-                for (int j = i + 1; j < mInventory.length; j++) {
-                    if (!isValidSlot(j)) {
-                        continue;
-                    }
-
-                    if (mInventory[j] != null && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j])))
-                        GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
-                }
+                if (mInventory[j] != null && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j])))
+                    GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
             }
         }
     }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
index 3cf5adff99..a796ce9661 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
@@ -49,21 +49,6 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
                 this.mTextures);
     }
 
-    @Override
-    protected void fillStacksIntoFirstSlots() {
-        // The last slot of mInventory is invalid, so we need to avoid iterating over it.
-        // Thus all max indices are reduced by 1 here.
-        for (int i = 0; i < this.mInventory.length - 2; i++) {
-            for (int j = i + 1; j < this.mInventory.length - 1; j++) {
-                if ((this.mInventory[j] != null)
-                        && ((this.mInventory[i] == null) || (GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j])))) {
-                    GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1,
-                            (byte) 64, (byte) 1);
-                }
-            }
-        }
-    }
-
     @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_GUIContainer_ItemDistributor(aPlayerInventory, aBaseMetaTileEntity);
-- 
cgit