Move loom configuration out of root project

jpenilla · Aug 18, 2024 · 2ac823f · 2ac823f
1 parent 007a4a8
commit 2ac823f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,3 @@
-import net.fabricmc.loom.task.RunGameTask
-
 plugins {
   id 'java'
   alias(libs.plugins.eclipseApt)
@@ -83,26 +81,4 @@ allprojects {
       }
     }
   }
-
-  // Loom -- needs to run late to avoid preset config not applying properly
-  afterEvaluate {
-    tasks.withType(RunGameTask) {
-      javaLauncher.set(javaToolchains.launcherFor { languageVersion.set(indra.javaVersions().target().map { v -> JavaLanguageVersion.of(v) })})
-    }
-  }
-
-  // Loom-specific
-  plugins.withId('fabric-loom') {
-    dependencies {
-      minecraft(libs.minecraft)
-      mappings(loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-${libs.versions.parchment.get()}@zip")
-      })
-    }
-
-    loom {
-      runtimeOnlyLog4j.set(true)
-    }
-  }
 }
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -1,6 +1,7 @@
 import net.fabricmc.loom.api.RemapConfigurationSettings
 import net.fabricmc.loom.task.GenerateSourcesTask
 import net.fabricmc.loom.task.RemapJarTask
+import net.fabricmc.loom.task.RunGameTask
 import org.gradle.configurationcache.extensions.capitalized
 
 plugins {
@@ -20,6 +21,11 @@ dependencies {
   // Only used for prod test
   modCompileOnly(libs.fabric.api.lifecycle)
 
+  minecraft(libs.minecraft)
+  mappings(loom.layered {
+    officialMojangMappings()
+    parchment("org.parchmentmc.data:parchment-${libs.versions.parchment.get()}@zip")
+  })
   modImplementation(libs.fabric.loader)
 
   testImplementation(libs.fabric.loader.junit)
@@ -161,8 +167,16 @@ loom {
   decompilerOptions.named("vineflower") {
     options.put("win", "0")
   }
+
+  runtimeOnlyLog4j.set(true)
 }
 
+// Loom -- needs to run late to avoid preset config not applying properly
+afterEvaluate {
+  tasks.withType(RunGameTask::class).configureEach {
+    javaLauncher.set(javaToolchains.launcherFor { languageVersion.set(indra.javaVersions().target().map { v -> JavaLanguageVersion.of(v) })})
+  }
+}
 
 dependencies {
   "testmodRuntimeOnly"(permissionsApiCompat.output)

diff --git a/fabric/mod-shared-repack/build.gradle.kts b/fabric/mod-shared-repack/build.gradle.kts
@@ -5,13 +5,19 @@ plugins {
 }
 
 dependencies {
+  minecraft(libs.minecraft)
+  mappings(loom.layered {
+    officialMojangMappings()
+    parchment("org.parchmentmc.data:parchment-${libs.versions.parchment.get()}@zip")
+  })
   compileOnly(libs.fabric.loader)
 }
 
 loom {
   mixin {
     useLegacyMixinAp = false
   }
+  runtimeOnlyLog4j.set(true)
 }
 
 tasks {