Add forge source set and its associated mixin conf

OpenCubicChunks · Jan 24, 2024 · 392d8f9 · 392d8f9
1 parent c72a83f
commit 392d8f9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,11 @@ mcGitVersion {
     setCommitVersion("570c0cbf0cdc15b8348a862a519d3399a943af9", "0.0")
 }
 
-//sourceSets {
+sourceSets {
+    forge {
+        compileClasspath = sourceSets.main.compileClasspath
+        runtimeClasspath = sourceSets.main.runtimeClasspath
+    }
 //    create("gametest") {
 //        compileClasspath += configurations.compileClasspath
 //        compileClasspath += configurations.testCompileClasspath
@@ -43,7 +47,7 @@ mcGitVersion {
 //        runtimeClasspath += configurations.testRuntimeClasspath
 //        runtimeClasspath += sourceSets.main.output
 //    }
-//}
+}
 
 tasks.register("generatePackageInfo") {
     group = "filegen"
@@ -79,6 +83,13 @@ mixinGen {
         it.injectorsDefaultRequire = 1
     }
 
+    config(sourceSets.forge, "forge") {
+        it.required = true
+        it.conformVisibility = true
+        it.injectorsDefaultRequire = 1
+        it.configurationPlugin = "io.github.opencubicchunks.cubicchunks.mixin.ASMConfigPlugin"
+    }
+
     config(sourceSets.test, "test") {
         it.required = true
         it.conformVisibility = true
@@ -174,7 +185,7 @@ runs {
         jvmArguments args
         // systemProperty 'forge.logging.markers', 'REGISTRIES'
         systemProperty 'forge.logging.console.level', 'debug'
-        modSource project.sourceSets.main
+        modSource project.sourceSets.forge
         dependencies {
             runtime project.configurations.libraries
         }

diff --git a/src/forge/resources/cubicchunks.mixins.forge.json b/src/forge/resources/cubicchunks.mixins.forge.json
@@ -0,0 +1,17 @@
+{
+    "required": true,
+    "package": "io.github.opencubicchunks.cubicchunks.mixin.forge",
+    "refmap": "CubicChunks-refmap.json",
+    "compatibilityLevel": "JAVA_17",
+    "minVersion": "0.8",
+    "injectors": {
+        "defaultRequire": 1
+    },
+    "overwrites": {
+        "conformVisibility": true
+    },
+    "mixins": [
+    ],
+    "client": [],
+    "server": []
+}
diff --git a/src/main/resources/cubicchunks.mixins.core.json b/src/main/resources/cubicchunks.mixins.core.json
@@ -13,6 +13,7 @@
     },
     "mixins": [
         "common.client.multiplayer.MixinClientLevel",
+        "common.server.MixinMinecraftServer",
         "common.server.level.MixinChunkTaskPriorityQueue",
         "common.server.level.MixinChunkTaskPriorityQueueSorter",
         "common.server.level.MixinChunkTicketTracker",
@@ -24,17 +25,17 @@
         "common.server.level.MixinServerLevel",
         "common.server.level.MixinServerPlayer",
         "common.server.level.MixinTickingTracker",
-        "common.server.MixinMinecraftServer",
+        "common.world.level.MixinLevel",
+        "common.world.level.MixinLevelReader",
         "common.world.level.chunk.MixinChunkAccess",
+        "common.world.level.chunk.MixinChunkSource",
         "common.world.level.chunk.MixinImposterProtoChunk",
         "common.world.level.chunk.MixinLevelChunk",
         "common.world.level.cube.MixinCubeAccess",
+        "common.world.level.cube.MixinImposterProtoCube",
         "common.world.level.cube.MixinLevelCube",
         "common.world.level.cube.MixinLevelCube$BoundTickingBlockEntity",
         "common.world.level.cube.MixinLevelCube$RebindableTickingBlockEntityWrapper",
-        "common.world.level.chunk.MixinChunkSource",
-        "common.world.level.MixinLevel",
-        "common.world.level.MixinLevelReader",
         "common.world.level.cube.MixinProtoCube"
     ],
     "client": [],