Switch to Unimined.

Both Forges are broken in this release due to Unimined bugs.  There's a PR for the problem affecting Neoforged.  I'm hoping the Forge one goes away when there's no remapping.

Author: gniftygnome

.gitignore

@@ -118,3 +118,6 @@ runs/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+
+# Forges via Unimined
+accesstransformer.cfg

build.gradle

@@ -1,30 +1,50 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id 'dev.architectury.loom' version '1.13-SNAPSHOT' apply(false)
-}
-
-architectury {
-    minecraft = rootProject.minecraft_version
+    id 'java'
+    id 'xyz.wagyourtail.unimined' version '1.4.1' apply false
 }
 
 subprojects {
-    apply plugin: "dev.architectury.loom"
+    apply plugin: 'xyz.wagyourtail.unimined'
 
     project.archivesBaseName = "${rootProject.archives_base_name}-${project.name}"
 
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.officialMojangMappings()
+    configurations {
+        modCompileOnly
+        compileOnly.extendsFrom modCompileOnly
+        modApi
+        api.extendsFrom modApi
+    }
+
+    unimined.minecraft(sourceSets.main, true) {
+        version rootProject.minecraft_version
+
+        mappings {
+            mojmap()
+            devNamespace "mojmap"
+        }
+
+        mods {
+            remap(configurations.modCompileOnly) {
+                catchAWNamespaceAssertion()
+            }
+
+            remap(configurations.modApi)
+
+            // This is basically just a shortcut for `remap(configurations.modImplementation)`.
+            modImplementation {
+                // You can do this if mods have the wrong access widener mapping, but it may break runs.
+                catchAWNamespaceAssertion()
+            }
+        }
     }
 }
 
-// Ferry for publishing; this has to be after arch dev plugin apply and before subproject version is set.
+// Ferry for publishing; this has to be after unimined plugin apply and before subproject version is set.
 apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/3.0/ferry-mpp.gradle'
 
 allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
 
     group = rootProject.maven_group
     version = rootProject.version

common/build.gradle

@@ -1,15 +1,26 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
+unimined.minecraft {
+    fabric {
+        loader fabric_loader_version
+        accessWidener file("src/main/resources/biolith.accesswidener")
+    }
+
+    defaultRemapJar = false
 }
 
-loom {
-    accessWidenerPath = file("src/main/resources/biolith.accesswidener")
+// Unimined hard codes injected interfaces to come from 'fabric.mod.json' in 'resources' of the 'main' source set.
+// This creates a frustrating situation where the main source set of :common must contain FMJ which conflicts with
+// the one in :fabric (and gradle's conflict resolution just arbitrarily picks "the first" version of the file)...
+sourceSets {
+    withoutFMJ {
+        java {
+        }
+        resources {
+            exclude 'fabric.mod.json'
+        }
+    }
 }
 
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    // Remove the next line if you don't want to depend on the API
-    //modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+sourcesJar {
+    from sourceSets.withoutFMJ.allSource
+    exclude 'fabric.mod.json'
 }

common/src/main/resources/architectury.common.json

@@ -0,0 +1,11 @@
+{
+    "schemaVersion": 1,
+    "id": "injected_interfaces_common",
+    "version": "1",
+    "custom": {
+        "loom:injected_interfaces": {
+            "net/minecraft/class_1966": ["com/terraformersmc/biolith/impl/biome/InterfaceBiomeSource"],
+            "net/minecraft/class_6544\u0024class_6548": ["com/terraformersmc/biolith/impl/biome/InterfaceSearchTree"]
+        }
+    }
+}

common/src/main/resources/fabric.mod.json

@@ -1,32 +1,18 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
+unimined.minecraft {
+    // Combine with common, for identifying both together as one mod for dev runs
+    combineWith(project(":common").sourceSets.withoutFMJ)
 
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
+    fabric {
+        loader project.fabric_loader_version
+        accessWidener file("../common/src/main/resources/biolith.accesswidener")
+    }
 }
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    // Remove the next line if you don't want to depend on the API
-    //modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive = false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive = false }
+    implementation(project(path: ":common")) { transitive = false }
 
     // Terraform Surfaces API for OpenSimplexNoise
     //include(modImplementation("com.terraformersmc.terraform-api:terraform-surfaces-api-v1:${rootProject.terraform_surfaces_api_version}"))
@@ -46,31 +32,13 @@ processResources {
     }
 }
 
-shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set("dev-shadow")
-}
-
-remapJar {
-    injectAccessWidener = true
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
 
 sourcesJar {
     def commonSources = project(":common").sourcesJar
     dependsOn commonSources
     from commonSources.archiveFile.map { zipTree(it) }
 }
 
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
 publish {
     onlyIf {
         rootProject.enabled_platforms.split(",").contains(project.projectDir)

fabric/build.gradle

@@ -1,49 +1,20 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "8.1.1"
-}
-
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-
-    forge {
-        convertAccessWideners = true
-        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
+unimined.minecraft {
+    // Combine with common, for identifying both together as one mod for dev runs
+    combineWith(project(":common").sourceSets.withoutFMJ)
 
+    minecraftForge {
+        loader forge_version
         mixinConfig("biolith.mixins.json", "biolith.forge.mixins.json")
-    }
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
-// Hack to force Forge-required version of jopt-simple (required since 1.20.5).
-configurations.all {
-    resolutionStrategy {
-        force 'net.sf.jopt-simple:jopt-simple:5.0.4'
+        accessTransformer aw2at(file("../common/src/main/resources/biolith.accesswidener"))
     }
 }
 
 dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
-    // Remove the next line if you don't want to depend on the API
-    //modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
-
     // Forge does not provide MixinExtras
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${rootProject.mixinextras_version}"))
     implementation(include("io.github.llamalad7:mixinextras-forge:${rootProject.mixinextras_version}"))
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive = false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+    implementation(project(path: ":common")) { transitive = false }
 
     // Terraform Surfaces API for OpenSimplexNoise
     //include(modImplementation("com.terraformersmc.terraform-api:terraform-surfaces-api-v1:${rootProject.terraform_surfaces_api_version}"))
@@ -60,31 +31,6 @@ processResources {
     }
 }
 
-shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set("dev-shadow")
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
 publish {
     onlyIf {
         rootProject.enabled_platforms.split(",").contains(project.projectDir)

fabric/gradle.properties

@@ -17,10 +17,10 @@ fabric_api_version=0.140.0+1.21.11
 fabric_loader_version=0.17.3
 
 # Forge
-forge_version=1.21.11-61.0.3
+forge_version=61.0.3
 
 # NeoForge
-neoforge_version=21.11.12-beta
+neoforge_version=17-beta
 
 ##
 ## Dependencies