26.3

build-src/src/main/kotlin/moulconfig.fabric.gradle.kts

@@ -29,7 +29,7 @@ the<UniminedExtension>().minecraft {
     }
 
     fabric {
-        loader("0.18.4")
+        loader("0.19.5")
         if (hasAW)
             accessWidener(aF)
     }

common/src/main/java/io/github/notenoughupdates/moulconfig/common/IKeyboardConstants.java

@@ -0,0 +1,49 @@
+package io.github.notenoughupdates.moulconfig.common;
+
+public interface IKeyboardConstants {
+    int getBackSpace();
+
+    int getCtrlLeft();
+
+    int getCtrlRight();
+
+    int getCmdLeft();
+
+    int getCmdRight();
+
+    int getShiftLeft();
+
+    int getShiftRight();
+
+    int getEscape();
+
+    int getNone();
+
+    int getEnter();
+
+    int getDelete();
+
+    int getUp();
+
+    int getDown();
+
+    int getLeft();
+
+    int getRight();
+
+    int getHome();
+
+    int getEnd();
+
+    int getKeyA();
+
+    int getKeyC();
+
+    int getKeyX();
+
+    int getKeyV();
+
+    int getKeyN();
+
+    int getKeyF();
+}

common/src/main/java/io/github/notenoughupdates/moulconfig/common/IMinecraft.java

