1.0.8-beta.1

mysticdrew · Apr 26, 2024 · b329ed2 · b329ed2
1 parent da6497b
commit b329ed2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,22 +1,22 @@
 # Project
-version=1.0.8
+version=1.0.8-beta.1
 group_id=mysticdrew
 
 curseforge_project_id=806044
 modrinth_project_id=HIuqnQpi
 
 # Common
-minecraft_version=1.20.5-pre2
+minecraft_version=1.20.5
 
 # Forge
 forge_version=49.0.39
 
 #neoforge
-neoforge_version=20.5.0-alpha.1.20.5-rc1.20240420.160012
+neoforge_version=20.5.5-beta
 
 # Fabric
-fabric_version=0.97.1+1.20.5
-fabric_loader_version=0.15.9
+fabric_version=0.97.6+1.20.5
+fabric_loader_version=0.15.10
 
 # Mod options
 mod_name=Common Networking

diff --git a/neoforge/src/main/java/commonnetwork/networking/NeoForgeNetworkHandler.java b/neoforge/src/main/java/commonnetwork/networking/NeoForgeNetworkHandler.java
@@ -10,7 +10,7 @@
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.LogicalSide;
 import net.neoforged.neoforge.network.PacketDistributor;
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.handling.IPayloadHandler;
 
 import java.util.function.Consumer;
@@ -33,12 +33,12 @@ <T> void registerPacket(PacketContainer<T> container)
 
     @SubscribeEvent
     @SuppressWarnings("unchecked")
-    public void register(final RegisterPayloadHandlerEvent event)
+    public void register(final RegisterPayloadHandlersEvent event)
     {
         if (!PACKET_MAP.isEmpty())
         {
             PACKET_MAP.forEach((type, container) -> event.registrar(container.getType().id().getNamespace())
-                    .optional().common(container.getType(), container.getCodec(), buildHandler(container.handler())));
+                    .optional().commonBidirectional(container.getType(), container.getCodec(), buildHandler(container.handler())));
         }
     }
 
@@ -53,7 +53,7 @@ public <T> void sendToServer(T packet, boolean ignoreCheck)
         PacketContainer<T> container = (PacketContainer<T>) PACKET_MAP.get(packet.getClass());
         if (container != null)
         {
-            PacketDistributor.SERVER.noArg().send(new CommonPacketWrapper<>(container, packet));
+            PacketDistributor.sendToServer(new CommonPacketWrapper<>(container, packet));
         }
         else
         {
@@ -67,9 +67,9 @@ public <T> void sendToClient(T packet, ServerPlayer player)
         PacketContainer<T> container = (PacketContainer<T>) PACKET_MAP.get(packet.getClass());
         if (container != null)
         {
-            if (player.connection.isConnected(container.type()))
+            if (player.connection.hasChannel(container.type()))
             {
-                PacketDistributor.PLAYER.with(player).send(new CommonPacketWrapper<>(container, packet));
+                PacketDistributor.sendToPlayer(player, new CommonPacketWrapper<>(container, packet));
             }
         }
         else
@@ -87,7 +87,7 @@ CommonPacketWrapper<T>> IPayloadHandler<K> buildHandler(Consumer<PacketContext<T
                 Side side = ctx.flow().getReceptionSide().equals(LogicalSide.SERVER) ? Side.SERVER : Side.CLIENT;
                 if (Side.SERVER.equals(side))
                 {
-                    handler.accept(new PacketContext<>((ServerPlayer) ctx.player().get(), payload.packet(), side));
+                    handler.accept(new PacketContext<>((ServerPlayer) ctx.player(), payload.packet(), side));
                 }
                 else
                 {