diff --git a/src/main/java/carpet/mixins/CrashReport_coreMixin.java b/src/main/java/carpet/mixins/CrashReport_coreMixin.java
new file mode 100644
index 00000000..63388a04
--- /dev/null
+++ b/src/main/java/carpet/mixins/CrashReport_coreMixin.java
@@ -0,0 +1,18 @@
+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/java/carpet/mixins/Main_clientCoreMixin.java b/src/main/java/carpet/mixins/Main_clientCoreMixin.java
deleted file mode 100644
index ae03bef9..00000000
--- a/src/main/java/carpet/mixins/Main_clientCoreMixin.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package carpet.mixins;
-
-import carpet.CarpetServer;
-import net.minecraft.client.main.Main;
-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(Main.class)
-public class Main_clientCoreMixin
-{
-    @Inject(method = "main", at = @At( // little bit later giving extensions time to react an join the train
-            value = "INVOKE",
-            target = "Lnet/minecraft/util/crash/CrashReport;initCrashReport()V"
-    ))
-    private static void onServerStarted(String[] args, CallbackInfo ci)
-    {
-        CarpetServer.onGameStarted();
-    }
-}
diff --git a/src/main/java/carpet/mixins/Main_serverCoreMixin.java b/src/main/java/carpet/mixins/Main_serverCoreMixin.java
deleted file mode 100644
index 9359ccce..00000000
--- a/src/main/java/carpet/mixins/Main_serverCoreMixin.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package carpet.mixins;
-
-import carpet.CarpetServer;
-import net.minecraft.server.Main;
-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(Main.class)
-public class Main_serverCoreMixin
-{
-    @Inject(method = "main", at = @At( // little bit later than main to add chance for extensions to register.
-            value = "INVOKE",
-            target = "Lnet/minecraft/util/crash/CrashReport;initCrashReport()V")
-    )
-    private static void onServerStarted(String[] args, CallbackInfo ci)
-    {
-        CarpetServer.onGameStarted();
-    }
-}
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 513b4937..35a9ec12 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -4,7 +4,7 @@
   "package": "carpet.mixins",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "Main_serverCoreMixin",
+    "CrashReport_coreMixin",
     "SpawnHelperInnerMixin",
     "CommandManagerMixin",
 
@@ -175,7 +175,6 @@
 
   ],
   "client": [
-    "Main_clientCoreMixin",
     "RenderTickCounter_tickSpeedMixin",
     "MinecraftClientMixin",
     "MinecraftClient_pausedShakeMixin",