Update to mc1.21.3

NotRyken · NotRyken · commit 83b1027149a6 · 2025-08-27T12:31:37.000+08:00
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/ClientSort.java b/common/src/main/java/dev/terminalmc/clientsort/client/ClientSort.java
@@ -87,10 +87,9 @@ public static void afterConfigSaved(Config config) {
 
     public static void updateItemTags(Config.Options options) {
         options.typeMatchItemCache.clear();
-        BuiltInRegistries.ITEM.getTags().forEach((pair) -> {
-            if (options.typeMatchTags.contains(pair.getFirst().location().getPath())) {
-                pair.getSecond().forEach((itemHolder) ->
-                        options.typeMatchItemCache.add(itemHolder.value()));
+        BuiltInRegistries.ITEM.getTags().forEach((named) -> {
+            if (options.typeMatchTags.contains(named.key().location().getPath())) {
+                named.forEach((itemHolder) -> options.typeMatchItemCache.add(itemHolder.value()));
             }
         });
     }
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/config/Config.java b/common/src/main/java/dev/terminalmc/clientsort/client/config/Config.java
@@ -96,9 +96,8 @@ public enum ExtraSlotScope {
                 val != null && Arrays.stream(ExtraSlotScope.values()).toList().contains(val)
                         ? val : extraSlotScopeDefault;
 
-
-        public static final boolean bundlesUseLeftClickDefault = false;
-        public boolean bundlesUseLeftClick = bundlesUseLeftClickDefault;
+        public static final boolean bundlesUseRightClickDefault = false;
+        public boolean bundlesUseRightClick = bundlesUseRightClickDefault;
 
         public static final boolean alwaysMatchByTypeDefault = false;
         public boolean alwaysMatchByType = alwaysMatchByTypeDefault;
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java
@@ -135,13 +135,13 @@ else if (val > Config.Options.INTERACTION_INTERVAL_MAX)
                 .build());
 
         general.addEntry(eb.startBooleanToggle(
-                        localized("option", "bundlesUseLeftClick"),
-                        options.bundlesUseLeftClick
+                        localized("option", "bundlesUseRightClick"),
+                        options.bundlesUseRightClick
                 )
-                .setTooltip(localized("option", "bundlesUseLeftClick.tooltip"))
-                .setDefaultValue(Config.Options.bundlesUseLeftClickDefault)
+                .setTooltip(localized("option", "bundlesUseRightClick.tooltip"))
+                .setDefaultValue(Config.Options.bundlesUseRightClickDefault)
                 .setSaveConsumer(val -> {
-                    options.bundlesUseLeftClick = val;
+                    options.bundlesUseRightClick = val;
                     if (val)
                         CreativeSearchOrder.tryRefreshStackPositionMap();
                 })
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/EditorScreen.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/EditorScreen.java
@@ -441,10 +441,10 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
      * higher render layer, while still keeping the underlay detail discernible.
      */
     @Override
-    protected void renderBlurredBackground(float partialTick) {
+    protected void renderBlurredBackground() {
         int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(1);
-        super.renderBlurredBackground(partialTick);
+        super.renderBlurredBackground();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
     }
 
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/SelectorScreen.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/SelectorScreen.java
@@ -108,11 +108,11 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
     }
 
     @Override
-    protected void renderBlurredBackground(float partialTick) {
+    protected void renderBlurredBackground() {
         // Heavy blur, we want the widgets to really stand out
         int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(6);
-        super.renderBlurredBackground(partialTick);
+        super.renderBlurredBackground();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
     }
 
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TriggerButton.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TriggerButton.java
@@ -34,6 +34,7 @@
 import net.minecraft.client.gui.navigation.FocusNavigationEvent;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -169,7 +170,7 @@ public void renderWidget(
 
         // Draw texture
         ResourceLocation texture = sprites.get(isActive(), isHoveredOrFocused());
-        graphics.blitSprite(texture, getX(), getY(), 0, width, height);
+        graphics.blitSprite(RenderType::guiTextured, texture, getX(), getY(), width, height);
 
         // Draw policy state indicator
         if (!operationAllowed) {
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/inventory/operator/client/ClientSurvivalOperator.java b/common/src/main/java/dev/terminalmc/clientsort/client/inventory/operator/client/ClientSurvivalOperator.java
@@ -23,10 +23,10 @@
 import dev.terminalmc.clientsort.client.network.InteractionManager;
 import dev.terminalmc.clientsort.client.util.SoundManager;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 
 import java.util.ArrayDeque;
 import java.util.BitSet;
@@ -290,11 +290,11 @@ protected void sort(int[] sortedIds, boolean playSound) {
 
                 // Modify standard click if required for bundles
                 int mouseButton = 0;
-                boolean clickOnBundleWithItem = originScopeStacks[dstId].is(Items.BUNDLE)
+                boolean clickOnBundleWithItem = originScopeStacks[dstId].is(ItemTags.BUNDLES)
                         && !(carriedStack.isEmpty());
-                boolean clickOnItemWithBundle = carriedStack.is(Items.BUNDLE)
+                boolean clickOnItemWithBundle = carriedStack.is(ItemTags.BUNDLES)
                         && !(originScopeStacks[dstId].isEmpty());
-                if (options().bundlesUseLeftClick
+                if (!options().bundlesUseRightClick
                         && (clickOnBundleWithItem || clickOnItemWithBundle)) {
                     mouseButton = 1;
                 }
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/inventory/screen/ContainerScreenHelper.java b/common/src/main/java/dev/terminalmc/clientsort/client/inventory/screen/ContainerScreenHelper.java
@@ -24,7 +24,6 @@
 import dev.terminalmc.clientsort.util.inject.ISlot;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
-import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.Slot;
@@ -122,69 +121,41 @@ public boolean isExtraSlot(Slot slot) {
      * @return the scope of the slot, or {@link Scope#INVALID} if the slot is not accessible.
      */
     public Scope getScope(Slot slot) {
-        // Screen with only player inventory
-        if (screen instanceof EffectRenderingInventoryScreen) {
-            // Player inventory
-            if (slot.container instanceof Inventory) {
-                boolean mergeWithHotbar = false;
-
-                // Extra inventory slots e.g. offhand
-                if (isExtraSlot(slot)) {
-                    switch (options().extraSlotScope) {
-                        case HOTBAR -> mergeWithHotbar = true;
-                        case EXTRA -> {
-                            return Scope.PLAYER_INV_EXTRA;
-                        }
-                        case NONE -> {
-                            return Scope.INVALID;
-                        }
+        // Player inventory
+        if (slot.container instanceof Inventory) {
+            boolean mergeWithHotbar = false;
+
+            // Extra inventory slots e.g. offhand
+            if (isExtraSlot(slot)) {
+                switch (options().extraSlotScope) {
+                    case HOTBAR -> mergeWithHotbar = true;
+                    case EXTRA -> {
+                        return Scope.PLAYER_INV_EXTRA;
+                    }
+                    case NONE -> {
+                        return Scope.INVALID;
                     }
                 }
+            }
 
-                // Hotbar
-                if (mergeWithHotbar || isHotbarSlot(slot)) {
-                    switch (options().hotbarScope) {
-                        case HOTBAR -> {
-                            return Scope.PLAYER_INV_HOTBAR;
-                        }
-                        case NONE -> {
-                            return Scope.INVALID;
-                        }
+            // Hotbar
+            if (mergeWithHotbar || isHotbarSlot(slot)) {
+                switch (options().hotbarScope) {
+                    case HOTBAR -> {
+                        return Scope.PLAYER_INV_HOTBAR;
+                    }
+                    case NONE -> {
+                        return Scope.INVALID;
                     }
                 }
-
-                return Scope.PLAYER_INV;
             }
 
-            // Out of inventory e.g. 2x2 crafting grid
-            else {
-                return Scope.PLAYER_OTHER;
-            }
+            return Scope.PLAYER_INV;
         }
 
-        // Screen with container, and probably player inventory attached
+        // Not player inventory
         else {
-            // Player inventory
-            if (slot.container instanceof Inventory) {
-                // Hotbar
-                if (isHotbarSlot(slot)) {
-                    switch (options().hotbarScope) {
-                        case HOTBAR -> {
-                            return Scope.PLAYER_INV_HOTBAR;
-                        }
-                        case NONE -> {
-                            return Scope.INVALID;
-                        }
-                    }
-                }
-
-                return Scope.PLAYER_INV;
-            }
-
-            // Container
-            else {
-                return Scope.CONTAINER_INV;
-            }
+            return Scope.CONTAINER_INV;
         }
     }
 
diff --git a/common/src/main/java/dev/terminalmc/clientsort/mixin/client/ClientPacketListenerMixin.java b/common/src/main/java/dev/terminalmc/clientsort/mixin/client/ClientPacketListenerMixin.java
@@ -22,7 +22,7 @@
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.network.protocol.game.ClientboundLoginPacket;
-import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;
+import net.minecraft.network.protocol.game.ClientboundSetCursorItemPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -59,10 +59,10 @@ private void afterLogin(ClientboundLoginPacket packet, CallbackInfo ci) {
     }
 
     @Inject(
-            method = "handleSetCarriedItem",
+            method = "handleSetCursorItem",
             at = @At("HEAD")
     )
-    public void beforeHeldItemChange(ClientboundSetCarriedItemPacket packet, CallbackInfo ci) {
+    public void beforeHeldItemChange(ClientboundSetCursorItemPacket packet, CallbackInfo ci) {
         InteractionManager.triggerSend(InteractionManager.TriggerType.HELD_ITEM_CHANGE);
     }
 
diff --git a/common/src/main/resources/assets/clientsort/lang/en_us.json b/common/src/main/resources/assets/clientsort/lang/en_us.json
@@ -60,8 +60,8 @@
   "option.clientsort.optimizeCreativeSorting.tooltip": "Whether to improve performance of creative-order sorting by storing the order in memory.",
   "option.clientsort.hotbarScope": "Hotbar Scope",
   "option.clientsort.extraSlotScope": "Extra Slot Scope",
-  "option.clientsort.bundlesUseLeftClick": "Bundles use Left Click",
-  "option.clientsort.bundlesUseLeftClick.tooltip": "In 1.21.2+, bundles use left-click to load, which can interfere with inventory actions. If playing on a 1.21.2+ server, enable this option.",
+  "option.clientsort.bundlesUseRightClick": "Bundles use Right Click",
+  "option.clientsort.bundlesUseRightClick.tooltip": "In 1.21.1 and earlier versions, bundles use right-click to load, which can interfere with inventory actions. If playing on a 1.21.1 or earlier server, enable this option.",
   "option.clientsort.showDebugInfo": "Show Debug Info",
   "option.clientsort.showDebugInfo.tooltip": "Whether to show debug info on the GUI and enable debug logging. Value will reset when you restart the game.",
 
diff --git a/common/src/main/resources/assets/clientsort/lang/ru_ru.json b/common/src/main/resources/assets/clientsort/lang/ru_ru.json
@@ -60,8 +60,8 @@
   "option.clientsort.optimizeCreativeSorting.tooltip": "Повышать производительность сортировки в творческом режиме за счёт сохранения порядка в памяти",
   "option.clientsort.hotbarScope": "Область панели быстрого доступа",
   "option.clientsort.extraSlotScope": "Область дополнительных слотов",
-  "option.clientsort.bundlesUseLeftClick": "Пакеты используют ЛКМ",
-  "option.clientsort.bundlesUseLeftClick.tooltip": "С версии 1.21.2+ для загрузки пакетов используется ЛКМ, что может мешать сортировке. Если вы играете на сервере 1.21.2+, включите эту опцию.",
+  "option.clientsort.bundlesUseRightClick": "Пакеты используют ПКМ",
+  "option.clientsort.bundlesUseRightClick.tooltip": "До версии 1.21.2 для загрузки пакетов использовалась ПКМ, что нарушало сортировку. Если вы играете на сервере 1.21.1 или более ранней версии, включите эту опцию.",
   "option.clientsort.showDebugInfo": "Показать отладочную информацию",
   "option.clientsort.showDebugInfo.tooltip": "Показывать отладочную информацию в интерфейсе и включать логирование. Значение сбрасывается при перезапуске игры.",
 
diff --git a/gradle.properties b/gradle.properties
@@ -72,37 +72,37 @@ mod_curseforge_slug=clientsort
 # Subproject Build Compatibility
 #  -> Comment out or unset to disable publishing of a subproject.
 mod_loaders_fabric=fabric
-mc_versions_fabric=1.21,1.21.1
+mc_versions_fabric=1.21.2,1.21.3,1.21.4
 mod_loaders_neoforge=neoforge
-mc_versions_neoforge=1.21.1
+mc_versions_neoforge=1.21.3,1.21.4
 
 # Java
 java_version=21
 java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.1
-minecraft_versions_fabric=>1.20.6
-minecraft_versions_neoforge=[1.21.1,)
+minecraft_version=1.21.3
+minecraft_versions_fabric=>1.21.1
+minecraft_versions_neoforge=[1.21.3,)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
-parchment_minecraft_version=1.21.1
-parchment_version=2024.11.17
+parchment_minecraft_version=1.21.3
+parchment_version=2024.12.07
 
 # Fabric https://fabricmc.net/develop
 #  -> See also 'mixinextras_jij_fabric'
 fabric_loader_version=0.16.14
 fabric_loader_versions=>=0.16.1
-fabric_api_version=0.116.4+1.21.1
+fabric_api_version=0.114.1+1.21.3
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 #  -> See also 'mixinextras_jij_neoforge'
-neoforge_version=21.1.190
-neoforge_versions=[21.1.22,)
+neoforge_version=21.3.84
+neoforge_versions=[21.3.0-beta,)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.1-20240808.144430
+neoform_version=1.21.3-20241023.131943
 
 # Dependency Property Identifiers
 #  -> These values point to other properties with full dependency specification.
@@ -129,21 +129,21 @@ neoforge_deps=clothconfig,itemlocks
 d_common_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-neoforge:$v
 d_fabric_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-fabric:$v:-,recommends:cloth-config,req:9s6osm5g,req:cloth-config
 d_neoforge_clothconfig=-:-:imp:me.shedaniel.cloth:cloth-config-neoforge:$v:-,optional:cloth-config,req:9s6osm5g,req:cloth-config
-v_clothconfig=15.0.140
-vr_fabric_clothconfig=>=15
-vr_neoforge_clothconfig=[15,)
+v_clothconfig=16.0.143
+vr_fabric_clothconfig=>=16
+vr_neoforge_clothconfig=[16,)
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
 d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
-v_modmenu=11.0.3
-vr_fabric_modmenu=>=11.0.0-beta.1
+v_modmenu=12.0.0
+vr_fabric_modmenu=>=12.0.0-beta.1
 
 # ItemLocks https://modrinth.com/mod/tJzrFuyy/versions
 d_common_itemlocks=-:-:imp:maven.modrinth:tJzrFuyy:$v:v_neoforge_itemlocks
 d_fabric_itemlocks=-:-:imp:maven.modrinth:tJzrFuyy:$v:v_fabric_itemlocks
 d_neoforge_itemlocks=-:-:imp:maven.modrinth:tJzrFuyy:$v:v_neoforge_itemlocks
-v_fabric_itemlocks=AmikGda1
-v_neoforge_itemlocks=TtNHrpXm
+v_fabric_itemlocks=ou0wgkNr
+v_neoforge_itemlocks=ElM5TUYa
 
 # Dependency Version Extensions
 #  -> Intended for addon mods to show which version they were compiled against.

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,9 @@ public static void afterConfigSaved(Config config) {`
`87`	`87`
`88`	`88`	`public static void updateItemTags(Config.Options options) {`
`89`	`89`	`options.typeMatchItemCache.clear();`
`90`		`- BuiltInRegistries.ITEM.getTags().forEach((pair) -> {`
`91`		`- if (options.typeMatchTags.contains(pair.getFirst().location().getPath())) {`
`92`		`- pair.getSecond().forEach((itemHolder) ->`
`93`		`- options.typeMatchItemCache.add(itemHolder.value()));`
	`90`	`+ BuiltInRegistries.ITEM.getTags().forEach((named) -> {`
	`91`	`+ if (options.typeMatchTags.contains(named.key().location().getPath())) {`
	`92`	`+ named.forEach((itemHolder) -> options.typeMatchItemCache.add(itemHolder.value()));`
`94`	`93`	`}`
`95`	`94`	`});`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,11 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Override`
`111`		`- protected void renderBlurredBackground(float partialTick) {`
	`111`	`+ protected void renderBlurredBackground() {`
`112`	`112`	`// Heavy blur, we want the widgets to really stand out`
`113`	`113`	`int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();`
`114`	`114`	`Minecraft.getInstance().options.menuBackgroundBlurriness().set(6);`
`115`		`- super.renderBlurredBackground(partialTick);`
	`115`	`+ super.renderBlurredBackground();`
`116`	`116`	`Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`import net.minecraft.client.multiplayer.ClientPacketListener;`
`23`	`23`	`import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;`
`24`	`24`	`import net.minecraft.network.protocol.game.ClientboundLoginPacket;`
`25`		`-import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;`
	`25`	`+import net.minecraft.network.protocol.game.ClientboundSetCursorItemPacket;`
`26`	`26`	`import org.spongepowered.asm.mixin.Mixin;`
`27`	`27`	`import org.spongepowered.asm.mixin.injection.At;`
`28`	`28`	`import org.spongepowered.asm.mixin.injection.Inject;`
`@@ -59,10 +59,10 @@ private void afterLogin(ClientboundLoginPacket packet, CallbackInfo ci) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Inject(`
`62`		`- method = "handleSetCarriedItem",`
	`62`	`+ method = "handleSetCursorItem",`
`63`	`63`	`at = @At("HEAD")`
`64`	`64`	`)`
`65`		`- public void beforeHeldItemChange(ClientboundSetCarriedItemPacket packet, CallbackInfo ci) {`
	`65`	`+ public void beforeHeldItemChange(ClientboundSetCursorItemPacket packet, CallbackInfo ci) {`
`66`	`66`	`InteractionManager.triggerSend(InteractionManager.TriggerType.HELD_ITEM_CHANGE);`
`67`	`67`	`}`
`68`	`68`