From bce9f88a14d1017c50ad4f717b4094a851e4a2a5 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 28 Mar 2022 23:20:14 +0800
Subject: Check if given slot accepts given input instead of ignoring outright
 (#993)

---
 src/main/java/gregtech/api/gui/GT_Container.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java
index e00759bf24..a3085b21ba 100644
--- a/src/main/java/gregtech/api/gui/GT_Container.java
+++ b/src/main/java/gregtech/api/gui/GT_Container.java
@@ -314,7 +314,7 @@ public class GT_Container extends Container {
             while (aStack.stackSize > 0 && (!par4 && var6 < aSlotCount || par4 && var6 >= aStartIndex)) {
                 var7 = (Slot) this.inventorySlots.get(var6);
                 var8 = var7.getStack();
-                if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) {
+                if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var7.isItemValid(aStack) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) {
                     int var9 = var8.stackSize + aStack.stackSize;
                     if (var8.stackSize < mTileEntity.getInventoryStackLimit()) {
                         if (var9 <= aStack.getMaxStackSize()) {
@@ -349,7 +349,7 @@ public class GT_Container extends Container {
                 var7 = (Slot) this.inventorySlots.get(var6);
                 var8 = var7.getStack();
 
-                if (var8 == null) {
+                if (var7.isItemValid(aStack) && var8 == null) {
                     int var10 = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit());
                     var7.putStack(GT_Utility.copyAmount(var10, aStack));
                     var7.onSlotChanged();
-- 
cgit