move UpOrDown

brachy84 · brachy84 · commit 90f42651c462 · 2025-09-28T22:12:48.000+02:00
diff --git a/src/main/java/com/cleanroommc/modularui/api/UpOrDown.java b/src/main/java/com/cleanroommc/modularui/api/UpOrDown.java
@@ -0,0 +1,19 @@
+package com.cleanroommc.modularui.api;
+
+public enum UpOrDown {
+    UP(1), DOWN(-1);
+
+    public final int modifier;
+
+    UpOrDown(int modifier) {
+        this.modifier = modifier;
+    }
+
+    public boolean isUp() {
+        return this == UP;
+    }
+
+    public boolean isDown() {
+        return this == DOWN;
+    }
+}
diff --git a/src/main/java/com/cleanroommc/modularui/api/widget/IGuiAction.java b/src/main/java/com/cleanroommc/modularui/api/widget/IGuiAction.java
@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.api.widget;
 
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.screen.ModularScreen;
 
 /**
@@ -34,7 +35,7 @@ interface KeyReleased extends IGuiAction {
     @FunctionalInterface
     interface MouseScroll extends IGuiAction {
 
-        boolean scroll(ModularScreen.UpOrDown direction, int amount);
+        boolean scroll(UpOrDown direction, int amount);
     }
 
     @FunctionalInterface
diff --git a/src/main/java/com/cleanroommc/modularui/api/widget/Interactable.java b/src/main/java/com/cleanroommc/modularui/api/widget/Interactable.java
@@ -1,6 +1,6 @@
 package com.cleanroommc.modularui.api.widget;
 
-import com.cleanroommc.modularui.screen.ModularScreen;
+import com.cleanroommc.modularui.api.UpOrDown;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -98,7 +98,7 @@ default Result onKeyTapped(char typedChar, int keyCode) {
      * @param amount          amount scrolled by (usually irrelevant)
      * @return true if this widget can be scrolled at all
      */
-    default boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    default boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         return false;
     }
 
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/InteractableIcon.java b/src/main/java/com/cleanroommc/modularui/drawable/InteractableIcon.java
@@ -1,9 +1,9 @@
 package com.cleanroommc.modularui.drawable;
 
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.drawable.IIcon;
 import com.cleanroommc.modularui.api.widget.IGuiAction;
 import com.cleanroommc.modularui.api.widget.Interactable;
-import com.cleanroommc.modularui.screen.ModularScreen;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -74,7 +74,7 @@ public Result onKeyTapped(char typedChar, int keyCode) {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         return this.mouseScroll != null && this.mouseScroll.scroll(scrollDirection, amount);
     }
 
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java b/src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java
@@ -5,6 +5,7 @@
 import com.cleanroommc.modularui.ModularUIConfig;
 import com.cleanroommc.modularui.api.IMuiScreen;
 import com.cleanroommc.modularui.api.MCHelper;
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.widget.IGuiElement;
 import com.cleanroommc.modularui.api.widget.IVanillaSlot;
 import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiAccessor;
@@ -169,7 +170,7 @@ public void onGuiInputHigh(GuiScreenEvent.MouseInputEvent.Pre event) throws IOEx
         }
         int w = Mouse.getEventDWheel();
         if (w == 0) return;
