Enable split environment source sets

NucleoidMC · Jun 23, 2024 · 792eace · 792eace
1 parent 034d650
commit 792eace
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -76,6 +76,9 @@ repositories {
   }
 }
 
+loom {
+  splitEnvironmentSourceSets()
+}
 
 dependencies {
   minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -110,6 +113,7 @@ dependencies {
   modCompileOnly("dev.emi:trinkets:3.7.1")
 
   testmodImplementation sourceSets.main.output
+  testmodImplementation sourceSets.client.output
 }
 
 processResources {

diff --git a/...e/space/IntegratedPlayerManagerMixin.java → ...e/space/IntegratedPlayerManagerMixin.java b/...e/space/IntegratedPlayerManagerMixin.java → ...e/space/IntegratedPlayerManagerMixin.java
@@ -1,4 +1,4 @@
-package xyz.nucleoid.plasmid.mixin.game.space;
+package xyz.nucleoid.plasmid.client.mixin.game.space;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.server.integrated.IntegratedPlayerManager;

diff --git a/src/client/resources/plasmid.client.mixins.json b/src/client/resources/plasmid.client.mixins.json
@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "xyz.nucleoid.plasmid.client.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "client": [
+    "game.space.IntegratedPlayerManagerMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -10,7 +10,13 @@
   "entrypoints": {
     "main": ["xyz.nucleoid.plasmid.Plasmid"]
   },
-  "mixins": ["plasmid.mixins.json"],
+  "mixins": [
+    "plasmid.mixins.json",
+    {
+      "config": "plasmid.client.mixins.json",
+      "environment": "client"
+    }
+  ],
   "accessWidener": "plasmid.accesswidener",
   "custom": {
     "modmenu": {

diff --git a/src/main/resources/plasmid.mixins.json b/src/main/resources/plasmid.mixins.json
@@ -15,7 +15,6 @@
     "game.rule.ServerPlayerEntityMixin",
     "game.rule.ServerPlayNetworkHandlerMixin",
     "game.rule.TridentEntityMixin",
-    "game.space.IntegratedPlayerManagerMixin",
     "game.space.PlayerManagerMixin",
     "game.space.ScreenHandlerMixin",
     "game.space.ServerPlayerEntityMixin"