From 9122ab475b9baf50c3e7757150b297cb75d43c0f Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 25 Apr 2024 10:20:28 +0200
Subject: [PATCH] fix(lom): Temporarily go back to fabric loom

Arch loom had a weird issue with remapping and since we don't yet support forge anyways, this seems like the easiest workaround
---
 .../main/kotlin/jf.plugin-conventions.gradle.kts | 16 ++++++++--------
 lom/build.gradle.kts                             |  3 ++-
 lom/src/main/kotlin/lom.gradle.kts               |  5 +++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/kotlin/jf.plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/jf.plugin-conventions.gradle.kts
index 2da1fd9..677fc1e 100644
--- a/buildSrc/src/main/kotlin/jf.plugin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jf.plugin-conventions.gradle.kts
@@ -14,12 +14,12 @@ repositories {
         name = "Fabric"
         url = uri("https://maven.fabricmc.net/")
     }
-    maven {
-        name = "Architectury"
-        url = uri("https://maven.architectury.dev/")
-    }
-    maven {
-        name = "Forge"
-        url = uri("https://files.minecraftforge.net/maven/")
-    }
+//    maven {
+//        name = "Architectury"
+//        url = uri("https://maven.architectury.dev/")
+//    }
+//    maven {
+//        name = "Forge"
+//        url = uri("https://files.minecraftforge.net/maven/")
+//    }
 }
diff --git a/lom/build.gradle.kts b/lom/build.gradle.kts
index 8fcc1ff..aa257ae 100644
--- a/lom/build.gradle.kts
+++ b/lom/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     api(projects.convention)
-    api("dev.architectury.loom:dev.architectury.loom.gradle.plugin:1.6-SNAPSHOT")
+    api("net.fabricmc:fabric-loom:1.6-SNAPSHOT")
+    //api("dev.architectury.loom:dev.architectury.loom.gradle.plugin:1.6-SNAPSHOT")
     api("com.github.johnrengelman:shadow:8.1.1")
 }
\ No newline at end of file
diff --git a/lom/src/main/kotlin/lom.gradle.kts b/lom/src/main/kotlin/lom.gradle.kts
index 5b951c8..a7e5e83 100644
--- a/lom/src/main/kotlin/lom.gradle.kts
+++ b/lom/src/main/kotlin/lom.gradle.kts
@@ -7,7 +7,8 @@ plugins {
     id("jf.java")
     idea
     `maven-publish`
-    id("dev.architectury.loom")
+    id("fabric-loom")
+//    id("dev.architectury.loom")
     id("com.github.johnrengelman.shadow")
 }
 
@@ -22,7 +23,7 @@ args.loaderKind.finalizeValue()
 loom {
     runtimeOnlyLog4j.set(true)
     if (args.isSplitSources) splitEnvironmentSourceSets()
-    silentMojangMappingsLicense()
+//    silentMojangMappingsLicense() // Only available in arch loom
 }
 
 // Create testmod source set with access to main and client classpaths