From 96801239067330d6a8e2028212e43026fdb16a38 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Fri, 6 Aug 2021 06:25:12 -0300 Subject: [PATCH] fix JEI targeting disabled slots as valid --- gradle.properties | 2 +- .../client/gui/implementations/GuiUpgradeable.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 20f372fa9..bcd967aaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ aechannel=stable aebuild=7 aegroup=appeng aebasename=appliedenergistics2 -trousers=omni-fixes-v46b +trousers=omni-fixes-v46c ######################################################### # Versions # diff --git a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java index 33e87590b..387550661 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java @@ -270,12 +270,15 @@ public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients @Override public Rectangle getArea() { - if( slot instanceof SlotFake ) + if( slot instanceof SlotFake && ( (SlotFake) slot ).isSlotEnabled() ) + { return new Rectangle( getGuiLeft() + ( (SlotFake) slot ).xPos, getGuiTop() + ( (SlotFake) slot ).yPos, 16, 16 ); - else + } + else if( slot instanceof GuiFluidSlot && ( (GuiFluidSlot) slot ).isSlotEnabled() ) { return new Rectangle( getGuiLeft() + ( (GuiFluidSlot) slot ).xPos(), getGuiTop() + ( (GuiFluidSlot) slot ).yPos(), 16, 16 ); } + return new Rectangle(); } @Override @@ -284,7 +287,7 @@ public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients PacketInventoryAction p = null; try { - if( slot instanceof SlotFake ) + if( slot instanceof SlotFake && ( (SlotFake) slot ).isSlotEnabled() ) { if( finalItemStack.isEmpty() && finalFluidStack != null ) {