From 0c385581e3b0c3e738b5eedbce8cf1979950f418 Mon Sep 17 00:00:00 2001
From: kurrycat <kurrycat2004@gmail.com>
Date: Tue, 11 Jul 2023 19:23:28 +0200
Subject: [PATCH] fixed guis re-initializing even though resetOnOpen was false
 in non-1.8.9

---
 .../kurrycat/mpkmod/gui/MPKGuiScreen.java     | 22 +++++++++----------
 .../compatibility/forge_1_8/MPKGuiScreen.java |  3 +--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/gui/MPKGuiScreen.java b/common/src/main/java/io/github/kurrycat/mpkmod/gui/MPKGuiScreen.java
index d7369fb..ff7ea27 100644
--- a/common/src/main/java/io/github/kurrycat/mpkmod/gui/MPKGuiScreen.java
+++ b/common/src/main/java/io/github/kurrycat/mpkmod/gui/MPKGuiScreen.java
@@ -27,15 +27,24 @@ public Vector2D getScreenSize() {
     }
 
     public final void onInit() {
-        initialized = true;
         setSize(Renderer2D.getScaledSize());
         setRoot(this);
-        onGuiInit();
+        if (!initialized || resetOnOpen())
+            onGuiInit();
+        initialized = true;
+    }
+
+    public boolean resetOnOpen() {
+        return true;
     }
 
     public void onGuiInit() {
     }
 
+    public boolean isInitialized() {
+        return initialized;
+    }
+
     public void onGuiClosed() {
     }
 
@@ -59,7 +68,6 @@ public void onMouseClickMove(Vector2D mouse, int mouseButton, long timeSinceLast
     public void onMouseReleased(Vector2D mouse, int mouseButton) {
     }
 
-
     /**
      * @param mousePos Mouse position when scrolled
      * @param delta    number of lines to scroll (one scroll tick = 3 per default)<br>
@@ -84,14 +92,6 @@ public boolean shouldCreateKeyBind() {
         return false;
     }
 
-    public boolean resetOnOpen() {
-        return true;
-    }
-
-    public boolean isInitialized() {
-        return initialized;
-    }
-
     public final void close() {
         Minecraft.displayGuiScreen(null);
     }
diff --git a/forge-1.8.9/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/MPKGuiScreen.java b/forge-1.8.9/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/MPKGuiScreen.java
index dd730cd..729cb67 100644
--- a/forge-1.8.9/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/MPKGuiScreen.java
+++ b/forge-1.8.9/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/MPKGuiScreen.java
@@ -37,8 +37,7 @@ public void initGui() {
         repeatEventsEnabled = Keyboard.areRepeatEventsEnabled();
         Keyboard.enableRepeatEvents(true);
         super.initGui();
-        if (!eventReceiver.isInitialized() || eventReceiver.resetOnOpen())
-            eventReceiver.onInit();
+        eventReceiver.onInit();
     }
 
     @Override