From 7ab83fc7588fcbd71efbc3c6d78b9bd696923f2f Mon Sep 17 00:00:00 2001 From: Ethan Bork Date: Thu, 18 Jun 2026 10:26:12 -0700 Subject: [PATCH 1/5] bump version, update contributors --- gradle.properties | 4 ++-- src/main/resources/fabric.mod.json | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1238481..1a23a11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,11 +10,11 @@ loader_version=0.19.3 loom_version=1.17-SNAPSHOT # Mod Properties -mod_version=1.1.6+26.2-beta +mod_version=1.1.6+26.2 maven_group=borknbeans.lightweightinventorysorting archives_base_name=lightweight-inventory-sorting # Dependencies fabric_version=0.152.1+26.2 modmenu_version=20.0.0-beta.2 -cloth_version=26.1.154 +cloth_version=26.2.155 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 69fb77d..da23b31 100644 --- a/src/main/resources/fabric.mod.json +++ b/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": "*" } -} \ No newline at end of file +} From 8f5c3bce0859c73ea6b12327259dbb2f6d42e085 Mon Sep 17 00:00:00 2001 From: Ethan Bork Date: Tue, 14 Jul 2026 20:17:49 -0700 Subject: [PATCH 2/5] cleanup unneeded functions for mouse click overrides. fix bug with creative inventory --- .../mixin/client/ContainerScreenMixin.java | 12 ---------- .../CreativeModeInventoryScreenMixin.java | 22 ++++--------------- .../client/HorseInventoryScreenMixin.java | 12 ---------- .../mixin/client/InventoryScreenMixin.java | 13 ----------- .../mixin/client/ShulkerBoxScreenMixin.java | 13 ----------- 5 files changed, 4 insertions(+), 68 deletions(-) diff --git a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ContainerScreenMixin.java b/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ContainerScreenMixin.java index 415f9e7..66d0519 100644 --- a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ContainerScreenMixin.java +++ b/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); - } } diff --git a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/CreativeModeInventoryScreenMixin.java b/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/CreativeModeInventoryScreenMixin.java index bad786a..8e21a3a 100644 --- a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/CreativeModeInventoryScreenMixin.java +++ b/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 { @@ -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 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 diff --git a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/HorseInventoryScreenMixin.java b/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/HorseInventoryScreenMixin.java index 3dccee6..76ba1e2 100644 --- a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/HorseInventoryScreenMixin.java +++ b/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); - } } diff --git a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/InventoryScreenMixin.java b/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/InventoryScreenMixin.java index a47100b..ff4f81a 100644 --- a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/InventoryScreenMixin.java +++ b/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); diff --git a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ShulkerBoxScreenMixin.java b/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ShulkerBoxScreenMixin.java index 0c308f2..ad131ee 100644 --- a/src/client/java/borknbeans/lightweightinventorysorting/mixin/client/ShulkerBoxScreenMixin.java +++ b/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); - } } From 896f907b87b3c75ff84bdc736bc1b73d09095051 Mon Sep 17 00:00:00 2001 From: Ethan Bork Date: Tue, 14 Jul 2026 20:18:32 -0700 Subject: [PATCH 3/5] bump mod version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1a23a11..9738305 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.19.3 loom_version=1.17-SNAPSHOT # Mod Properties -mod_version=1.1.6+26.2 +mod_version=1.1.7+26.2 maven_group=borknbeans.lightweightinventorysorting archives_base_name=lightweight-inventory-sorting From ec947107dff4b2b65e99127b9a02da33ca5e396a Mon Sep 17 00:00:00 2001 From: JohnGameRage Date: Sun, 16 Aug 2026 18:42:14 +0300 Subject: [PATCH 4/5] Bump Gradle wrapper to 9.5.0 due to fabric-loom plugin API version mismatch --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..1a70468 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 4c28dc47ed72b8e0bc95c8eec7227e2d1c6e6b1c Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 17 Sep 2026 12:37:46 -0700 Subject: [PATCH 5/5] update versioning correctly --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9738305..b42f716 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,16 +5,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.2 -loader_version=0.19.3 -loom_version=1.17-SNAPSHOT +minecraft_version=26.1.2 +loader_version=0.18.6 +loom_version=1.16-SNAPSHOT # Mod Properties -mod_version=1.1.7+26.2 +mod_version=1.1.7+26.1 maven_group=borknbeans.lightweightinventorysorting archives_base_name=lightweight-inventory-sorting # Dependencies -fabric_version=0.152.1+26.2 -modmenu_version=20.0.0-beta.2 -cloth_version=26.2.155 +fabric_version=0.155.3+26.1.2 +modmenu_version=18.0.1 +cloth_version=26.1.154