diff --git a/build.gradle b/build.gradle
index 36f401019..fad32af2f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -179,6 +179,8 @@ subprojects { p ->
         if (isMinecraftSubProject) {
             annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
         }
+
+        annotationProcessor("systems.manifold:manifold-strings:${rootProject.manifold_version}")
         
         // Log4j
         // TODO: Change to shadowMe later to work in the standalone jar
@@ -637,11 +639,11 @@ allprojects { p ->
     tasks.withType(JavaCompile) {
         if (isMinecraftSubProject) {
             options.release = rootProject.java_version as Integer
-            options.compilerArgs += ["-Xplugin:Manifold"]
         } else {
             options.release = 8; // Core & Api should use Java 8 no matter what
             //options.release = rootProject.java_version as Integer // But if you want to test some stuff, then this can be enabled
         }
+        options.compilerArgs += ["-Xplugin:Manifold"]
         options.encoding = "UTF-8"
     }
 
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 65f5850e3..d1a03fe39 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
@@ -302,7 +302,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
@@ -314,7 +314,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 d0b50d963..29c2756e7 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit d0b50d96333529a36685e099425acc7685b4865a
+Subproject commit 29c2756e751bdf2294750fe73aee5e65b00d493a
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..ee04944e5 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,33 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 			}
 		});
 		
+		#if MC_VER >= MC_1_20_6
+		PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 		if (this.isDedicatedServer)
 		{
-			#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)
-				{
-					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)
-				{
-					ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
-				}
-			});
-			#endif
 		}
+		
+		ServerPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
+		{
+			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) ->
+		{
+			// Forge packet ID
+			buffer.readByte();
+			AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
+			if (message != null)
+			{
+				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
+			}
+		});
+		#endif
 	}
 	
 }
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java
index fd53cc0d9..a7b7df22a 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java
@@ -84,7 +84,7 @@ public class SodiumAccessor implements ISodiumAccessor
 					sodiumPerformanceOptions = optionsClass.getDeclaredField("performance").get(basicOptions);
 					setFogOcclusionMethod = MethodHandles.lookup()
 							.findSetter(Class.forName(
-									"me.jellysquid.mods.sodium.client.gui.SodiumGameOptions$PerformanceSettings"), 
+											"me.jellysquid.mods.sodium.client.gui.SodiumGameOptions\$PerformanceSettings"),
 									"useFogOcclusion", boolean.class);
 					
 					// alternate option if referencing Sodium 0.5 directly
@@ -101,7 +101,7 @@ public class SodiumAccessor implements ISodiumAccessor
 					sodiumPerformanceOptions = optionsClass.getDeclaredField("performance").get(basicOptions);
 					setFogOcclusionMethod = MethodHandles.lookup()
 							.findSetter(Class.forName(
-									"net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions$PerformanceSettings"), 
+											"net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions\$PerformanceSettings"),
 									"useFogOcclusion", boolean.class);
 				}
 			}