Make Pre cancellable instead

VazkiiMods · Apr 9, 2024 · bbba1d2 · bbba1d2
1 parent 6afd13b
commit bbba1d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZScreen.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZScreen.java
@@ -35,7 +35,7 @@ interface MouseButtonPressed extends ZScreen {
         double getMouseX();
         double getMouseY();
 
-        interface Pre extends MouseButtonPressed { }
+        interface Pre extends MouseButtonPressed, Cancellable { }
         interface Post extends MouseButtonPressed { }
     }
 

diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/play/ForgeZScreen.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/play/ForgeZScreen.java
@@ -94,7 +94,7 @@ public Post(ScreenEvent.Render e) {
     }
 
     public static class MouseButtonPressed extends ForgeZScreen implements ZScreen.MouseButtonPressed {
-        private final ScreenEvent.MouseButtonPressed e;
+        final ScreenEvent.MouseButtonPressed e;
 
         public MouseButtonPressed(ScreenEvent.MouseButtonPressed e) {
             super(e);
@@ -120,6 +120,16 @@ public static class Pre extends ForgeZScreen.MouseButtonPressed implements ZScre
             public Pre(ScreenEvent.MouseButtonPressed.Pre e) {
                 super(e);
             }
+
+            @Override
+            public boolean isCanceled() {
+                return e.isCanceled();
+            }
+
+            @Override
+            public void setCanceled(boolean cancel) {
+                e.setCanceled(cancel);
+            }
         }
 
         public static class Post extends ForgeZScreen.MouseButtonPressed implements ZScreen.MouseButtonPressed.Post {