hack around forge run classpath

badasintended · Aug 9, 2024 · 2397e83 · 2397e83
1 parent 81b93c4
commit 2397e83
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,6 +35,11 @@ allprojects {
         }
 
         maven("https://libraries.minecraft.net")
+        maven("https://repo.spongepowered.org/repository/maven-public") {
+            content {
+                includeGroup("org.spongepowered")
+            }
+        }
     }
 
     java {
@@ -109,9 +114,9 @@ subprojects {
 dependencies {
     minecraft("com.mojang:minecraft:${rootProp["minecraft"]}")
     mappings(loom.officialMojangMappings())
-    modCompileOnly("net.fabricmc:fabric-loader:${rootProp["fabricLoader"]}")
 
     compileOnly("lol.bai:badpackets:mojmap-${rootProp["badpackets"]}")
+    compileOnly("org.spongepowered:mixin:0.8.5")
 
     rootProp["jei"].split("-").also { (mc, jei) ->
         compileOnly("mezz.jei:jei-${mc}-common-api:${jei}")

diff --git a/platform/forge/build.gradle.kts b/platform/forge/build.gradle.kts
@@ -41,7 +41,7 @@ sourceSets {
         resources.setSrcDirs(emptyList<Any>())
 
         compileClasspath += main.compileClasspath + rootProject.sourceSets.main.get().compileClasspath
-        runtimeClasspath += main.runtimeClasspath
+        runtimeClasspath += main.runtimeClasspath - main.output
 
         val dir = layout.buildDirectory.dir("run")
         java.destinationDirectory = dir
@@ -83,6 +83,12 @@ minecraft {
     }
 }
 
+afterEvaluate {
+    minecraft.runs.configureEach {
+        jvmArgs("-classpath", sourceSets["run"].runtimeClasspath.asPath)
+    }
+}
+
 mixin {
     add(sourceSets["main"], "wthit.refmap.json")
     config("wthit.mixins.json")