✨ Update to Minecraft 1.21.7

Author: MrCrayfish

gradle.properties

@@ -5,19 +5,19 @@ group=com.mrcrayfish
 java_version=21
 
 # Common
-minecraft_version=1.21.6
-neo_form_version=1.21.6-20250617.151856
+minecraft_version=1.21.7
+neo_form_version=1.21.7-20250630.141722
 
 # Forge
 forge_version=54.0.6
 
 # Fabric
-fabric_version=0.127.0+1.21.6
+fabric_version=0.128.1+1.21.7
 fabric_loader_version=0.16.14
 
 # NeoForge
-neoforge_version=21.6.11-beta
-neoforge_version_range=[21.6,)
+neoforge_version=21.7.1-beta
+neoforge_version_range=[21.7,)
 neoforge_loader_version_range=[2,)
 
 # Mod options
@@ -32,7 +32,7 @@ mod_issues=https://github.com/MrCrayfish/Configured/issues
 mod_license=GNU Lesser General Public License v3.0
 
 # Dependency options
-framework_version=0.12.1
+framework_version=0.12.3
 jei_version=21.3.2.22
 catalogue_version=1.12.1
 modmenu_version=15.0.0-beta.3

neoforge/src/main/java/com/mrcrayfish/configured/client/NeoForgeClientEvents.java

@@ -3,17 +3,22 @@
 import com.mojang.datafixers.util.Either;
 import com.mrcrayfish.configured.Constants;
 import com.mrcrayfish.configured.client.screen.TooltipScreen;
+import com.mrcrayfish.configured.impl.framework.message.MessageFramework;
+import com.mrcrayfish.configured.network.message.MessageSessionData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.util.FormattedCharSequence;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.InputEvent;
 import net.neoforged.neoforge.client.event.RenderTooltipEvent;
 import net.neoforged.neoforge.client.event.ScreenEvent;
 import net.neoforged.neoforge.client.gui.ModListScreen;
+import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -74,4 +79,19 @@ public static void onScreenOpen(ScreenEvent.Opening event)
     {
         EditingTracker.instance().onScreenOpen(event.getScreen());
     }
+
+    @SubscribeEvent
+    private static void onRegisterClientPayloadHandler(RegisterClientPayloadHandlersEvent event)
+    {
+        event.register(MessageSessionData.TYPE, (payload, context) -> {
+            MessageSessionData.handle(payload, context::enqueueWork);
+        });
+
+        if(ModList.get().isLoaded("framework"))
+        {
+            event.register(MessageFramework.Response.TYPE, (payload, context) -> {
+                MessageFramework.Response.handle(payload, context::enqueueWork, context.player(), context::disconnect);
+            });
+        }
+    }
 }

neoforge/src/main/java/com/mrcrayfish/configured/impl/neoforge/NeoForgeConfig.java

@@ -20,6 +20,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.neoforged.fml.config.ModConfig;
+import net.neoforged.neoforge.client.network.ClientPacketDistributor;
 import net.neoforged.neoforge.common.ModConfigSpec;
 import net.neoforged.neoforge.network.PacketDistributor;
 import org.jetbrains.annotations.Nullable;
@@ -292,7 +293,7 @@ private void syncToServer()
         {
             ByteArrayOutputStream stream = new ByteArrayOutputStream();
             TomlFormat.instance().createWriter().write(data, stream);
-            PacketDistributor.sendToServer(new SyncNeoForgeConfigPayload(this.config.getFileName(), stream.toByteArray()));
+            ClientPacketDistributor.sendToServer(new SyncNeoForgeConfigPayload(this.config.getFileName(), stream.toByteArray()));
             stream.close();
         }
         catch(IOException e)

neoforge/src/main/java/com/mrcrayfish/configured/network/NeoForgeNetwork.java

@@ -22,12 +22,9 @@ public class NeoForgeNetwork
     private static void onRegisterPayloadHandler(RegisterPayloadHandlersEvent event)
     {
         final PayloadRegistrar registrar = event.registrar(Constants.MOD_ID).optional().versioned(Integer.toString(VERSION));
-        registrar.playToClient(MessageSessionData.TYPE, MessageSessionData.STREAM_CODEC, (payload, context) -> {
-            MessageSessionData.handle(payload, context::enqueueWork);
-        });
+        registrar.playToClient(MessageSessionData.TYPE, MessageSessionData.STREAM_CODEC);
         registrar.playToServer(SyncNeoForgeConfigPayload.TYPE, SyncNeoForgeConfigPayload.STREAM_CODEC, SyncNeoForgeConfigPayload::handle);
 
-
         if(ModList.get().isLoaded("framework"))
         {
             registrar.playToServer(MessageFramework.Sync.TYPE, MessageFramework.Sync.STREAM_CODEC, (payload, context) -> {
@@ -36,9 +33,7 @@ private static void onRegisterPayloadHandler(RegisterPayloadHandlersEvent event)
             registrar.playToServer(MessageFramework.Request.TYPE, MessageFramework.Request.STREAM_CODEC, (payload, context) -> {
                 MessageFramework.Request.handle(payload, context::enqueueWork, context.player(), context::disconnect);
             });
-            registrar.playToClient(MessageFramework.Response.TYPE, MessageFramework.Response.STREAM_CODEC, (payload, context) -> {
-                MessageFramework.Response.handle(payload, context::enqueueWork, context.player(), context::disconnect);
-            });
+            registrar.playToClient(MessageFramework.Response.TYPE, MessageFramework.Response.STREAM_CODEC);
         }
     }
 }

neoforge/src/main/java/com/mrcrayfish/configured/platform/NeoForgePlatformHelper.java

@@ -12,6 +12,7 @@
 import net.neoforged.fml.loading.FMLConfig;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
+import net.neoforged.neoforge.client.network.ClientPacketDistributor;
 import net.neoforged.neoforge.network.PacketDistributor;
 import net.neoforged.neoforge.network.registration.NetworkRegistry;
 
@@ -74,15 +75,15 @@ public void sendFrameworkConfigToServer(ResourceLocation id, byte[] data)
     {
         if(!this.isModLoaded("framework"))
             return;
-        PacketDistributor.sendToServer(new MessageFramework.Sync(id, data));
+        ClientPacketDistributor.sendToServer(new MessageFramework.Sync(id, data));
     }
 
     @Override
     public void sendFrameworkConfigRequest(ResourceLocation id)
     {
         if(!this.isModLoaded("framework"))
             return;
-        PacketDistributor.sendToServer(new MessageFramework.Request(id));
+        ClientPacketDistributor.sendToServer(new MessageFramework.Request(id));
     }
 
     @Override