From 8e6010bbe570d0777425db79f7b4e477b9f5a7f8 Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Sun, 22 Sep 2024 03:29:07 +0500
Subject: [PATCH] Abstract away serverside parts of world & level

---
 .../common/AbstractModInitializer.java        |  4 +-
 coreSubProjects                               |  2 +-
 .../fabric/FabricClientProxy.java             |  1 -
 .../fabric/FabricServerProxy.java             | 42 +++++++++----------
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
index 029ee46b7..74a803514 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
@@ -300,7 +300,7 @@ public abstract class AbstractModInitializer
 					.then(literal("encode")
 							.executes(c -> {
 								assert SharedApi.getIDhServerWorld() != null;
-								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+								((DhServerWorld) SharedApi.getIDhServerWorld()).getServerPlayerStateManager()
 										#if MC_VER >= MC_1_19_2
 										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
 										#else
@@ -312,7 +312,7 @@ public abstract class AbstractModInitializer
 					.then(literal("decode")
 							.executes(c -> {
 								assert SharedApi.getIDhServerWorld() != null;
-								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+								((DhServerWorld) SharedApi.getIDhServerWorld()).getServerPlayerStateManager()
 										#if MC_VER >= MC_1_19_2
 										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
 										#else
diff --git a/coreSubProjects b/coreSubProjects
index d4cad8f71..b18460b82 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit d4cad8f718fd923115a3c7d1f9fcd3dab4ce0053
+Subproject commit b18460b825c3b840ac3e15fab858495dd8d794a5
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 5a8f9bd08..8d35ace2a 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
@@ -253,7 +253,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		//==================//
 		
 		#if MC_VER >= MC_1_20_6
-		PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 		PayloadTypeRegistry.playS2C().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 		ClientPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
 		{
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 08df8c021..49f2efbcb 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
@@ -176,32 +176,28 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 			}
 		});
 		
-		if (this.isDedicatedServer)
+		#if MC_VER >= MC_1_20_6
+		PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
+		ServerPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
 		{
-			#if MC_VER >= MC_1_20_6
-			PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
-			PayloadTypeRegistry.playS2C().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
-			ServerPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
+			if (payload.message() == null)
 			{
-				if (payload.message() == null)
-				{
-					return;
-				}
-				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
-			});
-			#else
-			ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
+				return;
+			}
+			ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
+		});
+		#else
+		ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
+		{
+			// Forge packet ID
+			buffer.readByte();
+			AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
+			if (message != null)
 			{
-				// Forge packet ID
-				buffer.readByte();
-				AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
-				if (message != null)
-				{
-					ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
-				}
-			});
-			#endif
-		}
+				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
+			}
+		});
+		#endif
 	}
 	
 }