diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java
index e71c2589..be4e3f3a 100644
--- a/src/main/java/carpet/CarpetServer.java
+++ b/src/main/java/carpet/CarpetServer.java
@@ -15,12 +15,15 @@ import carpet.logging.HUDController;
 import carpet.utils.MobAI;
 import carpet.utils.SpawnReporter;
 import com.mojang.brigadier.CommandDispatcher;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.DedicatedServerModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 
-public class CarpetServer // static for now - easier to handle all around the code, its one anyways
+public class CarpetServer implements ClientModInitializer,DedicatedServerModInitializer // static for now - easier to handle all around the code, its one anyways
 {
     public static final Random rand = new Random();
     public static MinecraftServer minecraft_server;
@@ -29,6 +32,17 @@ public class CarpetServer // static for now - easier to handle all around the co
     public static SettingsManager settingsManager;
     public static final List<CarpetExtension> extensions = new ArrayList<>();
 
+    @Override
+    public void onInitializeClient()
+    {
+    	CarpetServer.onGameStarted();
+    }
+    @Override
+    public void onInitializeServer()
+    {
+    	CarpetServer.onGameStarted();
+    }
+    
     // Separate from onServerLoaded, because a server can be loaded multiple times in singleplayer
     public static void manageExtension(CarpetExtension extension)
     {
diff --git a/src/main/java/carpet/mixins/CrashReport_coreMixin.java b/src/main/java/carpet/mixins/CrashReport_coreMixin.java
deleted file mode 100644
index 63388a04..00000000
--- a/src/main/java/carpet/mixins/CrashReport_coreMixin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package carpet.mixins;
-
-import carpet.CarpetServer;
-import net.minecraft.util.crash.CrashReport;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(CrashReport.class)
-public class CrashReport_coreMixin
-{
-    @Inject(method = "initCrashReport", at = @At("RETURN"))
-    private static void gameStarted(CallbackInfo ci)
-    {
-        CarpetServer.onGameStarted();
-    }
-}
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 19c37e27..769643db 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -4,7 +4,6 @@
   "package": "carpet.mixins",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "CrashReport_coreMixin",
     "SpawnHelperInnerMixin",
     "CommandManagerMixin",
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0aab1e18..6cacd37d 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -18,7 +18,11 @@
 
   "environment": "*",
   "entrypoints": {
-    "main": [
+    "client": [
+      "carpet.CarpetServer"
+    ],
+    "server": [
+      "carpet.CarpetServer"
     ]
   },
   "mixins": [