diff --git a/common-testmod/src/main/java/me/pandamods/test/TestMod.java b/common-testmod/src/main/java/me/pandamods/test/TestMod.java
index 7b445400..56a6a984 100644
--- a/common-testmod/src/main/java/me/pandamods/test/TestMod.java
+++ b/common-testmod/src/main/java/me/pandamods/test/TestMod.java
@@ -47,7 +47,7 @@ public TestMod() {
 	}
 
 	public static ResourceLocation resourceLocation(String path) {
-		return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
+		return new ResourceLocation(MOD_ID, path);
 	}
 
 	public static TestMod getInstance() {
diff --git a/common/src/main/java/me/pandamods/pandalib/registry/DeferredRegister.java b/common/src/main/java/me/pandamods/pandalib/registry/DeferredRegister.java
index 69b6fb29..0259db70 100644
--- a/common/src/main/java/me/pandamods/pandalib/registry/DeferredRegister.java
+++ b/common/src/main/java/me/pandamods/pandalib/registry/DeferredRegister.java
@@ -46,11 +46,11 @@ private DeferredRegister(String namespace, ResourceKey<? extends Registry<T>> re
 	}
 
 	public <R extends T> DeferredObject<R> register(String name, Function<ResourceKey<T>, R> registryFunc) {
-		return register(ResourceLocation.fromNamespaceAndPath(namespace, name), registryFunc);
+		return register(new ResourceLocation(namespace, name), registryFunc);
 	}
 
 	public <R extends T> DeferredObject<R> register(String name, Supplier<R> registrySup) {
-		return register(ResourceLocation.fromNamespaceAndPath(namespace, name), registrySup);
+		return register(new ResourceLocation(namespace, name), registrySup);
 	}
 
 	public <R extends T> DeferredObject<R> register(ResourceLocation name, Function<ResourceKey<T>, R> registryFunc) {
diff --git a/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/TestModNeoForge.java b/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/TestModNeoForge.java
index ee99f7fb..f38b2664 100644
--- a/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/TestModNeoForge.java
+++ b/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/TestModNeoForge.java
@@ -12,7 +12,10 @@
 
 package me.pandamods.testmod.neoforge;
 
+import dev.architectury.utils.Env;
+import me.pandamods.pandalib.utils.EnvRunner;
 import me.pandamods.test.TestMod;
+import me.pandamods.testmod.neoforge.client.TestModClientNeoForge;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 
@@ -20,5 +23,7 @@
 public class TestModNeoForge {
     public TestModNeoForge(IEventBus eventBus) {
 		new TestMod();
+
+		EnvRunner.runIf(Env.CLIENT, () -> () -> new TestModClientNeoForge(eventBus));
     }
 }
diff --git a/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/client/TestModClientNeoForge.java b/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/client/TestModClientNeoForge.java
index 6db77a39..958afabb 100644
--- a/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/client/TestModClientNeoForge.java
+++ b/neoforge-testmod/src/main/java/me/pandamods/testmod/neoforge/client/TestModClientNeoForge.java
@@ -19,14 +19,8 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 
-
-@Mod(value = TestMod.MOD_ID, dist = Dist.CLIENT)
 public class TestModClientNeoForge {
     public TestModClientNeoForge(IEventBus eventBus) {
-		eventBus.addListener(TestModClientNeoForge::clientSetup);
-    }
-
-	public static void clientSetup(FMLClientSetupEvent event) {
 		new TestModClient();
-	}
+    }
 }
diff --git a/neoforge/src/main/java/me/pandamods/pandalib/neoforge/PandaLibNeoForge.java b/neoforge/src/main/java/me/pandamods/pandalib/neoforge/PandaLibNeoForge.java
index 101f1b4d..36ba2661 100644
--- a/neoforge/src/main/java/me/pandamods/pandalib/neoforge/PandaLibNeoForge.java
+++ b/neoforge/src/main/java/me/pandamods/pandalib/neoforge/PandaLibNeoForge.java
@@ -12,10 +12,13 @@
 
 package me.pandamods.pandalib.neoforge;
 
+import dev.architectury.utils.Env;
 import me.pandamods.pandalib.PandaLib;
+import me.pandamods.pandalib.neoforge.client.PandaLibClientNeoForge;
 import me.pandamods.pandalib.neoforge.platform.NetworkHelperImpl;
 import me.pandamods.pandalib.neoforge.platform.RegistrationHelperImpl;
 import me.pandamods.pandalib.platform.Services;
+import me.pandamods.pandalib.utils.EnvRunner;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.common.NeoForge;
@@ -23,7 +26,7 @@
 @Mod(PandaLib.MOD_ID)
 public class PandaLibNeoForge {
     public PandaLibNeoForge(IEventBus eventBus) {
-		new PandaLib(new PacketDistributorImpl());
+		new PandaLib();
 
 		eventBus.addListener(NetworkHelperImpl::registerPackets);
 		if (Services.REGISTRATION instanceof RegistrationHelperImpl helper) {
@@ -31,5 +34,7 @@ public PandaLibNeoForge(IEventBus eventBus) {
 			eventBus.addListener(helper::registerNewRegistryEvent);
 			NeoForge.EVENT_BUS.addListener(helper::addReloadListenerEvent);
 		}
+
+		EnvRunner.runIf(Env.CLIENT, () -> () -> new PandaLibClientNeoForge(eventBus));
     }
 }
diff --git a/neoforge/src/main/java/me/pandamods/pandalib/neoforge/client/PandaLibClientNeoForge.java b/neoforge/src/main/java/me/pandamods/pandalib/neoforge/client/PandaLibClientNeoForge.java
index f95fbee3..875ce2ea 100644
--- a/neoforge/src/main/java/me/pandamods/pandalib/neoforge/client/PandaLibClientNeoForge.java
+++ b/neoforge/src/main/java/me/pandamods/pandalib/neoforge/client/PandaLibClientNeoForge.java
@@ -23,8 +23,4 @@ public class PandaLibClientNeoForge {
     public PandaLibClientNeoForge(IEventBus eventBus) {
 		new PandaLibClient();
     }
-
-	public static void clientSetup(FMLClientSetupEvent event) {
-		PandaLibClient.init();
-	}
 }