Update to mc1.21.3

NotRyken · NotRyken · commit 4e887d2827f3 · 2025-10-25T17:55:46.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
@@ -96,10 +96,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
@@ -109,9 +109,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;
 
         // Matching options
 
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
@@ -178,13 +178,13 @@ else if (val > Config.Options.AUTO_OP_DELAY_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
@@ -520,10 +520,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
@@ -110,11 +110,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
@@ -35,6 +35,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;
@@ -173,7 +174,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/helper/ContainerScreenHelper.java b/common/src/main/java/dev/terminalmc/clientsort/client/inventory/helper/ContainerScreenHelper.java
@@ -21,7 +21,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.Container;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.Slot;
@@ -78,29 +77,26 @@ public static 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) {
-        //noinspection ConstantValue
-        if (slot.container == null)
-            return Scope.INVALID;
-        if (slot.container instanceof ContainerSingleItem)
-            return Scope.INVALID;
         if (slot.isFake())
             return Scope.INVALID;
+        return switch (slot.container) {
+            //noinspection DataFlowIssue
+            case null -> Scope.INVALID;
+            case ContainerSingleItem ignored -> Scope.INVALID;
 
-        // Screen with only player inventory
-        if (screen instanceof EffectRenderingInventoryScreen) {
             // Player inventory
-            if (slot.container instanceof Inventory) {
+            case Inventory ignored -> {
                 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;
+                            yield Scope.PLAYER_INV_EXTRA;
                         }
                         case NONE -> {
-                            return Scope.INVALID;
+                            yield Scope.INVALID;
                         }
                     }
                 }
@@ -109,47 +105,20 @@ public Scope getScope(Slot slot) {
                 if (mergeWithHotbar || isHotbarSlot(slot)) {
                     switch (options().hotbarScope) {
                         case HOTBAR -> {
-                            return Scope.PLAYER_INV_HOTBAR;
+                            yield Scope.PLAYER_INV_HOTBAR;
                         }
                         case NONE -> {
-                            return Scope.INVALID;
+                            yield Scope.INVALID;
                         }
                     }
                 }
 
-                return Scope.PLAYER_INV;
+                yield Scope.PLAYER_INV;
             }
 
-            // Out of inventory e.g. 2x2 crafting grid
-            else {
-                return Scope.PLAYER_OTHER;
-            }
-        }
-
-        // Screen with container, and probably player inventory attached
-        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;
-            }
-        }
+            // Not player inventory
+            default -> Scope.CONTAINER_INV;
+        };
     }
 
     /**
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
@@ -25,10 +25,10 @@
 import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
 import dev.terminalmc.clientsort.util.inject.ISlot;
 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;
@@ -284,11 +284,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/resources/assets/clientsort/lang/en_us.json b/common/src/main/resources/assets/clientsort/lang/en_us.json
@@ -80,8 +80,8 @@
   "option.clientsort.autoOpDelayContainer.tooltip": "The delay, in ticks, after which to perform automatic operations on a container when it is opened.",
   "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
@@ -80,8 +80,8 @@
   "option.clientsort.autoOpDelayContainer.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/common/src/main/resources/assets/clientsort/lang/zh_cn.json b/common/src/main/resources/assets/clientsort/lang/zh_cn.json
@@ -1,4 +1,4 @@
-{
+﻿{
   "modmenu.descriptionTranslation.clientsort": "功能全面、操作便捷的物品栏整理。",
 
   "clientsort.name": "ClientSort",
@@ -82,8 +82,8 @@
   "option.clientsort.autoOpDelayContainer.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.1 及更早版本中，收纳袋使用右键单击来装载物品，这可能会干扰物品栏操作。如果在 1.21.1 或更早版本的服务器上游戏，请启用此选项。",
   "option.clientsort.showDebugInfo": "显示调试信息",
   "option.clientsort.showDebugInfo.tooltip": "是否在图形界面上显示调试信息并启用调试日志记录。值将在重启游戏时重置。",
 
diff --git a/gradle.properties b/gradle.properties
@@ -73,37 +73,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.17.2
 fabric_loader_versions=>=0.17.0
-fabric_api_version=0.116.6+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.209
-neoforge_versions=[21.1.195,)
+neoforge_version=21.3.93
+neoforge_versions=[21.3.88,)
 # 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.
@@ -130,21 +130,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/project/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/project/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
`@@ -96,10 +96,9 @@ public static void afterConfigSaved(Config config) {`
`96`	`96`
`97`	`97`	`public static void updateItemTags(Config.Options options) {`
`98`	`98`	`options.typeMatchItemCache.clear();`
`99`		`- BuiltInRegistries.ITEM.getTags().forEach((pair) -> {`
`100`		`- if (options.typeMatchTags.contains(pair.getFirst().location().getPath())) {`
`101`		`- pair.getSecond().forEach((itemHolder) ->`
`102`		`- options.typeMatchItemCache.add(itemHolder.value()));`
	`99`	`+ BuiltInRegistries.ITEM.getTags().forEach((named) -> {`
	`100`	`+ if (options.typeMatchTags.contains(named.key().location().getPath())) {`
	`101`	`+ named.forEach((itemHolder) -> options.typeMatchItemCache.add(itemHolder.value()));`
`103`	`102`	`}`
`104`	`103`	`});`
`105`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,11 +110,11 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`
`113`		`- protected void renderBlurredBackground(float partialTick) {`
	`113`	`+ protected void renderBlurredBackground() {`
`114`	`114`	`// Heavy blur, we want the widgets to really stand out`
`115`	`115`	`int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();`
`116`	`116`	`Minecraft.getInstance().options.menuBackgroundBlurriness().set(6);`
`117`		`- super.renderBlurredBackground(partialTick);`
	`117`	`+ super.renderBlurredBackground();`
`118`	`118`	`Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);`
`119`	`119`	`}`
`120`	`120`