more cleanup

mysticdrew · Aug 27, 2024 · 46f99a0 · 46f99a0
1 parent 2000ba9
commit 46f99a0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/common/src/main/java/commonnetwork/CommonNetworkMod.java b/common/src/main/java/commonnetwork/CommonNetworkMod.java
@@ -53,7 +53,7 @@ public static <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifi
         }
     }
 
-    public static <T, B extends FriendlyByteBuf> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<B, T> codec, Consumer<PacketContext<T>> handler)
+    public static <T> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<? extends FriendlyByteBuf, T> codec, Consumer<PacketContext<T>> handler)
     {
         if (INSTANCE != null)
         {

diff --git a/common/src/main/java/commonnetwork/api/Network.java b/common/src/main/java/commonnetwork/api/Network.java
@@ -42,7 +42,7 @@ public static <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifi
      * @param <T>         - The class type
      * @return The registrar for chaining registrations.
      */
-    public static <T, B extends FriendlyByteBuf> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<B, T> codec, Consumer<PacketContext<T>> handler)
+    public static <T> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<? extends FriendlyByteBuf, T> codec, Consumer<PacketContext<T>> handler)
     {
         return CommonNetworkMod.registerPacket(type, packetClass, codec, handler);
     }

diff --git a/common/src/main/java/commonnetwork/networking/DelayedPacketRegistrationHandler.java b/common/src/main/java/commonnetwork/networking/DelayedPacketRegistrationHandler.java
@@ -39,7 +39,7 @@ public <T> PacketRegistrar registerPacket(ResourceLocation id, Class<T> packetCl
     }
 
     @Override
-    public <T, B extends FriendlyByteBuf> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<B, T> codec, Consumer<PacketContext<T>> handler)
+    public <T> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<? extends FriendlyByteBuf, T> codec, Consumer<PacketContext<T>> handler)
     {
         PacketContainer<T> container = new PacketContainer<>(type, packetClass, codec, handler);
         QUEUED_PACKET_MAP.put(packetClass, container);

diff --git a/common/src/main/java/commonnetwork/networking/PacketRegistrar.java b/common/src/main/java/commonnetwork/networking/PacketRegistrar.java
@@ -43,6 +43,6 @@ public interface PacketRegistrar
      * @param <T>         - The class type
      * @return The registrar for chaining registrations.
      */
-    <T, B extends FriendlyByteBuf> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<B, T> codec, Consumer<PacketContext<T>> handler);
+    <T> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<? extends FriendlyByteBuf, T> codec, Consumer<PacketContext<T>> handler);
 
 }
diff --git a/common/src/main/java/commonnetwork/networking/PacketRegistrationHandler.java b/common/src/main/java/commonnetwork/networking/PacketRegistrationHandler.java
@@ -41,7 +41,7 @@ public <T> PacketRegistrar registerPacket(ResourceLocation packetIdentifier, Cla
     }
 
     @Override
-    public <T, B extends FriendlyByteBuf> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<B, T> codec, Consumer<PacketContext<T>> handler)
+    public <T> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<? extends FriendlyByteBuf, T> codec, Consumer<PacketContext<T>> handler)
     {
         PacketContainer<T> container = new PacketContainer<>(type, packetClass, codec, handler);
         PACKET_MAP.put(packetClass, container);

diff --git a/common/src/main/java/commonnetwork/networking/data/PacketContainer.java b/common/src/main/java/commonnetwork/networking/data/PacketContainer.java
@@ -43,7 +43,6 @@ public <K extends CustomPacketPayload> CustomPacketPayload.Type<K> getType()
         return (CustomPacketPayload.Type<K>) type();
     }
 
-
     //TODO: Removing for mc 1.21.2 or 1.22, will also be able to remove the wrapping of the decoder.
     @SuppressWarnings("unchecked")
     public <K extends FriendlyByteBuf> StreamCodec<K, CommonPacketWrapper> getCodec()
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        public static <T, B extends FriendlyByteBuf> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<B, T> codec, Consumer<PacketContext<T>> handler)
+        public static <T> PacketRegistrar registerPacket(CustomPacketPayload.Type<? extends CustomPacketPayload> type, Class<T> packetClass, StreamCodec<? extends FriendlyByteBuf, T> codec, Consumer<PacketContext<T>> handler)
         {
             if (INSTANCE != null)
             {
@@ Expand Down @@