@@ -67,6 +67,8 @@ default double getMouseYHF() {
 
     IKeyboardConstants getKeyboardConstants();
 
+    MouseConstants getMouseConstants();
+
     int getScaledWidth();
 
     int getScaledHeight();

common/src/main/java/io/github/notenoughupdates/moulconfig/common/MouseConstants.java

@@ -0,0 +1,9 @@
+package io.github.notenoughupdates.moulconfig.common;
+
+public interface MouseConstants {
+    int left();
+
+    int middle();
+
+    int right();
+}

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/component/ColorSelectComponent.java

@@ -398,7 +398,7 @@ public boolean mouseEvent(@NotNull MouseEvent mouseEvent, @NotNull GuiImmediateC
             }
             if (context.isHovered() && click.getMouseState())
                 requestFocus();
-            if (focusedSubComponent != null && !click.getMouseState() && click.getMouseButton() == 0) {
+            if (focusedSubComponent != null && !click.getMouseState() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left()) {
                 focusedSubComponent = null;
                 return true;
             }

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/component/SliderComponent.kt

@@ -1,6 +1,7 @@
 package io.github.notenoughupdates.moulconfig.gui.component
 
 import io.github.notenoughupdates.moulconfig.GuiTextures
+import io.github.notenoughupdates.moulconfig.common.IMinecraft
 import io.github.notenoughupdates.moulconfig.gui.GuiComponent
 import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext
 import io.github.notenoughupdates.moulconfig.gui.MouseEvent
@@ -66,8 +67,8 @@ open class SliderComponent(
     }
 
     override fun mouseEvent(mouseEvent: MouseEvent, context: GuiImmediateContext): Boolean {
-        if (!context.renderContext.isMouseButtonDown(0)) clicked = false
-        if (context.isHovered && mouseEvent is MouseEvent.Click && mouseEvent.mouseState && mouseEvent.mouseButton == 0) {
+        if (!context.renderContext.isMouseButtonDown(IMinecraft.INSTANCE.getMouseConstants().left())) clicked = false
+        if (context.isHovered && mouseEvent is MouseEvent.Click && mouseEvent.mouseState && mouseEvent.mouseButton == IMinecraft.INSTANCE.getMouseConstants().left()) {
             clicked = true
         }
         if (clicked) {

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/component/SliderWithTextComponent.kt

@@ -33,8 +33,8 @@ open class SliderWithTextComponent(
     }
 
     override fun mouseEvent(mouseEvent: MouseEvent, context: GuiImmediateContext): Boolean {
-        if (!context.renderContext.isMouseButtonDown(0)) clicked = false
-        if (context.isHovered() && mouseEvent is MouseEvent.Click && mouseEvent.mouseState && mouseEvent.mouseButton == 0) {
+        if (!context.renderContext.isMouseButtonDown(IMinecraft.INSTANCE.getMouseConstants().left())) clicked = false
+        if (context.isHovered() && mouseEvent is MouseEvent.Click && mouseEvent.mouseState && mouseEvent.mouseButton == IMinecraft.INSTANCE.getMouseConstants().left()) {
             clicked = true
         }
         if (clicked) {

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/component/SwitchComponent.java

@@ -21,6 +21,7 @@
 package io.github.notenoughupdates.moulconfig.gui.component;
 
 import io.github.notenoughupdates.moulconfig.GuiTextures;
+import io.github.notenoughupdates.moulconfig.common.IMinecraft;
 import io.github.notenoughupdates.moulconfig.common.MyResourceLocation;
 import io.github.notenoughupdates.moulconfig.gui.GuiComponent;
 import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext;
@@ -93,7 +94,7 @@ public boolean mouseEvent(MouseEvent event, GuiImmediateContext context) {
         super.mouseEvent(event, context);
         if (!(event instanceof MouseEvent.Click)) return false;
         var click = (MouseEvent.Click) event;
-        if (context.isHovered() && click.getMouseButton() == 0 && click.getMouseState()) {
+        if (context.isHovered() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left() && click.getMouseState()) {
             value.set(!value.get());
             return true;
         }

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/GuiOptionEditorAccordion.java

@@ -20,6 +20,7 @@
 
 package io.github.notenoughupdates.moulconfig.gui.editors;
 
+import io.github.notenoughupdates.moulconfig.common.IMinecraft;
 import io.github.notenoughupdates.moulconfig.gui.GuiComponent;
 import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext;
 import io.github.notenoughupdates.moulconfig.gui.MouseEvent;
@@ -58,7 +59,7 @@ public void render(@NotNull GuiImmediateContext context) {
         public boolean mouseEvent(@NotNull MouseEvent mouseEvent, @NotNull GuiImmediateContext context) {
             if (mouseEvent instanceof MouseEvent.Click) {
                 val click = (MouseEvent.Click) mouseEvent;
-                if (click.getMouseState() && context.isHovered() && click.getMouseButton() == 0) {
+                if (click.getMouseState() && context.isHovered() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left()) {
                     accordionToggled = !accordionToggled;
                     return true;
                 }

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/GuiOptionEditorButton.java

@@ -133,7 +133,7 @@ public void render(@NotNull GuiImmediateContext context) {
         public boolean mouseEvent(@NotNull MouseEvent mouseEvent, @NotNull GuiImmediateContext context) {
             if (mouseEvent instanceof MouseEvent.Click) {
                 val click = (MouseEvent.Click) mouseEvent;
-                if (click.getMouseState() && context.isHovered() && click.getMouseButton() == 0) {
+                if (click.getMouseState() && context.isHovered() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left()) {
                     onClick();
                     return true;
                 }

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/GuiOptionEditorColour.java

@@ -22,6 +22,7 @@
 
 import io.github.notenoughupdates.moulconfig.ChromaColour;
 import io.github.notenoughupdates.moulconfig.GuiTextures;
+import io.github.notenoughupdates.moulconfig.common.IMinecraft;
 import io.github.notenoughupdates.moulconfig.gui.GuiComponent;
 import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext;
 import io.github.notenoughupdates.moulconfig.gui.MouseEvent;
@@ -71,7 +72,7 @@ public void render(@NotNull GuiImmediateContext context) {
             public boolean mouseEvent(@NotNull MouseEvent mouseEvent, @NotNull GuiImmediateContext context) {
                 if (mouseEvent instanceof MouseEvent.Click) {
                     val click = ((MouseEvent.Click) mouseEvent);
-                    if (click.getMouseState() && click.getMouseButton() == 0 && context.isHovered()) {
+                    if (click.getMouseState() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left() && context.isHovered()) {
                         ColorSelectComponent colorSelectComponent = new ColorSelectComponent(0, 0, get().toLegacyString(), newString -> set(newString), () -> {
                             closeOverlay();
                         });

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/GuiOptionEditorDropdown.java

@@ -83,7 +83,7 @@ public boolean mouseEvent(@NotNull MouseEvent mouseEvent, @NotNull GuiImmediateC
                 if (click.getMouseState()) {
                     closeOverlay();
                 }
-                if (click.getMouseState() && click.getMouseButton() == 0 && context.isHovered()) {
+                if (click.getMouseState() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left() && context.isHovered()) {
                     int top = 0;
                     int mouseY = context.getMouseY();
                     int dropdownY = 13;

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/GuiOptionEditorKeybind.java

@@ -79,7 +79,7 @@ public boolean mouseEvent(@NotNull MouseEvent mouseEvent, @NotNull GuiImmediateC
                     return true;
                 }
 
-                if (click.getMouseState() && click.getMouseButton() == 0) {
+                if (click.getMouseState() && click.getMouseButton() == IMinecraft.INSTANCE.getMouseConstants().left()) {
                     int height = getHeight();
                     int width = getHeight();
                     int mouseX = context.getMouseX();

legacy/src/main/java/io/github/notenoughupdates/moulconfig/internal/ForgeKeyboardConstants.java

@@ -0,0 +1,125 @@
+package io.github.notenoughupdates.moulconfig.internal;
+
+import io.github.notenoughupdates.moulconfig.common.IKeyboardConstants;
+import org.lwjgl.input.Keyboard;
+
+public final class ForgeKeyboardConstants implements IKeyboardConstants {
+    public static final ForgeKeyboardConstants INSTANCE = new ForgeKeyboardConstants();
+
+    private ForgeKeyboardConstants() {}
+
+    @Override
+    public int getBackSpace() {
+        return Keyboard.KEY_BACK;
+    }
+
+    @Override
+    public int getCtrlLeft() {
+        return Keyboard.KEY_LCONTROL;
+    }
+
+    @Override
+    public int getCtrlRight() {
+        return Keyboard.KEY_RCONTROL;
+    }
+
+    @Override
+    public int getCmdLeft() {
+        return Keyboard.KEY_LMETA;
+    }
+
+    @Override
+    public int getCmdRight() {
+        return Keyboard.KEY_RMETA;
+    }
+
+    @Override
+    public int getShiftLeft() {
+        return Keyboard.KEY_LSHIFT;
+    }
+
+    @Override
+    public int getShiftRight() {
+        return Keyboard.KEY_RSHIFT;
+    }
+
+    @Override
+    public int getEscape() {
+        return Keyboard.KEY_ESCAPE;
+    }
+
+    @Override
+    public int getNone() {
+        return Keyboard.KEY_NONE;
+    }
+
+    @Override
+    public int getEnter() {
+        return Keyboard.KEY_RETURN;
+    }
+
+    @Override
+    public int getDelete() {
+        return Keyboard.KEY_DELETE;
+    }
+
+    @Override
+    public int getUp() {
+        return Keyboard.KEY_UP;
+    }
+
+    @Override
+    public int getDown() {
+        return Keyboard.KEY_DOWN;
+    }
+
+    @Override
+    public int getLeft() {
+        return Keyboard.KEY_LEFT;
+    }
+
+    @Override
+    public int getRight() {
+        return Keyboard.KEY_RIGHT;
+    }
+
+    @Override
+    public int getHome() {
+        return Keyboard.KEY_HOME;
+    }
+
+    @Override
+    public int getEnd() {
+        return Keyboard.KEY_END;
+    }
+
+    @Override
+    public int getKeyA() {
+        return Keyboard.KEY_A;
+    }
+
+    @Override
+    public int getKeyC() {
+        return Keyboard.KEY_C;
+    }
+
+    @Override
+    public int getKeyX() {
+        return Keyboard.KEY_X;
+    }
+
+    @Override
+    public int getKeyV() {
+        return Keyboard.KEY_V;
+    }
+
+    @Override
+    public int getKeyN() {
+        return Keyboard.KEY_N;
+    }
+
+    @Override
+    public int getKeyF() {
+        return Keyboard.KEY_F;
+    }
+}