From dfc1e3a397cbd871de03d7609dbdb3d6ec4a7522 Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Mon, 9 Sep 2024 20:55:36 -0700
Subject: [PATCH] Looming danger

- Bump arch loom and gradle versions
- Do not set default refmap name
- Enable legacy mixin ap in loom
- Individually add sourcesets to looms refmap stuffs
---
 .../dev/engine_room/gradle/subproject/SubprojectPlugin.kt | 3 ---
 fabric/build.gradle.kts                                   | 8 ++++++++
 forge/build.gradle.kts                                    | 6 ++++++
 gradle.properties                                         | 2 +-
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt b/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt
index 8dd2dbd9d..e6783a313 100644
--- a/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt
+++ b/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt
@@ -48,12 +48,9 @@ class SubprojectPlugin: Plugin<Project> {
         }
     }
 
-    @Suppress("UnstableApiUsage")
     private fun setupLoom(project: Project) {
         val loom = project.the<LoomGradleExtensionAPI>()
         loom.silentMojangMappingsLicense()
-
-        loom.mixin.defaultRefmapName = "flywheel.refmap.json"
     }
 
     private fun setupJava(project: Project) {
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index b2c53440d..ff987b524 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -60,6 +60,14 @@ defaultPackageInfos {
     sources(api, lib, backend, main)
 }
 
+loom {
+    mixin {
+        useLegacyMixinAp = true
+        add(main, "flywheel.refmap.json")
+        add(backend, "backend-flywheel.refmap.json")
+    }
+}
+
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:${property("fabric_loader_version")}")
     modApi("net.fabricmc.fabric-api:fabric-api:${property("fabric_api_version")}")
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
index 5f51cc55e..c9569e26c 100644
--- a/forge/build.gradle.kts
+++ b/forge/build.gradle.kts
@@ -61,6 +61,12 @@ defaultPackageInfos {
 }
 
 loom {
+    mixin {
+        useLegacyMixinAp = true
+        add(main, "flywheel.refmap.json")
+        add(backend, "backend-flywheel.refmap.json")
+    }
+
     forge {
         mixinConfig("flywheel.backend.mixins.json")
         mixinConfig("flywheel.impl.mixins.json")
diff --git a/gradle.properties b/gradle.properties
index 6fbee910b..86a12b351 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ forge_version_range = [47.0.0,)
 
 # General build dependency versions
 java_version = 17
-arch_loom_version = 1.6.397
+arch_loom_version=1.7.412
 cursegradle_version = 1.4.0
 parchment_version = 2023.09.03
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7646dead..6f7a6eb33 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME