More Fixes for AccessWideners, mappings and experimental support for new neoforge versioning

Author: hypherionmc

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ gson = "2.13.1"
 asm = "9.8"
 
 tiny-remapper = "0.11.1"
-unimined-mapping-library = "1.2.1"
+unimined-mapping-library = "1.2.2"
 
 binarypatcher = "1.1.1"
 neo_binarypatcher = "4.0.7"

src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt

@@ -35,7 +35,7 @@ abstract class MappingsConfig<T: MappingsConfig<T>>(val project: Project, val mi
     }) {
 
     private var innerDevNamespace: Namespace by FinalizeOnRead(LazyMutable {
-        if (minecraft.minecraftData.mcVersionCompare("1.21.11", minecraft.version) <= 0) {
+        if (minecraft.minecraftData.mcVersionCompare("1.21.11", minecraft.version) < 0) {
             return@LazyMutable Namespace("official")
         }
         namespaces.entries.firstOrNull { it.value }?.key ?: error("No \"Named\" namespace found for devNamespace, if this is correct, set devNamespace explicitly")

src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt

@@ -323,6 +323,8 @@ open class MappingsProvider(project: Project, minecraft: MinecraftConfig, subKey
     override fun mojmap() {
         // 26.1+ is unmapped. We return here otherwise Neo and Forge try to download mappings
         if (!minecraft.obfuscated) {
+            devNamespace("official")
+            devFallbackNamespace("official")
             return
         }
 

src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/aw/AccessWidenerApplier.kt

@@ -75,6 +75,8 @@ object AccessWidenerApplier {
     fun nsName(config: MappingsConfig<*>, namespace: Namespace) =
         if (config.devNamespace != namespace) {
             "intermediary" // -_-
+        } else if (config.minecraft.minecraftData.mcVersionCompare(config.minecraft.version, "1.21.11") > 0) {
+            "official"
         } else {
             "named"
         }

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt

@@ -511,7 +511,7 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
                 description = "Remaps $inputTask's output jar"
                 asJar.archiveClassifier.set(classifier)
             }
-            project.tasks.getByName("assemble").dependsOn("remap" + inputTask.name.capitalized())
+            project.tasks.getByName("build").dependsOn("remap" + inputTask.name.capitalized())
         } else {
             project.logger.warn(
                 "[Unimined/Minecraft ${project.path}:${sourceSet.name}] Could not find default task '${inputTaskName.withSourceSet(sourceSet)} for $sourceSet."

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/access/transformer/AccessTransformerMinecraftTransformer.kt

@@ -126,6 +126,15 @@ interface AccessTransformerMinecraftTransformer : AccessTransformerPatcher, Acce
         ).use {
             ATWriter.writeData(list, it::append)
         }
+
+        // Fix whitespaces in ATs that can cause forge to fail on 1.8.9+
+        if (!legacyATFormat) {
+            val lines = temp.bufferedReader().readLines()
+            temp.bufferedWriter().use {
+                    writer -> lines.filter { s -> !s.startsWith(" ") }.forEach { writer.write(it) }
+            }
+        }
+
         try {
             project.execOps.javaexec { spec ->
                 if (useToolchains) {

src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/NeoForgedMinecraftTransformer.kt

@@ -42,7 +42,10 @@ open class NeoForgedMinecraftTransformer(project: Project, provider: MinecraftPr
                 project.dependencies.create("net.neoforged:forge:${provider.version}-$dep:universal")
             } else {
                 var version = provider.version.removePrefix("1.")
-                if (!version.contains(".")) {
+
+                if (provider.minecraftData.mcVersionCompare(provider.version, "26.1") <= 0) {
+                    version = "${provider.version}.0"
+                } else if (!version.contains(".")) {
                     version = "$version.0"
                 }
                 project.dependencies.create("net.neoforged:neoforge:$version.$dep:universal")