build: Do not use duplicate copy of accesswideners for 26.1

Author: forkiesassds

build-unobf.gradle.kts

@@ -11,7 +11,7 @@ loom {
         useLegacyMixinAp = false
     }
 
-    accessWidenerPath = file("../../src/main/resources/moderner_beta-unobf.accesswidener")
+    accessWidenerPath = stonecutter.process(file("../../src/main/resources/moderner_beta.accesswidener"), "build/dev.aw")
 
     decompilers {
         named("vineflower") { // Adds names to lambdas - useful for mixins

build.gradle.kts

@@ -11,7 +11,7 @@ loom {
         useLegacyMixinAp = false
     }
 
-    accessWidenerPath = file("../../src/main/resources/moderner_beta.accesswidener")
+    accessWidenerPath = stonecutter.process(file("../../src/main/resources/moderner_beta.accesswidener"), "build/dev.aw")
 
     decompilers {
         named("vineflower") { // Adds names to lambdas - useful for mixins

buildSrc/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 dependencies {
     fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
     //FIXME: This is hardcoded! Bad!
-    implementation("dev.kikugie:stonecutter:0.8-beta.3")
+    implementation("dev.kikugie:stonecutter:0.8.1-beta.1")
     implementation(plugin("com.modrinth.minotaur", "2.+"))
 
     implementation("org.ow2.asm:asm:9.9")

fabric/build-unobf.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 loom {
-    accessWidenerPath = commonProject.file("../../src/main/resources/moderner_beta-unobf.accesswidener")
+    accessWidenerPath = stonecutter.process(commonProject.file("../../src/main/resources/moderner_beta.accesswidener"), "build/dev.aw")
 
     runConfigs.all {
         ideConfigGenerated(true)
@@ -49,11 +49,6 @@ dependencies {
 
 tasks.processResources {
     exclude("assets/moderner_beta/banner.png")
-
-    exclude("moderner_beta.accesswidener")
-    filesMatching("moderner_beta-unobf.accesswidener") {
-        name = "moderner_beta.accesswidener"
-    }
 }
 
 modrinth {

fabric/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 loom {
-    accessWidenerPath = commonProject.file("../../src/main/resources/moderner_beta.accesswidener")
+    accessWidenerPath = stonecutter.process(commonProject.file("../../src/main/resources/moderner_beta.accesswidener"), "build/dev.aw")
 
     runConfigs.all {
         ideConfigGenerated(true)
@@ -53,7 +53,6 @@ dependencies {
 tasks {
     processResources {
         exclude("assets/moderner_beta/banner.png")
-        exclude("moderner_beta-unobf.accesswidener")
     }
 
     remapJar {

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx4G
 
 # Build tool properties
-stonecutter_version=0.8-beta.3
+stonecutter_version=0.8.1-beta.1
 loom_version=1.14.+
 mdg_version=2.0.131
 

src/main/resources/moderner_beta-unobf.accesswidener

@@ -116,5 +116,10 @@ stonecutter.parameters {
             direction = eval(current.version, ">=1.21.11")
             replace("net.minecraft.Util", "net.minecraft.util.Util")
         }
+
+        string {
+            direction = eval(current.version, ">=26.1")
+            replace("accessWidener v1 named", "accessWidener v1 official")
+        }
     }
 }