Update to Minecraft 1.21.9

Author: olivi-r

build-fabric.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version '1.11-SNAPSHOT'
 }
 
 version = project.modVersion

gradle.properties

@@ -4,22 +4,22 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 org.gradle.daemon=false
 
-modVersion=2.28
+modVersion=2.29
 modJavaVersion=21
 # Remember to update fabric.mod.json
-modCredits=Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey.
+modCredits=Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey, livInFear, Abelpro678.
 modDescription=A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
 
-forgeMcVersion=1.21.6
-forgeVersion=56.0.0
-forgeLoaderVersion=[56,)
+forgeMcVersion=1.21.9
+forgeVersion=59.0.0
+forgeLoaderVersion=[59,)
 forgeEventBusValidatorVersion=7.0-beta.7
 
-neoMcVersion=1.21.6
-neoVersion=21.6.4-beta
+neoMcVersion=1.21.9
+neoVersion=21.9.6-beta
 neoLoaderVersion=[4,)
 
-fabricMcVersion=1.21.6
-fabricLoaderVersion=0.16.14
-fabricApiVersion=0.127.0+1.21.6
-fabricModMenuVersion=15.0.0-beta.2
+fabricMcVersion=1.21.9
+fabricLoaderVersion=0.17.2
+fabricApiVersion=0.133.14+1.21.9
+fabricModMenuVersion=16.0.0-rc.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -19,7 +19,7 @@ public ConfigScreen(Screen previous) {
     protected void init() {
         Main.config.read();
 
-        this.addRenderableWidget(new StringWidget(0, 15, this.width, 9, this.title, this.font));
+        this.addRenderableWidget(new StringWidget(this.width / 2 - this.font.width(this.title) / 2, 15, this.width, 9, this.title, this.font));
 
         this.addRenderableWidget(CycleButton.onOffBuilder(Main.config.rmbTweak)
                 .create(this.width / 2 - 155, this.height / 6, 150, 20,

gradlew

@@ -244,8 +244,8 @@ public static boolean onMouseDrag(Screen screen, double x, double y, MouseButton
             if (selectedSlotStack.isEmpty())
                 return false;
 
-            boolean shiftIsDown = InputConstants.isKeyDown(mc.getWindow().getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT)
-                    || InputConstants.isKeyDown(mc.getWindow().getWindow(), GLFW.GLFW_KEY_RIGHT_SHIFT);
+            boolean shiftIsDown = InputConstants.isKeyDown(mc.getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT)
+                    || InputConstants.isKeyDown(mc.getWindow(), GLFW.GLFW_KEY_RIGHT_SHIFT);
 
             if (stackOnMouse.isEmpty()) {
                 // Shift-LMB drag without item.

gradlew.bat

@@ -12,21 +12,21 @@ public void onInitializeClient() {
         Main.initialize();
 
         ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
-            ScreenMouseEvents.allowMouseClick(screen).register((_screen, x, y, eventButton) -> {
-                MouseButton button = MouseButton.fromEventButton(eventButton);
+            ScreenMouseEvents.allowMouseClick(screen).register((_screen, context) -> {
+                MouseButton button = MouseButton.fromEventButton(context.button());
                 if (button != null)
-                    return !Main.onMouseClicked(screen, x, y, button);
+                    return !Main.onMouseClicked(screen, context.x(), context.y(), button);
                 return true;
             });
 
-            ScreenMouseEvents.allowMouseRelease(screen).register((_screen, x, y, eventButton) -> {
-                MouseButton button = MouseButton.fromEventButton(eventButton);
+            ScreenMouseEvents.allowMouseRelease(screen).register((_screen, context) -> {
+                MouseButton button = MouseButton.fromEventButton(context.button());
                 if (button != null)
-                    return !Main.onMouseReleased(screen, x, y, button);
+                    return !Main.onMouseReleased(screen, context.x(), context.y(), button);
                 return true;
             });
 
-            ScreenMouseEvents.afterMouseScroll(screen).register((_screen, x, y, horiz, vert) ->
+            ScreenMouseEvents.afterMouseScroll(screen).register((_screen, x, y, horiz, vert, consumed) ->
                     Main.onMouseScrolled(screen, x, y, vert));
         });
     }

src/main/java/yalter/mousetweaks/ConfigScreen.java

@@ -2,24 +2,27 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
 import net.minecraft.client.MouseHandler;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.MouseButtonEvent;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import yalter.mousetweaks.Main;
 import yalter.mousetweaks.MouseButton;
 
 @Mixin(MouseHandler.class)
 public abstract class MixinMouseHandler {
-    @WrapOperation(method = "handleAccumulatedMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;mouseDragged(DDIDD)Z"))
-    private boolean onMouseDragged(Screen screen, double x, double y, int activeButton, double dx, double dy, Operation<Boolean> operation) {
-        MouseButton button = MouseButton.fromEventButton(activeButton);
+    @WrapOperation(method = "handleAccumulatedMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;mouseDragged(Lnet/minecraft/client/input/MouseButtonEvent;DD)Z"))
+    private boolean onMouseDragged(Screen screen, MouseButtonEvent event, double dx, double dy, Operation<Boolean> operation) {
+        MouseButton button = MouseButton.fromEventButton(event.button());
         if (button != null) {
-            if (Main.onMouseDrag(screen, x, y, button)) {
+            if (Main.onMouseDrag(screen, event.x(), event.y(), button)) {
                 return true;
             }
         }
 
-        return operation.call(screen, x, y, activeButton, dx, dy);
+        return operation.call(screen, event, dx, dy);
     }
 }