From 2bf8d0f7091ba40715da839a6bdd5b79f14dfcc7 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 14 Nov 2021 01:33:22 -0800
Subject: [PATCH] fabric: Update loom

---
 .gitignore                                    |  1 +
 build-logic/src/main/kotlin/Versions.kt       |  2 +-
 cloud-minecraft/cloud-fabric/build.gradle.kts | 68 ++++++-------------
 settings.gradle.kts                           |  1 +
 4 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index 740c5580..28960dbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -226,3 +226,4 @@ gradle-app.setting
 ### Fabric Loom run files ###
 
 /run/
+/cloud-minecraft/cloud-fabric/run/
diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt
index b7ea9127..094c099a 100644
--- a/build-logic/src/main/kotlin/Versions.kt
+++ b/build-logic/src/main/kotlin/Versions.kt
@@ -23,7 +23,7 @@ object Versions {
     const val spongeApi7 = "7.3.0"
     const val jetbrainsAnnotations = "20.1.0"
     const val guava = "21.0-jre"
-    const val fabricLoader = "0.11.1"
+    const val fabricLoader = "0.12.5"
     const val fabricMc = "1.16.5"
     const val fabricApi = "0.31.0+1.16"
 
diff --git a/cloud-minecraft/cloud-fabric/build.gradle.kts b/cloud-minecraft/cloud-fabric/build.gradle.kts
index 0d07f37b..17fcda45 100644
--- a/cloud-minecraft/cloud-fabric/build.gradle.kts
+++ b/cloud-minecraft/cloud-fabric/build.gradle.kts
@@ -2,27 +2,9 @@ import net.fabricmc.loom.task.AbstractRunTask
 import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
-    id("quiet-fabric-loom") version "0.8-SNAPSHOT"
+    id("quiet-fabric-loom") version "0.10-SNAPSHOT"
 }
 
-/* set up a testmod source set */
-val testmod by sourceSets.creating {
-    val main = sourceSets.main.get()
-    compileClasspath += main.compileClasspath
-    runtimeClasspath += main.runtimeClasspath
-    dependencies.add(implementationConfigurationName, main.output)
-}
-
-val testmodJar by tasks.creating(Jar::class) {
-    archiveClassifier.set("testmod-dev")
-    group = LifecycleBasePlugin.BUILD_GROUP
-    from(testmod.output)
-}
-
-loom.unmappedModCollection.from(testmodJar)
-
-/* end of testmod setup */
-
 tasks {
     compileJava {
         options.errorprone {
@@ -59,7 +41,7 @@ tasks {
 
 dependencies {
     minecraft("com.mojang", "minecraft", Versions.fabricMc)
-    mappings(minecraft.officialMojangMappings())
+    mappings(loom.officialMojangMappings())
     modImplementation("net.fabricmc", "fabric-loader", Versions.fabricLoader)
     modImplementation(fabricApi.module("fabric-command-api-v1", Versions.fabricApi))
     modImplementation(fabricApi.module("fabric-lifecycle-events-v1", Versions.fabricApi))
@@ -73,33 +55,21 @@ dependencies {
     api(include("io.leangen.geantyref", "geantyref", Versions.geantyref))
 }
 
-indra {
-    includeJavaSoftwareComponentInPublications(false)
-    configurePublications {
-        // add all the jars that should be included when publishing to maven
-        artifact(tasks.remapJar) {
-            builtBy(tasks.remapJar)
-        }
-        artifact(tasks.sourcesJar) {
-            builtBy(tasks.remapSourcesJar)
-        }
-        artifact(tasks.javadocJar) {
-            builtBy(tasks.javadocJar)
-        }
-
-        // Loom is broken with project dependencies in the same build (because it resolves dependencies during configuration)
-        // Please look away
-        pom {
-            withXml {
-                val dependencies = asNode().appendNode("dependencies")
-                sequenceOf("brigadier", "core", "services").forEach {
-                    val depNode = dependencies.appendNode("dependency")
-                    depNode.appendNode("groupId", project.group)
-                    depNode.appendNode("artifactId", "cloud-$it")
-                    depNode.appendNode("version", project.version)
-                    depNode.appendNode("scope", "compile")
-                }
-            }
-        }
-    }
+/* set up a testmod source set */
+val testmod: SourceSet by sourceSets.creating {
+    val main = sourceSets.main.get()
+    compileClasspath += main.compileClasspath
+    runtimeClasspath += main.runtimeClasspath
+    dependencies.add(implementationConfigurationName, main.output)
 }
+
+val testmodJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("testmod-dev")
+    group = LifecycleBasePlugin.BUILD_GROUP
+    from(testmod.output)
+}
+
+tasks.withType<AbstractRunTask> {
+    classpath(testmodJar)
+}
+/* end of testmod setup */
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c16c4aa..2dfa0203 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://maven.fabricmc.net")
+        maven("https://maven.quiltmc.org/repository/release/")
         maven("https://repo.jpenilla.xyz/snapshots/")
     }
     includeBuild("build-logic")