26.2 backport

gradle.properties

@@ -10,11 +10,11 @@ loader_version=0.18.6
 loom_version=1.16-SNAPSHOT
 
 # Mod Properties
-mod_version=1.1.6+26.1
+mod_version=1.1.7+26.1
 maven_group=borknbeans.lightweightinventorysorting
 archives_base_name=lightweight-inventory-sorting
 
 # Dependencies
-fabric_version=0.145.4+26.1.1
-modmenu_version=18.0.0-alpha.8
+fabric_version=0.155.3+26.1.2
+modmenu_version=18.0.1
 cloth_version=26.1.154

gradle/wrapper/gradle-wrapper.properties

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

src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ContainerScreenMixin.java

@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.ContainerScreen;
 import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.ChestMenu;
@@ -49,15 +48,4 @@ public boolean keyPressed(KeyEvent event) {
         }
         return super.keyPressed(event);
     }
-
-    @Override
-    public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
-        if (LightweightInventorySortingClient.sortKeyBind.matchesMouse(event)) {
-            if (this.sortButton != null) {
-                Sorter.sortContainerClientside(Minecraft.getInstance(), sortButton.getSortStartIndex(), sortButton.getSortEndIndex());
-            }
-            return true;
-        }
-        return super.mouseClicked(event, doubleClick);
-    }
 }

src/client/java/borknbeans/lightweightinventorysorting/mixin/client/CreativeModeInventoryScreenMixin.java

@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
 import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -18,6 +17,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(CreativeModeInventoryScreen.class)
 public abstract class CreativeModeInventoryScreenMixin extends AbstractContainerScreen<AbstractContainerMenu> {
@@ -66,28 +66,14 @@ private void updateSortButton() {
         }
     }
 
-    @Override
-    public boolean keyPressed(KeyEvent event) {
-        // Only allow sorting when on inventory tab
+    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
+    private void onKeyPressed(KeyEvent event, CallbackInfoReturnable<Boolean> cir) {
         if (isInventoryTab() && LightweightInventorySortingClient.sortKeyBind.matches(event)) {
             if (sortButton != null) {
                 Sorter.sortContainerClientside(Minecraft.getInstance(), sortButton.getSortStartIndex(), sortButton.getSortEndIndex());
             }
-            return true;
+            cir.setReturnValue(true);
         }
-        return super.keyPressed(event);
-    }
-
-    @Override
-    public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
-        // Only allow sorting when on inventory tab
-        if (isInventoryTab() && LightweightInventorySortingClient.sortKeyBind.matchesMouse(event)) {
-            if (sortButton != null) {
-                Sorter.sortContainerClientside(Minecraft.getInstance(), sortButton.getSortStartIndex(), sortButton.getSortEndIndex());
-            }
-            return true;
-        }
-        return super.mouseClicked(event, doubleClick);
     }
 
     @Unique

src/client/java/borknbeans/lightweightinventorysorting/mixin/client/HorseInventoryScreenMixin.java

@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.HorseInventoryScreen;
 import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.HorseInventoryMenu;
@@ -47,15 +46,4 @@ public boolean keyPressed(KeyEvent event) {
         }
         return super.keyPressed(event);
     }
-
-    @Override
-    public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
-        if (LightweightInventorySortingClient.sortKeyBind.matchesMouse(event)) {
-            if (sortButton != null) {
-                Sorter.sortContainerClientside(Minecraft.getInstance(), sortButton.getSortStartIndex(), sortButton.getSortEndIndex());
-            }
-            return true;
-        }
-        return super.mouseClicked(event, doubleClick);
-    }
 }

src/client/java/borknbeans/lightweightinventorysorting/mixin/client/InventoryScreenMixin.java

@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.InventoryMenu;
@@ -45,7 +44,6 @@ private void onRecipeBookToggle(CallbackInfo ci) {
         }
     }
 
-
     @Override
     public boolean keyPressed(KeyEvent event) {
         if (LightweightInventorySortingClient.sortKeyBind.matches(event)) {
@@ -57,17 +55,6 @@ public boolean keyPressed(KeyEvent event) {
         return super.keyPressed(event);
     }
 
-    @Override
-    public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
-        if (LightweightInventorySortingClient.sortKeyBind.matchesMouse(event)) {
-            if (sortButton != null) {
-                Sorter.sortContainerClientside(Minecraft.getInstance(), sortButton.getSortStartIndex(), sortButton.getSortEndIndex());
-            }
-            return true;
-        }
-        return super.mouseClicked(event, doubleClick);
-    }
-
     private void setButtonCoordinates() {
         sortButton.setX(this.leftPos + this.imageWidth - 20 + Config.xOffsetInventory);
         sortButton.setY(this.height / 2 - 15 + Config.yOffsetInventory);

src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ShulkerBoxScreenMixin.java

@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.ShulkerBoxScreen;
 import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.ShulkerBoxMenu;
@@ -36,7 +35,6 @@ protected void init() {
         this.addRenderableWidget(sortButton);
     }
 
-
     @Override
     public boolean keyPressed(KeyEvent event) {
         if (LightweightInventorySortingClient.sortKeyBind.matches(event)) {
@@ -47,15 +45,4 @@ public boolean keyPressed(KeyEvent event) {
         }
         return super.keyPressed(event);
     }
-
-    @Override
-    public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
-        if (LightweightInventorySortingClient.sortKeyBind.matchesMouse(event)) {
-            if (sortButton != null) {
-                Sorter.sortContainerClientside(Minecraft.getInstance(), sortButton.getSortStartIndex(), sortButton.getSortEndIndex());
-            }
-            return true;
-        }
-        return super.mouseClicked(event, doubleClick);
-    }
 }

src/main/resources/fabric.mod.json

@@ -11,7 +11,9 @@
 		"Alex9303",
 		"demorogabrtz",
 		"RuyaSavascisi",
-		"LarsMans64"
+		"LarsMans64",
+        "gabrtzweb",
+        "kuroneko007"
 	],
 	"contact": {
 		"sources": "https://github.com/borknbeans/LightweightInventorySorting/tree/main"
@@ -48,4 +50,4 @@
 		"modmenu": "*",
 		"cloth-config": "*"
 	}
-}
+}