From 7c4c99089b213238f7076f402ccc8aea7b8bed9f Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:56:34 +0500
Subject: [PATCH] Use same packet resource for all versions

---
 .../distanthorizons/common/AbstractPluginPacketSender.java    | 4 +---
 coreSubProjects                                               | 2 +-
 .../com/seibel/distanthorizons/fabric/FabricClientProxy.java  | 2 +-
 .../distanthorizons/fabric/FabricPluginPacketSender.java      | 4 ++--
 .../com/seibel/distanthorizons/fabric/FabricServerProxy.java  | 2 +-
 .../seibel/distanthorizons/forge/ForgePluginPacketSender.java | 4 ++--
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
index fa6a3b036..153631cf4 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
@@ -26,10 +26,8 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	
 	#if MC_VER >= MC_1_21
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
-	#elif MC_VER >= MC_1_20_6
-	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#else
-	public static final ResourceLocation PLUGIN_CHANNEL_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.PLUGIN_CHANNEL_PATH);
+	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#endif
 	
 	
diff --git a/coreSubProjects b/coreSubProjects
index b5e2019d2..81e6f55db 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit b5e2019d28540e5b79c682b430befbadcec24df8
+Subproject commit 81e6f55dbfb61299aa79a75112b751481a2da131
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
index 0cbfe8560..dadf0fcd0 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
@@ -269,7 +269,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			ClientApi.INSTANCE.pluginMessageReceived(payload.message());
 		});
 		#else
-		ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE, (client, handler, buffer, packetSender) ->
+		ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (client, handler, buffer, packetSender) ->
 		{
 			NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
 			if (message != null)
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
index dfc923dbf..6dd52bd12 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
@@ -23,7 +23,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 		#else // < 1.20.6
 		FriendlyByteBuf buffer = PacketByteBufs.create();
 		AbstractPluginPacketSender.encodeMessage(buffer, message);
-		ClientPlayNetworking.send(PLUGIN_CHANNEL_RESOURCE, buffer);
+		ClientPlayNetworking.send(WRAPPER_PACKET_RESOURCE, buffer);
 		#endif
 	}
 	
@@ -35,7 +35,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 		#else // < 1.20.6
 		FriendlyByteBuf buffer = PacketByteBufs.create();
 		AbstractPluginPacketSender.encodeMessage(buffer, message);
-		ServerPlayNetworking.send(serverPlayer, PLUGIN_CHANNEL_RESOURCE, buffer);
+		ServerPlayNetworking.send(serverPlayer, WRAPPER_PACKET_RESOURCE, buffer);
 		#endif
 	}
 	
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
index 45413deab..ecb4be143 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
@@ -185,7 +185,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
 			});
 			#else
-			ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
+			ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
 			{
 				NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
 				if (message != null)
diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
index ce1f35cab..733c19c05 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
@@ -31,14 +31,14 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender
 {
 	public static final SimpleChannel PLUGIN_CHANNEL =
 			#if MC_VER >= MC_1_20_2
-			ChannelBuilder.named(AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE)
+			ChannelBuilder.named(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE)
 					.networkProtocolVersion(1)
 					.serverAcceptedVersions((status, version) -> true)
 					.clientAcceptedVersions((status, version) -> true)
 					.simpleChannel();
 			#else // < 1.20.2
 			NetworkRegistry.newSimpleChannel(
-					AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE,
+					AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE,
 					() -> "1",
 					ignored -> true,
 					ignored -> true