From a489e42ee087d8d6c2be87094fdad4d0a625789f Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Tue, 24 Oct 2023 16:54:58 +0200
Subject: [PATCH] Only apply mixins on the client side

---
 .../src/main/resources/mixins.viaforge-mc112.json      | 10 ++++------
 .../src/main/resources/mixins.viaforge-mc114.json      | 10 ++++------
 .../src/main/resources/mixins.viaforge-mc115.json      | 10 ++++------
 .../src/main/resources/mixins.viaforge-mc116.json      | 10 ++++------
 .../src/main/resources/mixins.viaforge-mc117.json      |  2 +-
 .../src/main/resources/mixins.viaforge-mc118.json      | 10 ++++------
 .../src/main/resources/mixins.viaforge-mc119.json      | 10 ++++------
 .../src/main/resources/mixins.viaforge-mc120.json      | 10 ++++------
 8 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/viaforge-mc112/src/main/resources/mixins.viaforge-mc112.json b/viaforge-mc112/src/main/resources/mixins.viaforge-mc112.json
index f1dd08a..2d2de04 100644
--- a/viaforge-mc112/src/main/resources/mixins.viaforge-mc112.json
+++ b/viaforge-mc112/src/main/resources/mixins.viaforge-mc112.json
@@ -4,15 +4,13 @@
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin.impl",
   "refmap": "mixins.viaforge-mc112.refmap.json",
-  "mixins": [
+  "client": [
     "MixinGuiMainMenu",
     "MixinGuiMultiplayer",
     "MixinGuiScreenServerList",
     "MixinNetworkManager",
-    "MixinNetworkManager_5"
-  ],
-  "verbose": true,
-  "client": [
+    "MixinNetworkManager_5",
     "fixes.MixinEntityPlayerSP"
-  ]
+  ],
+  "verbose": true
 }
diff --git a/viaforge-mc114/src/main/resources/mixins.viaforge-mc114.json b/viaforge-mc114/src/main/resources/mixins.viaforge-mc114.json
index 2537f98..34c326f 100644
--- a/viaforge-mc114/src/main/resources/mixins.viaforge-mc114.json
+++ b/viaforge-mc114/src/main/resources/mixins.viaforge-mc114.json
@@ -3,18 +3,16 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinMainMenuScreen",
     "MixinMultiplayerScreen",
     "MixinNetworkManager",
     "MixinNetworkManager_1",
-    "MixinServerListScreen"
+    "MixinServerListScreen",
+    "fixes.MixinClientPlayerEntity"
   ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc114.refmap.json",
-  "client": [
-    "fixes.MixinClientPlayerEntity"
-  ]
+  "refmap": "mixins.viaforge-mc114.refmap.json"
 }
diff --git a/viaforge-mc115/src/main/resources/mixins.viaforge-mc115.json b/viaforge-mc115/src/main/resources/mixins.viaforge-mc115.json
index 57dfd6c..78e16aa 100644
--- a/viaforge-mc115/src/main/resources/mixins.viaforge-mc115.json
+++ b/viaforge-mc115/src/main/resources/mixins.viaforge-mc115.json
@@ -3,18 +3,16 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinMainMenuScreen",
     "MixinMultiplayerScreen",
     "MixinNetworkManager",
     "MixinNetworkManager_1",
-    "MixinServerListScreen"
+    "MixinServerListScreen",
+    "fixes.MixinClientPlayerEntity"
   ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc115.refmap.json",
-  "client": [
-    "fixes.MixinClientPlayerEntity"
-  ]
+  "refmap": "mixins.viaforge-mc115.refmap.json"
 }
diff --git a/viaforge-mc116/src/main/resources/mixins.viaforge-mc116.json b/viaforge-mc116/src/main/resources/mixins.viaforge-mc116.json
index 7f58e7a..3da5589 100644
--- a/viaforge-mc116/src/main/resources/mixins.viaforge-mc116.json
+++ b/viaforge-mc116/src/main/resources/mixins.viaforge-mc116.json
@@ -3,18 +3,16 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinMainMenuScreen",
     "MixinMultiplayerScreen",
     "MixinNetworkManager",
     "MixinNetworkManager_1",
-    "MixinServerListScreen"
+    "MixinServerListScreen",
+    "fixes.MixinClientPlayerEntity"
   ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc116.refmap.json",
-  "client": [
-    "fixes.MixinClientPlayerEntity"
-  ]
+  "refmap": "mixins.viaforge-mc116.refmap.json"
 }
diff --git a/viaforge-mc117/src/main/resources/mixins.viaforge-mc117.json b/viaforge-mc117/src/main/resources/mixins.viaforge-mc117.json
index 20272f3..0bcab49 100644
--- a/viaforge-mc117/src/main/resources/mixins.viaforge-mc117.json
+++ b/viaforge-mc117/src/main/resources/mixins.viaforge-mc117.json
@@ -3,7 +3,7 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinConnection",
     "MixinConnection_1",
     "MixinDirectJoinServerScreen",
diff --git a/viaforge-mc118/src/main/resources/mixins.viaforge-mc118.json b/viaforge-mc118/src/main/resources/mixins.viaforge-mc118.json
index 0ed1f1e..5df2f08 100644
--- a/viaforge-mc118/src/main/resources/mixins.viaforge-mc118.json
+++ b/viaforge-mc118/src/main/resources/mixins.viaforge-mc118.json
@@ -3,18 +3,16 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinConnection",
     "MixinConnection_1",
     "MixinDirectJoinServerScreen",
     "MixinJoinMultiplayerScreen",
-    "MixinTitleScreen"
+    "MixinTitleScreen",
+    "fixes.MixinLocalPlayer"
   ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc118.refmap.json",
-  "client": [
-    "fixes.MixinLocalPlayer"
-  ]
+  "refmap": "mixins.viaforge-mc118.refmap.json"
 }
diff --git a/viaforge-mc119/src/main/resources/mixins.viaforge-mc119.json b/viaforge-mc119/src/main/resources/mixins.viaforge-mc119.json
index 0be9bad..609617c 100644
--- a/viaforge-mc119/src/main/resources/mixins.viaforge-mc119.json
+++ b/viaforge-mc119/src/main/resources/mixins.viaforge-mc119.json
@@ -3,18 +3,16 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinConnection",
     "MixinConnection_1",
     "MixinDirectJoinServerScreen",
     "MixinJoinMultiplayerScreen",
-    "MixinTitleScreen"
+    "MixinTitleScreen",
+    "fixes.MixinLocalPlayer"
   ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc119.refmap.json",
-  "client": [
-    "fixes.MixinLocalPlayer"
-  ]
+  "refmap": "mixins.viaforge-mc119.refmap.json"
 }
diff --git a/viaforge-mc120/src/main/resources/mixins.viaforge-mc120.json b/viaforge-mc120/src/main/resources/mixins.viaforge-mc120.json
index af8921e..416093a 100644
--- a/viaforge-mc120/src/main/resources/mixins.viaforge-mc120.json
+++ b/viaforge-mc120/src/main/resources/mixins.viaforge-mc120.json
@@ -3,18 +3,16 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
-  "mixins": [
+  "client": [
     "MixinConnection",
     "MixinConnection_1",
     "MixinDirectJoinServerScreen",
     "MixinJoinMultiplayerScreen",
-    "MixinTitleScreen"
+    "MixinTitleScreen",
+    "fixes.MixinLocalPlayer"
   ],
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc120.refmap.json",
-  "client": [
-    "fixes.MixinLocalPlayer"
-  ]
+  "refmap": "mixins.viaforge-mc120.refmap.json"
 }