From 4e9a1aa39de3143848240f807854dbf54c35d237 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Thu, 4 Jun 2020 22:35:03 -0300
Subject: [PATCH] mojang order of things

---
 .../carpet/mixins/Main_clientCoreMixin.java   | 18 +++++++++++++++++
 .../carpet/mixins/Main_serverCoreMixin.java   | 18 +++++++++++++++++
 .../carpet/mixins/MinecraftClientMixin.java   | 12 +++++------
 .../mixins/MinecraftDedicatedServerMixin.java | 20 +++++++++----------
 src/main/resources/carpet.mixins.json         |  5 ++++-
 5 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/carpet/mixins/Main_clientCoreMixin.java
 create mode 100644 src/main/java/carpet/mixins/Main_serverCoreMixin.java

diff --git a/src/main/java/carpet/mixins/Main_clientCoreMixin.java b/src/main/java/carpet/mixins/Main_clientCoreMixin.java
new file mode 100644
index 00000000..99cd04ff
--- /dev/null
+++ b/src/main/java/carpet/mixins/Main_clientCoreMixin.java
@@ -0,0 +1,18 @@
+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("HEAD"))
+    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
new file mode 100644
index 00000000..1860b9e6
--- /dev/null
+++ b/src/main/java/carpet/mixins/Main_serverCoreMixin.java
@@ -0,0 +1,18 @@
+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("HEAD"))
+    private static void onServerStarted(String[] args, CallbackInfo ci)
+    {
+        CarpetServer.onGameStarted();
+    }
+}
diff --git a/src/main/java/carpet/mixins/MinecraftClientMixin.java b/src/main/java/carpet/mixins/MinecraftClientMixin.java
index c2c9be06..7af71590 100644
--- a/src/main/java/carpet/mixins/MinecraftClientMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftClientMixin.java
@@ -14,12 +14,12 @@ public class MinecraftClientMixin
 {
     //to inject right before
     // this.tickWorlds(booleanSupplier_1);
-    @Inject(method = "run", at = @At(value = "HEAD")
-    )
-    private void onInit(CallbackInfo ci) {
-        //CM start game hook
-        CarpetServer.onGameStarted();
-    }
+    //@Inject(method = "run", at = @At(value = "HEAD")
+    //)
+    //private void onInit(CallbackInfo ci) {
+    //    //CM start game hook
+    //    CarpetServer.onGameStarted();
+    //}
 
     @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("HEAD"))
     private void onCloseGame(Screen screen, CallbackInfo ci)
diff --git a/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java b/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
index 3d1722b4..44cc0f41 100644
--- a/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
@@ -12,14 +12,14 @@ public class MinecraftDedicatedServerMixin
 {
     //to inject right before
     // this.tickWorlds(booleanSupplier_1);
-    @Inject(method = "setupServer", at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld()V",
-            shift = At.Shift.BEFORE
-    ))
-    private void onSetupServer(CallbackInfoReturnable<Boolean> cir) {
-        //CM start game hook
-        CarpetServer.onGameStarted();
-
-    }
+    //@Inject(method = "setupServer", at = @At(
+    //        value = "INVOKE",
+    //        target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld()V",
+    //        shift = At.Shift.BEFORE
+    //))
+    //private void onSetupServer(CallbackInfoReturnable<Boolean> cir) {
+    //    //CM start game hook
+    //    CarpetServer.onGameStarted();
+    //
+    //}
 }
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 9678a4af..6a1ce860 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -3,7 +3,9 @@
   "refmap": "fabric-carpet-refmap.json",
   "package": "carpet.mixins",
   "compatibilityLevel": "JAVA_8",
-  "mixins": [ "SpawnHelperInnerMixin",
+  "mixins": [
+    "Main_serverCoreMixin",
+    "SpawnHelperInnerMixin",
     "CommandManagerMixin",
 
     "ServerPlayNetworkHandlerMixin",
@@ -170,6 +172,7 @@
 
   ],
   "client": [
+    "Main_clientCoreMixin",
     "RenderTickCounter_tickSpeedMixin",
     "MinecraftClientMixin",
     "MinecraftClient_pausedShakeMixin",