Multiple chnges that should fix some issues

Author: Mooo0042

common/src/main/java/org/modsauce/otyacraftenginerenewed/networking/OEPackets.java

@@ -1,6 +1,7 @@
 package org.modsauce.otyacraftenginerenewed.networking;
 
 import dev.architectury.networking.NetworkManager;
+import dev.architectury.platform.Platform;
 import java.util.UUID;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -36,7 +37,7 @@ public class OEPackets {
 
   public static void init() {
     NetworkManager.registerReceiver(
-      NetworkManager.Side.C2S,
+      NetworkManager.c2s(),
       BLOCK_ENTITY_INSTRUCTION,
       (friendlyByteBuf, packetContext) ->
         ServerMessageHandler.onBlockEntityInstructionMessage(
@@ -45,7 +46,7 @@ public static void init() {
         )
     );
     NetworkManager.registerReceiver(
-      NetworkManager.Side.C2S,
+      NetworkManager.c2s(),
       ITEM_INSTRUCTION,
       (friendlyByteBuf, packetContext) ->
         ServerMessageHandler.onItemInstructionMessage(
@@ -56,21 +57,23 @@ public static void init() {
   }
 
   public static void clientInit() {
+    // S2C Packets - Only register on client side to avoid Fabric networking issues
+    // The server doesn't need to register S2C receivers, only the client does
     NetworkManager.registerReceiver(
-      NetworkManager.Side.S2C,
+      NetworkManager.s2c(),
       BLOCK_ENTITY_INSTRUCTION_RETURN,
       (friendlyByteBuf, packetContext) ->
         ClientMessageHandler.onBlockEntityInstructionReturn(
-          new BlockEntityInstructionMessage(friendlyByteBuf),
+          new BlockEntityInstructionMessage((RegistryFriendlyByteBuf) friendlyByteBuf),
           packetContext
         )
     );
     NetworkManager.registerReceiver(
-      NetworkManager.Side.S2C,
+      NetworkManager.s2c(),
       ITEM_INSTRUCTION_RETURN,
       (friendlyByteBuf, packetContext) ->
         ClientMessageHandler.onItemInstructionReturn(
-          new ItemInstructionMessage(friendlyByteBuf),
+          new ItemInstructionMessage((RegistryFriendlyByteBuf) friendlyByteBuf),
           packetContext
         )
     );

fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/mixin/client/MinecraftMixin.java

@@ -33,18 +33,8 @@ private void setLevel(
     if (level != null) OEClientEventHooks.onLevelUnload(level);
   }
 
-  @Inject(
-    method = "clearLevel",
-    at = @At(
-      value = "INVOKE",
-      target = "Lnet/minecraft/client/Minecraft;updateScreenAndTick(Lnet/minecraft/client/gui/screens/Screen;)V",
-      ordinal = 0,
-      shift = At.Shift.AFTER
-    )
-  )
-  private void clearLevel(Screen screen, CallbackInfo ci) {
-    if (this.level != null) OEClientEventHooks.onLevelUnload(level);
-  }
+  // TODO: Fix for MC 1.21.1 - clearLevel method was renamed or removed
+  // The level unload functionality is handled by setLevel injection and NeoForge events
 
   @Inject(
     method = "continueAttack",

gradle.properties

@@ -11,8 +11,8 @@ mod_version=3.7.1-1.21.1-alpha1
 # Dependencies
 architectury_version=13.0.8
 fabric_loader_version=0.17.2
-fabric_api_version=0.116.5+1.21.1
-neoforge_version=21.1.200
+fabric_api_version=0.116.7+1.21.1
+neoforge_version=21.1.213
 felnull_version=1.75
 cloth_config_version=15.0.140
 modmenu_version=11.0.3