feat: try architectury again

buildSrc/src/main/kotlin/jf.plugin-conventions.gradle.kts

@@ -11,15 +11,7 @@ repositories {
     mavenCentral()
     gradlePluginPortal()
     maven {
-        name = "Fabric"
-        url = uri("https://maven.fabricmc.net/")
+        name = "JFronny Mirrors"
+        url = uri("https://maven.frohnmeyer-wds.de/mirrors")
     }
-//    maven {
-//        name = "Architectury"
-//        url = uri("https://maven.architectury.dev/")
-//    }
-//    maven {
-//        name = "Forge"
-//        url = uri("https://files.minecraftforge.net/maven/")
-//    }
 }

lom/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     api(projects.convention)
-    api("net.fabricmc:fabric-loom:1.6-SNAPSHOT")
-    //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")
 }

lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomExtension.kt

@@ -9,6 +9,7 @@ interface LomExtension {
     val minecraftVersion: Property<String>
     val loaderVersion: Property<String>
     val yarnBuild: Property<String>
+    val neoforgeYarnPatch: Property<String>
 
     fun yarn(yarnBuild: String) {
         this.yarnBuild.set(Objects.requireNonNull(yarnBuild))
@@ -23,6 +24,7 @@ interface LomExtension {
         minecraftVersion.finalizeValue()
         loaderVersion.finalizeValue()
         loaderKind.finalizeValue()
+        neoforgeYarnPatch.finalizeValue()
     }
 
     fun copyFrom(ext: LomExtension) {
@@ -31,5 +33,6 @@ interface LomExtension {
         if (loaderKind.get() == ext.loaderKind.get()) {
             loaderVersion.set(ext.loaderVersion)
         }
+        neoforgeYarnPatch.set(ext.neoforgeYarnPatch)
     }
 }

lom/src/main/kotlin/lom.gradle.kts

@@ -7,8 +7,8 @@ plugins {
     id("jf.java")
     idea
     `maven-publish`
-    id("fabric-loom")
-//    id("dev.architectury.loom")
+//    id("fabric-loom")
+    id("dev.architectury.loom")
     id("com.github.johnrengelman.shadow")
 }
 
@@ -23,7 +23,7 @@ args.loaderKind.finalizeValue()
 loom {
     runtimeOnlyLog4j.set(true)
     if (args.isSplitSources) splitEnvironmentSourceSets()
-//    silentMojangMappingsLicense() // Only available in arch loom
+    silentMojangMappingsLicense() // Only available in arch loom
 }
 
 // Create testmod source set with access to main and client classpaths
@@ -75,15 +75,8 @@ loom {
 
 // Common repositories for mods
 repositories {
-    maven("https://maven.terraformersmc.com/") {
-        name = "TerraformersMC"
-    }
-    maven("https://maven.frohnmeyer-wds.de/artifacts") {
-        name = "JFronny"
-    }
-    if (args.isNeoForge) {
-        // for some reason, this doesn't get added automatically
-        maven("https://maven.neoforged.net/releases")
+    maven("https://maven.frohnmeyer-wds.de/mirrors") {
+        name = "JFronny Mirrors"
     }
     mavenCentral()
     mavenLocal()
@@ -94,8 +87,14 @@ earlyAfterEvaluate {
     args.check(this)
     dependencies {
         minecraft("com.mojang:minecraft:${args.minecraftVersion.get()}")
-        if (args.yarnBuild.isPresent) mappings("net.fabricmc:yarn:${args.minecraftVersion.get()}+${args.yarnBuild.get()}:v2")
-        else loom.officialMojangMappings()
+        if (args.yarnBuild.isPresent) {
+            if (args.loaderKind.get() == LoaderKind.NEOFORGE) {
+                mappings(loom.layered {
+                    mappings("net.fabricmc:yarn:${args.minecraftVersion.get()}+${args.yarnBuild.get()}:v2")
+                    mappings("dev.architectury:yarn-mappings-patch-neoforge:${args.minecraftVersion.get()}+${args.neoforgeYarnPatch.get()}")
+                })
+            } else mappings("net.fabricmc:yarn:${args.minecraftVersion.get()}+${args.yarnBuild.get()}:v2")
+        } else loom.officialMojangMappings()
         when (args.loaderKind.get()) {
             LoaderKind.NEOFORGE -> {
                 "neoForge"("net.neoforged:neoforge:${args.loaderVersion.get()}")