Update to mc1.21.7

Author: NotRyken

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

@@ -108,11 +108,11 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
     }
 
     @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

@@ -382,10 +382,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() {
+    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

@@ -304,8 +304,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;
@@ -342,6 +342,6 @@ private void afterRender(
             );
         }
 
-        graphics.pose().popPose();
+        graphics.pose().popMatrix();
     }
 }

gradle.properties

@@ -60,9 +60,9 @@ 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
 
 # Links
 homepage_url=https://modrinth.com/mod/K0AkAin6
@@ -81,9 +81,9 @@ 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,7 +93,7 @@ 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.128.1+1.21.7
 fabric_api_versions=*
 # Entry Points
 fabric_entrypoints_main=dev.terminalmc.clientsort.ClientSortFabric
@@ -103,10 +103,10 @@ fabric_entrypoints_modmenu=dev.terminalmc.clientsort.client.compat.modmenu.ModMe
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 #  -> See also 'mixinextras_jij_neoforge'
-neoforge_version=21.5.81
-neoforge_versions=[21.5.0-beta,)
+neoforge_version=21.7.1-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 Version Extensions
 #  -> Intended for addon mods to show which version they were compiled against.
@@ -140,14 +140,14 @@ 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

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

@@ -25,14 +25,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() {
@@ -49,10 +45,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 {
 
         /**
@@ -69,7 +62,6 @@ static void registerCommands(RegisterCommandsEvent event) {
 
     @EventBusSubscriber(
             modid = ClientSort.MOD_ID,
-            bus = EventBusSubscriber.Bus.MOD,
             value = Dist.DEDICATED_SERVER
     )
     static class DedicatedServerEventHandler {
@@ -94,17 +86,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()
                 )
         );
     }
@@ -122,12 +107,8 @@ private static <T extends CustomPacketPayload> void registerPayloadS2C(
         registrar.playToClient(
                 rp.type,
                 rp.streamCodec,
-                new DirectionalPayloadHandler<>(
-                        (payload, context) -> {
-                        },
-                        (payload, context) -> {
-                        }
-                )
+                (payload, context) -> {
+                }
         );
     }
 }

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

@@ -31,7 +31,6 @@
 import net.neoforged.neoforge.client.event.ScreenEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
-import net.neoforged.neoforge.network.handling.DirectionalPayloadHandler;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
 @Mod(
@@ -40,7 +39,6 @@
 )
 @EventBusSubscriber(
         modid = ClientSort.MOD_ID,
-        bus = EventBusSubscriber.Bus.MOD,
         value = Dist.CLIENT
 )
 public class ClientSortNeoForge {
@@ -106,17 +104,10 @@ private static <T extends CustomPacketPayload> void registerS2C(
         registrar.playToClient(
                 rp.type,
                 rp.streamCodec,
-                new DirectionalPayloadHandler<>(
-                        (payload, context) -> rp.handler.accept(
-                                payload,
-                                Minecraft.getInstance(),
-                                (LocalPlayer) context.player()
-                        ),
-                        (payload, context) -> rp.handler.accept(
-                                payload,
-                                Minecraft.getInstance(),
-                                (LocalPlayer) context.player()
-                        )
+                (payload, context) -> rp.handler.accept(
+                        payload,
+                        Minecraft.getInstance(),
+                        (LocalPlayer) context.player()
                 )
         );
     }

neoforge/src/main/java/dev/terminalmc/clientsort/client/platform/NeoForgeClientServices.java

@@ -20,7 +20,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.neoforged.neoforge.client.network.ClientPacketDistributor;
 
 public class NeoForgeClientServices implements IPlatformClientServices {
 
@@ -34,6 +34,6 @@ public boolean canSendToServer(CustomPacketPayload.Type<?> type) {
 
     @Override
     public void sendToServer(CustomPacketPayload payload) {
-        PacketDistributor.sendToServer(payload);
+        ClientPacketDistributor.sendToServer(payload);
     }
 }