Fix network

Author: Edivad99

src/main/java/edivad/extrastorage/ExtraStorage.java

@@ -22,6 +22,7 @@
 import edivad.extrastorage.data.loot.pack.ExtraStorageLootTableProvider;
 import edivad.extrastorage.data.models.ExtraStorageBlockModelProvider;
 import edivad.extrastorage.data.models.ExtraStorageItemModelProvider;
+import edivad.extrastorage.network.PacketHandler;
 import edivad.extrastorage.setup.ClientSetup;
 import edivad.extrastorage.setup.Config;
 import edivad.extrastorage.setup.CreativeModeTabs;
@@ -62,6 +63,7 @@ public class ExtraStorage {
 
   public ExtraStorage(ModContainer modContainer, Dist dist) {
     var modEventBus = modContainer.getEventBus();
+    PacketHandler.register(modEventBus);
     ESBlocks.register(modEventBus);
     ESItems.register(modEventBus);
     ESBlockEntities.register(modEventBus);

src/main/java/edivad/extrastorage/autocrafting/advancedautocrafter/AdvancedAutocrafterContainerMenu.java

@@ -10,11 +10,12 @@
 import com.refinedmods.refinedstorage.common.support.FilteredContainer;
 import com.refinedmods.refinedstorage.common.support.containermenu.ClientProperty;
 import com.refinedmods.refinedstorage.common.support.containermenu.ServerProperty;
-import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets;
-import com.refinedmods.refinedstorage.common.support.packet.s2c.S2CPackets;
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeContainer;
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeDestinations;
 import com.refinedmods.refinedstorage.common.upgrade.UpgradeSlot;
+import edivad.extrastorage.network.to_client.AdvancedAutocrafterLockedUpdatePacket;
+import edivad.extrastorage.network.to_client.AdvancedAutocrafterNameUpdatePacket;
+import edivad.extrastorage.network.to_server.AdvancedAutocrafterNameChangePacket;
 import edivad.extrastorage.setup.ESContainer;
 import lombok.Getter;
 import net.minecraft.network.chat.Component;
@@ -23,6 +24,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
+import net.neoforged.neoforge.network.PacketDistributor;
 
 public class AdvancedAutocrafterContainerMenu extends AbstractBaseContainerMenu {
 
@@ -113,7 +115,8 @@ public void broadcastChanges() {
     final boolean newLocked = autocrafter.isLocked();
     if (locked != newLocked) {
       locked = newLocked;
-      S2CPackets.sendAutocrafterLockedUpdate((ServerPlayer) player, locked);
+      PacketDistributor.sendToPlayer((ServerPlayer) player,
+          new AdvancedAutocrafterLockedUpdatePacket(locked));
     }
   }
 
@@ -124,7 +127,8 @@ private void detectNameChange() {
     final Component newName = autocrafter.getDisplayName();
     if (!newName.equals(name)) {
       this.name = newName;
-      S2CPackets.sendAutocrafterNameUpdate((ServerPlayer) player, newName);
+      PacketDistributor.sendToPlayer((ServerPlayer) player,
+          new AdvancedAutocrafterNameUpdatePacket(newName));
     }
   }
 
@@ -168,7 +172,7 @@ public void changeName(final String newName) {
       autocrafter.setCustomName(newName);
       detectNameChange();
     } else {
-      C2SPackets.sendAutocrafterNameChange(newName);
+      PacketDistributor.sendToServer(new AdvancedAutocrafterNameChangePacket(newName));
     }
   }
 

src/main/java/edivad/extrastorage/network/PacketHandler.java

@@ -0,0 +1,35 @@
+package edivad.extrastorage.network;
+
+import edivad.extrastorage.ExtraStorage;
+import edivad.extrastorage.network.to_client.AdvancedAutocrafterLockedUpdatePacket;
+import edivad.extrastorage.network.to_client.AdvancedAutocrafterNameUpdatePacket;
+import edivad.extrastorage.network.to_server.AdvancedAutocrafterNameChangePacket;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+import net.neoforged.neoforge.network.registration.PayloadRegistrar;
+
+public class PacketHandler {
+
+  private PacketHandler() {
+  }
+
+  public static void register(IEventBus modEventBus) {
+    modEventBus.addListener(RegisterPayloadHandlersEvent.class, event -> {
+      var registrar = event.registrar(ExtraStorage.ID).versioned("1");
+      registerClientToServer(registrar);
+      registerServerToClient(registrar);
+    });
+  }
+
+  private static void registerClientToServer(PayloadRegistrar registrar) {
+    registrar.playToServer(AdvancedAutocrafterNameChangePacket.TYPE,
+        AdvancedAutocrafterNameChangePacket.STREAM_CODEC, AdvancedAutocrafterNameChangePacket::handle);
+  }
+
+  private static void registerServerToClient(PayloadRegistrar registrar) {
+    registrar.playToClient(AdvancedAutocrafterLockedUpdatePacket.TYPE,
+        AdvancedAutocrafterLockedUpdatePacket.STREAM_CODEC, AdvancedAutocrafterLockedUpdatePacket::handle);
+    registrar.playToClient(AdvancedAutocrafterNameUpdatePacket.TYPE,
+        AdvancedAutocrafterNameUpdatePacket.STREAM_CODEC, AdvancedAutocrafterNameUpdatePacket::handle);
+  }
+}

src/main/java/edivad/extrastorage/network/to_client/AdvancedAutocrafterLockedUpdatePacket.java

@@ -0,0 +1,29 @@
+package edivad.extrastorage.network.to_client;
+
+import edivad.extrastorage.ExtraStorage;
+import edivad.extrastorage.autocrafting.advancedautocrafter.AdvancedAutocrafterContainerMenu;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.neoforged.neoforge.network.handling.IPayloadContext;
+
+public record AdvancedAutocrafterLockedUpdatePacket(boolean locked) implements CustomPacketPayload {
+  public static final CustomPacketPayload.Type<AdvancedAutocrafterLockedUpdatePacket> TYPE =
+      new Type(ExtraStorage.rl("advanced_autocrafter_locked_update"));
+
+  public static final StreamCodec<RegistryFriendlyByteBuf, AdvancedAutocrafterLockedUpdatePacket> STREAM_CODEC =
+      StreamCodec.composite(ByteBufCodecs.BOOL, AdvancedAutocrafterLockedUpdatePacket::locked,
+          AdvancedAutocrafterLockedUpdatePacket::new);
+
+
+  public Type<? extends CustomPacketPayload> type() {
+    return TYPE;
+  }
+
+  public static void handle(AdvancedAutocrafterLockedUpdatePacket packet, IPayloadContext ctx) {
+    if (ctx.player().containerMenu instanceof AdvancedAutocrafterContainerMenu containerMenu) {
+      containerMenu.lockedChanged(packet.locked);
+    }
+  }
+}

src/main/java/edivad/extrastorage/network/to_client/AdvancedAutocrafterNameUpdatePacket.java

@@ -0,0 +1,30 @@
+package edivad.extrastorage.network.to_client;
+
+import edivad.extrastorage.ExtraStorage;
+import edivad.extrastorage.autocrafting.advancedautocrafter.AdvancedAutocrafterContainerMenu;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.neoforged.neoforge.network.handling.IPayloadContext;
+
+public record AdvancedAutocrafterNameUpdatePacket(Component name) implements CustomPacketPayload {
+  public static final CustomPacketPayload.Type<AdvancedAutocrafterNameUpdatePacket> TYPE =
+      new Type(ExtraStorage.rl("advanced_autocrafter_name_update"));
+
+  public static final StreamCodec<RegistryFriendlyByteBuf, AdvancedAutocrafterNameUpdatePacket> STREAM_CODEC =
+      StreamCodec.composite(ComponentSerialization.STREAM_CODEC, AdvancedAutocrafterNameUpdatePacket::name,
+          AdvancedAutocrafterNameUpdatePacket::new);
+
+
+  public Type<? extends CustomPacketPayload> type() {
+    return TYPE;
+  }
+
+  public static void handle(AdvancedAutocrafterNameUpdatePacket packet, IPayloadContext ctx) {
+    if (ctx.player().containerMenu instanceof AdvancedAutocrafterContainerMenu containerMenu) {
+      containerMenu.nameChanged(packet.name);
+    }
+  }
+}

src/main/java/edivad/extrastorage/network/to_server/AdvancedAutocrafterNameChangePacket.java

@@ -0,0 +1,29 @@
+package edivad.extrastorage.network.to_server;
+
+import edivad.extrastorage.ExtraStorage;
+import edivad.extrastorage.autocrafting.advancedautocrafter.AdvancedAutocrafterContainerMenu;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.neoforged.neoforge.network.handling.IPayloadContext;
+
+public record AdvancedAutocrafterNameChangePacket(String name) implements CustomPacketPayload {
+  public static final Type<AdvancedAutocrafterNameChangePacket> TYPE =
+      new Type(ExtraStorage.rl("advanced_autocrafter_name_change"));
+
+  public static final StreamCodec<RegistryFriendlyByteBuf, AdvancedAutocrafterNameChangePacket> STREAM_CODEC =
+      StreamCodec.composite(ByteBufCodecs.STRING_UTF8, AdvancedAutocrafterNameChangePacket::name,
+          AdvancedAutocrafterNameChangePacket::new);
+
+  @Override
+  public Type<? extends CustomPacketPayload> type() {
+    return TYPE;
+  }
+
+  public static void handle(AdvancedAutocrafterNameChangePacket packet, IPayloadContext ctx) {
+    if (ctx.player().containerMenu instanceof AdvancedAutocrafterContainerMenu containerMenu) {
+      containerMenu.changeName(packet.name);
+    }
+  }
+}