From e1cc9e6aef1d5fd188aee030ae9caf17b19fe0c1 Mon Sep 17 00:00:00 2001 From: Qowyn Date: Sun, 28 Sep 2014 00:56:07 +0200 Subject: [PATCH] Restore ActiveContainer behavior. This will add lines to TConstruct_at, so doing gradlew clean may be necessary. --- resources/META-INF/TConstruct_at.cfg | 2 ++ .../smeltery/gui/ActiveContainerGui.java | 35 +++++++++++++++++++ .../smeltery/gui/AdaptiveSmelteryGui.java | 2 +- .../tconstruct/smeltery/gui/SmelteryGui.java | 2 +- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java diff --git a/resources/META-INF/TConstruct_at.cfg b/resources/META-INF/TConstruct_at.cfg index 366004ad..5446467f 100644 --- a/resources/META-INF/TConstruct_at.cfg +++ b/resources/META-INF/TConstruct_at.cfg @@ -23,6 +23,8 @@ public net.minecraft.block.BlockRailBase$Rail func_150650_a()I public net.minecraft.client.gui.inventory.GuiContainer field_146999_f public net.minecraft.client.gui.inventory.GuiContainer field_147009_r public net.minecraft.client.gui.inventory.GuiContainer field_147003_i +public net.minecraft.client.gui.inventory.GuiContainer func_146977_a(Lnet/minecraft/inventory/Slot;)V #renderSlot +public net.minecraft.client.gui.inventory.GuiContainer func_146981_a(Lnet/minecraft/inventory/Slot;II)Z #isMouseOverSlot # GuiScreen public net.minecraft.client.gui.GuiScreen field_146292_n #buttonList # ThreadDownloadImageData diff --git a/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java b/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java new file mode 100644 index 00000000..1349fb87 --- /dev/null +++ b/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java @@ -0,0 +1,35 @@ +package tconstruct.smeltery.gui; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Slot; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.smeltery.inventory.ActiveSlot; + +public abstract class ActiveContainerGui extends GuiContainer +{ + + public ActiveContainerGui(ActiveContainer p_i1072_1_) + { + super(p_i1072_1_); + } + + @Override + public void func_146977_a (Slot slot) + { + if (!(slot instanceof ActiveSlot) || ((ActiveSlot) slot).getActive()) + { + super.func_146977_a(slot); + } + } + + @Override + public boolean isMouseOverSlot (Slot slot, int mouseX, int mouseY) + { + if (!(slot instanceof ActiveSlot) || ((ActiveSlot) slot).getActive()) + { + return super.isMouseOverSlot(slot, mouseX, mouseY); + } + return false; + } + +} diff --git a/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java index 3678cc1c..9b233ec5 100644 --- a/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java @@ -21,7 +21,7 @@ import tconstruct.smeltery.component.SmelteryComponent; import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; -public class AdaptiveSmelteryGui extends GuiContainer +public class AdaptiveSmelteryGui extends ActiveContainerGui { public AdaptiveSmelteryLogic logic; String username; diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 88553e18..62961ef2 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -18,7 +18,7 @@ import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.SmelteryPacket; -public class SmelteryGui extends GuiContainer +public class SmelteryGui extends ActiveContainerGui { public SmelteryLogic logic; private boolean isScrolling = false;