From 29e1d05c710910e655b4a89474d092daa0801dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=AB?= <duplexsys@protonmail.com>
Date: Tue, 5 Jul 2022 22:57:03 -0700
Subject: [PATCH] quilt works!

---
 platforms/mixin-lifecycle/build.gradle.kts | 45 +++++++++++++++++-----
 platforms/quilt/build.gradle.kts           | 42 ++++++++------------
 platforms/quilt/gradle.properties          |  1 +
 3 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 platforms/quilt/gradle.properties

diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts
index 7ccf286d7..a9fcf8b17 100644
--- a/platforms/mixin-lifecycle/build.gradle.kts
+++ b/platforms/mixin-lifecycle/build.gradle.kts
@@ -4,6 +4,30 @@ plugins {
     id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
 }
 
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}
+
+configurations {
+    val common by creating
+    compileClasspath.get().extendsFrom(common)
+    runtimeClasspath.get().extendsFrom(common)
+}
+
+dependencies {
+    shadedApi(project(":common:implementation:base"))
+    
+    compileOnly("net.fabricmc:sponge-mixin:${Versions.Fabric.mixin}")
+    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Fabric.mixin}")
+    annotationProcessor("net.fabricmc:fabric-loom:${Versions.Fabric.loom}")
+    
+    "common"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
+    
+    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
+    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+}
+
 loom {
     accessWidenerPath.set(project(":platforms:mixin-common").file("terra.accesswidener"))
     
@@ -12,20 +36,21 @@ loom {
     }
 }
 
-dependencies {
-    shadedApi(project(":common:implementation:base"))
+tasks {
+    compileJava {
+        options.release.set(17)
+    }
     
-    modImplementation("net.fabricmc:fabric-loader:${Versions.Mod.fabricLoader}")
-    compileOnly("net.fabricmc:sponge-mixin:${Versions.Fabric.mixin}")
+    remapJar {
+        inputFile.set(shadowJar.get().archiveFile)
+    }
     
-    compileOnly(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
-    
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    processResources {
+        from(project(":platforms:mixin-common").file("terra.accesswidener"))
+    }
 }
 
 architectury {
     common("fabric", "quilt")
     minecraft = Versions.Mod.minecraft
-}
-
+}
\ No newline at end of file
diff --git a/platforms/quilt/build.gradle.kts b/platforms/quilt/build.gradle.kts
index 68a48fd41..70d593ccc 100644
--- a/platforms/quilt/build.gradle.kts
+++ b/platforms/quilt/build.gradle.kts
@@ -1,21 +1,21 @@
 plugins {
-    id("org.quiltmc.loom") version Versions.Quilt.loom
+    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
     id("architectury-plugin") version Versions.Mod.architecturyPlugin
 }
 
-
-configurations {
-    val common by creating
-    compileClasspath.get().extendsFrom(common)
-    runtimeClasspath.get().extendsFrom(common)
+architectury {
+    platformSetupLoomIde()
+    loader("quilt")
 }
 
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    "common"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
+    "developmentQuilt"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionQuilt")) { isTransitive = false }
-    "common"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
+    "developmentQuilt"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionQuilt")) { isTransitive = false }
     
     
@@ -24,22 +24,16 @@ dependencies {
     
     modImplementation("org.quiltmc:quilt-loader:${Versions.Quilt.quiltLoader}")
     
-    modApi("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Versions.Quilt.fabricApi}")
-    
-    setOf(
-        "fabric-lifecycle-events-v1",
-        "fabric-resource-loader-v0",
-        "fabric-api-base",
-        "fabric-command-api-v2",
-        "fabric-networking-api-v1"
-         ).forEach { apiModule ->
-        val module = fabricApi.module(apiModule, Versions.Fabric.fabricAPI)
-        modImplementation(module)
-        include(module)
+    modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Versions.Quilt.fabricApi}")
+
+    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+        exclude("net.fabricmc")
+        exclude("net.fabricmc.fabric-api")
+    }
+    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+        exclude("net.fabricmc")
+        exclude("net.fabricmc.fabric-api")
     }
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud)
-    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud)
 }
 
 loom {
@@ -65,7 +59,5 @@ tasks {
     
     processResources {
         from(project(":platforms:mixin-common").file("terra.accesswidener"))
-        from(project(":platforms:mixin-common").file("src/main/resources/terra.common.mixins.json"))
-        from(project(":platforms:mixin-lifecycle").file("src/main/resources/terra.lifecycle.mixins.json"))
     }
 }
diff --git a/platforms/quilt/gradle.properties b/platforms/quilt/gradle.properties
new file mode 100644
index 000000000..96758ce85
--- /dev/null
+++ b/platforms/quilt/gradle.properties
@@ -0,0 +1 @@
+loom.platform=quilt
\ No newline at end of file