fix(1.21.1): Fix OpenScreenEvent overwriting new screens from other mods #256

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/balm/api/event/client/OpenScreenEvent.java

@@ -13,6 +13,11 @@ public OpenScreenEvent(Screen screen) {
         this.newScreen = screen;
     }
 
+    public OpenScreenEvent(Screen screen, @Nullable Screen newScreen) {
+        this.screen = screen;
+        this.newScreen = newScreen;
+    }
+
     public Screen getScreen() {
         return screen;
     }

forge/src/main/java/net/blay09/mods/balm/forge/event/ForgeBalmClientEvents.java

@@ -325,7 +325,7 @@ public static void registerEvents(ForgeBalmEvents events) {
 
         events.registerEvent(OpenScreenEvent.class, priority -> {
             MinecraftForge.EVENT_BUS.addListener(ForgeBalmEvents.toForge(priority), (ScreenEvent.Opening orig) -> {
-                final OpenScreenEvent event = new OpenScreenEvent(orig.getScreen());
+                final OpenScreenEvent event = new OpenScreenEvent(orig.getScreen(), orig.getNewScreen());
                 events.fireEventHandlers(priority, event);
                 if (event.getNewScreen() != null) {
                     orig.setNewScreen(event.getNewScreen());

neoforge/src/main/java/net/blay09/mods/balm/neoforge/event/NeoForgeBalmClientEvents.java

@@ -320,7 +320,7 @@ public static void registerEvents(NeoForgeBalmEvents events) {
 
         events.registerEvent(OpenScreenEvent.class, priority -> {
             NeoForge.EVENT_BUS.addListener(NeoForgeBalmEvents.toForge(priority), (ScreenEvent.Opening orig) -> {
-                final OpenScreenEvent event = new OpenScreenEvent(orig.getScreen());
+                final OpenScreenEvent event = new OpenScreenEvent(orig.getScreen(), orig.getNewScreen());
                 events.fireEventHandlers(priority, event);
                 if (event.getNewScreen() != null) {
                     orig.setNewScreen(event.getNewScreen());