-        ModularScreen.UpOrDown upOrDown = w > 0 ? ModularScreen.UpOrDown.UP : ModularScreen.UpOrDown.DOWN;
+        UpOrDown upOrDown = w > 0 ? UpOrDown.UP : UpOrDown.DOWN;
         checkGui(event.getGui());
         if (doAction(currentScreen, ms -> ms.onMouseScroll(upOrDown, Math.abs(w)))) {
             event.setCanceled(true);
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ModularPanel.java b/src/main/java/com/cleanroommc/modularui/screen/ModularPanel.java
@@ -5,6 +5,7 @@
 import com.cleanroommc.modularui.api.IPanelHandler;
 import com.cleanroommc.modularui.api.ITheme;
 import com.cleanroommc.modularui.api.MCHelper;
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.layout.IViewport;
 import com.cleanroommc.modularui.api.layout.IViewportStack;
@@ -579,7 +580,7 @@ private boolean onKeyRelease(char typedChar, int keyCode, boolean tryTap, Locate
         return false;
     }
 
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         return doSafeBool(() -> {
             if (interactFocused(widget -> widget.onMouseScroll(scrollDirection, amount), false)) {
                 return true;
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ModularScreen.java b/src/main/java/com/cleanroommc/modularui/screen/ModularScreen.java
@@ -5,6 +5,7 @@
 import com.cleanroommc.modularui.api.ITheme;
 import com.cleanroommc.modularui.api.IThemeApi;
 import com.cleanroommc.modularui.api.MCHelper;
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.widget.IGuiAction;
 import com.cleanroommc.modularui.api.widget.IWidget;
 import com.cleanroommc.modularui.drawable.GuiDraw;
@@ -711,22 +712,4 @@ public ModularScreen pausesGame(boolean pausesGame) {
         return this;
     }
 
-    // TODO move this to a more appropriate place
-    public enum UpOrDown {
-        UP(1), DOWN(-1);
-
-        public final int modifier;
-
-        UpOrDown(int modifier) {
-            this.modifier = modifier;
-        }
-
-        public boolean isUp() {
-            return this == UP;
-        }
-
-        public boolean isDown() {
-            return this == DOWN;
-        }
-    }
 }
diff --git a/src/main/java/com/cleanroommc/modularui/widget/AbstractScrollWidget.java b/src/main/java/com/cleanroommc/modularui/widget/AbstractScrollWidget.java
@@ -1,12 +1,12 @@
 package com.cleanroommc.modularui.widget;
 
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.layout.IViewport;
 import com.cleanroommc.modularui.api.layout.IViewportStack;
 import com.cleanroommc.modularui.api.widget.IGuiAction;
 import com.cleanroommc.modularui.api.widget.IWidget;
 import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.Stencil;
-import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
 import com.cleanroommc.modularui.utils.HoveredWidgetList;
 import com.cleanroommc.modularui.widget.scroll.HorizontalScrollData;
@@ -107,7 +107,7 @@ public boolean canHover() {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         return this.scroll.mouseScroll(getContext());
     }
 
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/ButtonWidget.java b/src/main/java/com/cleanroommc/modularui/widgets/ButtonWidget.java
@@ -1,10 +1,10 @@
 package com.cleanroommc.modularui.widgets;
 
 import com.cleanroommc.modularui.api.ITheme;
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.widget.IGuiAction;
 import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.GuiTextures;
-import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.value.sync.InteractionSyncHandler;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
@@ -123,7 +123,7 @@ public Result onKeyTapped(char typedChar, int keyCode) {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         return (this.mouseScroll != null && this.mouseScroll.scroll(scrollDirection, amount)) ||
                 (this.syncHandler != null && this.syncHandler.onMouseScroll((int) Math.copySign(amount, scrollDirection.modifier)));
     }
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/RichTextWidget.java b/src/main/java/com/cleanroommc/modularui/widgets/RichTextWidget.java
@@ -1,10 +1,10 @@
 package com.cleanroommc.modularui.widgets;
 
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.drawable.IHoverable;
 import com.cleanroommc.modularui.api.drawable.IRichTextBuilder;
 import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.text.RichText;
-import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
@@ -108,7 +108,7 @@ public boolean onKeyRelease(char typedChar, int keyCode) {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         Object o = this.text.getHoveringElement(getContext().getFontRenderer(), getContext().getMouseX(), getContext().getMouseY());
         if (o instanceof Interactable interactable) {
             return interactable.onMouseScroll(scrollDirection, amount);
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/SchemaWidget.java b/src/main/java/com/cleanroommc/modularui/widgets/SchemaWidget.java
@@ -1,10 +1,10 @@
 package com.cleanroommc.modularui.widgets;
 
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.GuiTextures;
-import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.utils.MathUtils;
 import com.cleanroommc.modularui.utils.VectorUtil;
 import com.cleanroommc.modularui.utils.fakeworld.ISchema;
@@ -44,7 +44,7 @@ public SchemaWidget(SchemaRenderer schema) {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         if (this.enableScaling) {
             scale(-scrollDirection.modifier * amount / 120.0);
             return true;
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/slot/FluidSlot.java b/src/main/java/com/cleanroommc/modularui/widgets/slot/FluidSlot.java
@@ -2,6 +2,7 @@
 
 import com.cleanroommc.modularui.ModularUI;
 import com.cleanroommc.modularui.api.ITheme;
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.widget.Interactable;
@@ -10,7 +11,6 @@
 import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
 import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerGhostIngredientSlot;
 import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerIngredientProvider;
-import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
 import com.cleanroommc.modularui.theme.WidgetSlotTheme;
@@ -204,7 +204,7 @@ public int getSlotHoverColor() {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         if (this.syncHandler.isPhantom()) {
             if ((scrollDirection.isUp() && !this.syncHandler.canFillSlot()) || (scrollDirection.isDown() && !this.syncHandler.canDrainSlot())) {
                 return false;
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/slot/PhantomItemSlot.java b/src/main/java/com/cleanroommc/modularui/widgets/slot/PhantomItemSlot.java
@@ -1,15 +1,14 @@
 package com.cleanroommc.modularui.widgets.slot;
 
 import com.cleanroommc.modularui.ModularUI;
+import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
 import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerGhostIngredientSlot;
-import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.utils.MouseData;
 import com.cleanroommc.modularui.value.sync.PhantomItemSlotSH;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
 
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.enchantment.EnchantmentData;
 import net.minecraft.item.ItemStack;
 
 import mezz.jei.Internal;
@@ -56,7 +55,7 @@ public boolean onMouseRelease(int mouseButton) {
     }
 
     @Override
-    public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {
+    public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {
         MouseData mouseData = MouseData.create(scrollDirection.modifier);
         this.syncHandler.syncToServer(PhantomItemSlotSH.SYNC_SCROLL, mouseData::writeToPacket);
         return true;

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package com.cleanroommc.modularui.drawable;`
`2`	`2`
	`3`	`+import com.cleanroommc.modularui.api.UpOrDown;`
`3`	`4`	`import com.cleanroommc.modularui.api.drawable.IIcon;`
`4`	`5`	`import com.cleanroommc.modularui.api.widget.IGuiAction;`
`5`	`6`	`import com.cleanroommc.modularui.api.widget.Interactable;`
`6`		`-import com.cleanroommc.modularui.screen.ModularScreen;`
`7`	`7`
`8`	`8`	`import org.jetbrains.annotations.NotNull;`
`9`	`9`
`@@ -74,7 +74,7 @@ public Result onKeyTapped(char typedChar, int keyCode) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int amount) {`
	`77`	`+ public boolean onMouseScroll(UpOrDown scrollDirection, int amount) {`
`78`	`78`	`return this.mouseScroll != null && this.mouseScroll.scroll(scrollDirection, amount);`
`79`	`79`	`}`
`80`	`80`