From 3f7051ec8e26b0ec77ee26c1a6a750e72675d35d Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Thu, 29 Jun 2017 10:30:14 +0200 Subject: [PATCH] Fixed clearing of the search bar when looking at recipes Why mezz why... --- src/main/java/appeng/client/gui/AEBaseGui.java | 13 +++++++++++++ .../gui/implementations/GuiMEMonitorable.java | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 3c9bcbe77..c0495c4a5 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -35,6 +35,10 @@ import com.google.common.base.Joiner; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; +import mezz.jei.api.IRecipesGui; +import net.minecraftforge.client.event.GuiOpenEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -101,6 +105,7 @@ public abstract class AEBaseGui extends GuiContainer super( container ); this.subGui = switchingGuis; switchingGuis = false; + MinecraftForge.EVENT_BUS.register( this ); } protected static String join( final Collection toolTip, final String delimiter ) @@ -581,6 +586,14 @@ public abstract class AEBaseGui extends GuiContainer return false; } + @SubscribeEvent + public void onGuiOpenEvent(GuiOpenEvent event) { // Why oh why mezz? (RecipesGui.java, displayGuiScreenWithoutClose() + if(event.getGui() instanceof IRecipesGui) + { + subGui = true; + } + } + @Override public void onGuiClosed() { diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 9b2e3853a..cdaa2d248 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -22,6 +22,7 @@ package appeng.client.gui.implementations; import java.io.IOException; import java.util.List; +import net.minecraftforge.client.event.GuiOpenEvent; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; @@ -380,6 +381,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi memoryText = this.searchField.getText(); } + @Override + public void onGuiOpenEvent(GuiOpenEvent event) { + super.onGuiOpenEvent(event); + memoryText = this.searchField.getText(); + } + @Override public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) {