Update to mc1.21.7

Author: NotRyken

common/src/main/java/dev/terminalmc/clientsort/client/compat/itemlocks/ItemLocksCompat.java

@@ -16,25 +16,16 @@
 
 package dev.terminalmc.clientsort.client.compat.itemlocks;
 
-import com.kirdow.itemlocks.client.LockManager;
-import dev.terminalmc.clientsort.util.inject.ISlot;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.Slot;
 
-import static com.kirdow.itemlocks.client.input.KeyBindings.isBypass;
-import static com.kirdow.itemlocks.proxy.Components.getComponent;
-
 public class ItemLocksCompat {
 
     /**
      * @param slot the slot to check.
      * @return {@code true} if the slot is valid, locked, and the bypass is not active.
      */
     static boolean isLocked(Slot slot) {
-        if (!(slot.container instanceof Inventory))
-            return false;
-        int index = adjustForInventory(((ISlot) slot).clientsort$getIndexInInv());
-        return getComponent(LockManager.class).isLockedSlotRaw(index) && !isBypass();
+        return false;
     }
 
     /**

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/GroupSelectorScreen.java

@@ -19,6 +19,7 @@
 import dev.terminalmc.clientsort.client.config.Config;
 import dev.terminalmc.clientsort.client.gui.ControlButtonManager;
 import dev.terminalmc.clientsort.client.gui.widget.ControlButton;
+import dev.terminalmc.clientsort.mixin.client.accessor.GuiGraphicsAccessor;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -99,20 +100,42 @@ private void rebuildGui() {
 
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+        underlay.renderBackground(graphics, mouseX, mouseY, partialTick);
         underlay.render(graphics, mouseX, mouseY, partialTick);
+
+        ((GuiGraphicsAccessor) graphics).clientsort$getGuiRenderState().nextStratum();
+        renderBlurredBackground(graphics);
+
         super.render(graphics, mouseX, mouseY, partialTick);
 
         for (ControlButton cb : buttons) {
             cb.renderWidget(graphics, mouseX, mouseY, partialTick);
         }
     }
 
+    /**
+     * Removes the call to {@link Screen#renderBlurredBackground}, since we add a call in
+     * {@link GroupSelectorScreen#render} and the method can only be called once.
+     */
+    @Override
+    public void renderBackground(
+            @NotNull GuiGraphics graphics,
+            int mouseX,
+            int mouseY,
+            float partialTick
+    ) {
+        if (Minecraft.getInstance().level == null) {
+            renderPanorama(graphics, partialTick);
+        }
+        renderMenuBackground(graphics);
+    }
+
     @Override
-    protected void renderBlurredBackground() {
+    protected void renderBlurredBackground(@NotNull GuiGraphics graphics) {
         // 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();
+        super.renderBlurredBackground(graphics);
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
     }
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/PositionEditScreen.java

@@ -23,6 +23,7 @@
 import dev.terminalmc.clientsort.client.config.Config;
 import dev.terminalmc.clientsort.client.config.Vec2i;
 import dev.terminalmc.clientsort.client.gui.widget.ControlButton;
+import dev.terminalmc.clientsort.mixin.client.accessor.GuiGraphicsAccessor;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -332,7 +333,12 @@ lowestLayoutKey, new ButtonLayout(
      */
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+        underlay.renderBackground(graphics, mouseX, mouseY, partialTick);
         underlay.render(graphics, mouseX, mouseY, partialTick);
+
+        ((GuiGraphicsAccessor) graphics).clientsort$getGuiRenderState().nextStratum();
+        renderBlurredBackground(graphics);
+
         super.render(graphics, mouseX, mouseY, partialTick);
 
         // Safety net
@@ -376,17 +382,34 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
         }
     }
 
+    /**
+     * Removes the call to {@link Screen#renderBlurredBackground}, since we add a call in
+     * {@link PositionEditScreen#render} and the method can only be called once.
+     */
+    @Override
+    public void renderBackground(
+            @NotNull GuiGraphics graphics,
+            int mouseX,
+            int mouseY,
+            float partialTick
+    ) {
+        if (Minecraft.getInstance().level == null) {
+            renderPanorama(graphics, partialTick);
+        }
+        renderMenuBackground(graphics);
+    }
+
     /**
      * Modifies the background blur to be constant irrespective of the configured value.
      * <p>
      * Minimal blur is used to prevent the editable widgets disappearing under underlay items on a
      * higher render layer, while still keeping the underlay detail discernible.
      */
     @Override
-    protected void renderBlurredBackground() {
+    protected void renderBlurredBackground(@NotNull GuiGraphics graphics) {
         int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(1);
-        super.renderBlurredBackground();
+        super.renderBlurredBackground(graphics);
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
     }
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/ControlButton.java

@@ -34,7 +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.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -171,7 +171,7 @@ public void renderWidget(
 
         // Draw texture
         ResourceLocation texture = sprites.get(isActive(), isHoveredOrFocused());
-        graphics.blitSprite(RenderType::guiTextured, texture, getX(), getY(), width, height);
+        graphics.blitSprite(RenderPipelines.GUI_TEXTURED, texture, getX(), getY(), width, height);
 
         // Draw policy state indicator
         if (disabledByPolicy) {

common/src/main/java/dev/terminalmc/clientsort/mixin/client/AbstractContainerScreenMixin.java

@@ -305,8 +305,8 @@ private void afterRender(
                 );
 
         float scale = 0.7F;
-        graphics.pose().pushPose();
-        graphics.pose().scale(scale, scale, 0.0F);
+        graphics.pose().pushMatrix();
+        graphics.pose().scale(scale, scale);
 
         for (Slot slot : menu.slots) {
             String slotId;
@@ -343,6 +343,6 @@ private void afterRender(
             );
         }
 
-        graphics.pose().popPose();
+        graphics.pose().popMatrix();
     }
 }

common/src/main/java/dev/terminalmc/clientsort/mixin/client/accessor/GuiGraphicsAccessor.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.clientsort.mixin.client.accessor;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.render.state.GuiRenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(GuiGraphics.class)
+public interface GuiGraphicsAccessor {
+
+    @Accessor("guiRenderState")
+    GuiRenderState clientsort$getGuiRenderState();
+}

common/src/main/resources/clientsort.mixins.json

@@ -13,6 +13,7 @@
     "client.ClientPacketListenerMixin",
     "client.LocalPlayerMixin",
     "client.accessor.AbstractContainerScreenAccessor",
+    "client.accessor.GuiGraphicsAccessor",
     "client.accessor.ScreenAccessor",
     "client.compat.emi.ReloadWorkerMixin",
     "client.slot.CreativeSlotMixin"

gradle.properties

@@ -71,19 +71,19 @@ 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.5
+mc_versions_fabric=1.21.6,1.21.7
 mod_loaders_neoforge=neoforge
-mc_versions_neoforge=1.21.5
+mc_versions_neoforge=1.21.7
 
 # Java
 java_version=21
 java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.5
-minecraft_versions_fabric=>1.21.4
-minecraft_versions_neoforge=[1.21.5,)
+minecraft_version=1.21.7
+minecraft_versions_fabric=>1.21.5
+minecraft_versions_neoforge=[1.21.7,)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
 parchment_minecraft_version=1.21.5
@@ -93,21 +93,21 @@ parchment_version=2025.06.15
 #  -> See also 'mixinextras_jij_fabric'
 fabric_loader_version=0.16.14
 fabric_loader_versions=>=0.16.1
-fabric_api_version=0.128.1+1.21.5
+fabric_api_version=0.129.0+1.21.7
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 #  -> See also 'mixinextras_jij_neoforge'
-neoforge_version=21.5.85
-neoforge_versions=[21.5.0-beta,)
+neoforge_version=21.7.17-beta
+neoforge_versions=[21.7.0-beta,)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.5-20250325.162830
+neoform_version=1.21.7-20250630.141722
 
 # Dependency Property Identifiers
 #  -> These values point to other properties with full dependency specification.
-common_deps=clothconfig,itemlocks
-fabric_deps=modmenu,clothconfig,itemlocks
-neoforge_deps=clothconfig,itemlocks
+common_deps=clothconfig
+fabric_deps=modmenu,clothconfig
+neoforge_deps=clothconfig
 
 # Dependency Notation:
 # `d_{subproject}_{dep}=[{gradle_config}],[{loader_config}],[{modrinth_config}],[{curseforge_config}]`
@@ -128,21 +128,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=18.0.145
-vr_fabric_clothconfig=>=18
-vr_neoforge_clothconfig=[18,)
+v_clothconfig=19.0.147
+vr_fabric_clothconfig=>=19
+vr_neoforge_clothconfig=[19,)
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
 d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,recommends:modmenu,req:mOgUt4GM,req:modmenu
-v_modmenu=14.0.0-rc.2
-vr_fabric_modmenu=>=14.0.0-rc.1
+v_modmenu=15.0.0-beta.3
+vr_fabric_modmenu=>=15.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=NNkUoTWp
-v_neoforge_itemlocks=PqTAuCHp
+#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=NNkUoTWp
+#v_neoforge_itemlocks=PqTAuCHp
 
 # Dependency Version Extensions
 #  -> Intended for addon mods to show which version they were compiled against.

neoforge/src/main/java/dev/terminalmc/clientsort/ClientSortNeoForge.java

@@ -27,14 +27,10 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
-import net.neoforged.neoforge.network.handling.DirectionalPayloadHandler;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
 @Mod(ClientSort.MOD_ID)
-@EventBusSubscriber(
-        modid = ClientSort.MOD_ID,
-        bus = EventBusSubscriber.Bus.MOD
-)
+@EventBusSubscriber(modid = ClientSort.MOD_ID)
 public class ClientSortNeoForge {
 
     public ClientSortNeoForge() {
@@ -51,10 +47,7 @@ static void register(final RegisterPayloadHandlersEvent event) {
         Registration.PAYLOADS_C2S.forEach((rp) -> registerC2S(registrar, rp));
     }
 
-    @EventBusSubscriber(
-            modid = ClientSort.MOD_ID,
-            bus = EventBusSubscriber.Bus.GAME
-    )
+    @EventBusSubscriber(modid = ClientSort.MOD_ID)
     static class GameEventHandler {
 
         /**
@@ -71,7 +64,6 @@ static void registerCommands(RegisterCommandsEvent event) {
 
     @EventBusSubscriber(
             modid = ClientSort.MOD_ID,
-            bus = EventBusSubscriber.Bus.MOD,
             value = Dist.DEDICATED_SERVER
     )
     static class DedicatedServerEventHandler {
@@ -96,17 +88,10 @@ private static <T extends CustomPacketPayload> void registerC2S(
         registrar.playToServer(
                 rp.type,
                 rp.streamCodec,
-                new DirectionalPayloadHandler<>(
-                        (payload, context) -> rp.handler.accept(
-                                payload,
-                                context.player().getServer(),
-                                (ServerPlayer) context.player()
-                        ),
-                        (payload, context) -> rp.handler.accept(
-                                payload,
-                                context.player().getServer(),
-                                (ServerPlayer) context.player()
-                        )
+                (payload, context) -> rp.handler.accept(
+                        payload,
+                        context.player().getServer(),
+                        (ServerPlayer) context.player()
                 )
         );
     }
@@ -124,12 +109,8 @@ private static <T extends CustomPacketPayload> void registerPayloadS2C(
         registrar.playToClient(
                 rp.type,
                 rp.streamCodec,
-                new DirectionalPayloadHandler<>(
-                        (payload, context) -> {
-                        },
-                        (payload, context) -> {
-                        }
-                )
+                (payload, context) -> {
+                }
         );
     }
 }