Port to 1.21.9 snapshots (#281)

* port to 25w31a

* JiJ the mavenlocal fapi module

* include fabric-api-base JiJ to get it working in prod

* fix: no access widener in fabric.mod.json

* update to use officially released FAPI on 1.21.9

* fix neoforge builds

Author: isXander

build.gradle.kts

@@ -45,12 +45,7 @@ val testmod by sourceSets.registering {
 
 modstitch {
     minecraftVersion = mcVersion
-
-    // ideally, we use 17 for everything to tell IDE about the language features that are available
-    // on the lowest common denominator: 17. However, Forge versions that use a java 21 MC version
-    // won't compile on Java 17, so we need to use 21 for those.
-    val mcIsJava21 = stonecutter.eval(mcSemverVersion, ">1.20.4")
-    javaTarget = if (mcIsJava21 && isForgeLike) 21 else 17
+    javaVersion = 21
 
     parchment {
         prop("parchment.version") { mappingsVersion = it }
@@ -98,21 +93,14 @@ modstitch {
             }
 
             mixin.useLegacyMixinAp = false
-
-            accessWidenerPath = rootProject.file("src/main/resources/yacl.accesswidener")
         }
-
-        // do not validate
-        tasks.getByName("validateAccessWidener").enabled = false
     }
 
     moddevgradle {
-        enable {
-            prop("deps.neoforge") { neoForgeVersion = it }
-            prop("deps.forge") { forgeVersion = it }
-        }
+        prop("deps.neoforge") { neoForgeVersion = it }
+        prop("deps.forge") { forgeVersion = it }
 
-        configureNeoforge {
+        configureNeoForge {
             runs {
                 register("testmodClient") {
                     client()
@@ -121,8 +109,6 @@ modstitch {
                 }
             }
 
-            validateAccessTransformers = false
-
             mods {
                 register("testmod") {
                     sourceSet(testmod.get())
@@ -197,6 +183,7 @@ dependencies {
 
     if (isFabric) {
         modDependency("fabricApi", { "net.fabricmc.fabric-api:fabric-api:$it" }, requiredByDependants = true)
+
         modDependency("fabricLangKotlin", { "net.fabricmc:fabric-language-kotlin:${it}" })
     }
     if (isNeoforge) {
@@ -353,7 +340,7 @@ publishing {
 tasks {
     withType<KotlinCompile> {
         compilerOptions {
-            jvmTarget = modstitch.javaTarget.map { JvmTarget.fromTarget(it.toString()) }
+            jvmTarget = modstitch.javaVersion.map { JvmTarget.fromTarget(it.toString()) }
         }
 
         dependsOn("stonecutterGenerate")
@@ -364,8 +351,10 @@ tasks.named("generateModMetadata") {
     dependsOn("stonecutterGenerate")
 }
 modstitch.moddevgradle {
-    tasks.named("createMinecraftArtifacts") {
-        dependsOn("stonecutterGenerate")
+    modstitch.onEnable {
+        tasks.named("createMinecraftArtifacts") {
+            dependsOn("stonecutterGenerate")
+        }
     }
 }
 

gradle.properties

@@ -8,7 +8,7 @@ curseforgeSlug=yacl
 curseforgeId=667299
 githubProject=isXander/YetAnotherConfigLib
 
-deps.fabricLoader=0.16.14
+deps.fabricLoader=0.17.0
 deps.imageio=3.12.0
 deps.quiltParsers=0.2.1
 deps.fabricLangKotlin=1.12.3+kotlin.2.0.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Apr 05 20:43:25 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/yacl.accesswidener modstitch.accesswidenersrc/main/resources/yacl.accesswidener renamed to modstitch.accesswidener

@@ -1,4 +1,4 @@
-accessWidener v2 named
+accessWidener v1 named
 
 extendable method net/minecraft/client/gui/components/AbstractSelectionList children ()Ljava/util/List;
 extendable method net/minecraft/client/gui/components/AbstractSelectionList getEntryAtPosition (DD)Lnet/minecraft/client/gui/components/AbstractSelectionList$Entry;
@@ -7,12 +7,8 @@ accessible method net/minecraft/client/gui/components/tabs/TabNavigationBar <ini
 accessible method net/minecraft/client/gui/components/Tooltip <init> (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V
 
 # CompositeStateBuilders got protected in 1.21.5. You need them for creating `RenderType`s.
-#?if >=1.21.5 {
 accessible method net/minecraft/client/renderer/RenderType$CompositeState$CompositeStateBuilder setTextureState (Lnet/minecraft/client/renderer/RenderStateShard$EmptyTextureStateShard;)Lnet/minecraft/client/renderer/RenderType$CompositeState$CompositeStateBuilder;
 accessible method net/minecraft/client/renderer/RenderType$CompositeState$CompositeStateBuilder createCompositeState (Z)Lnet/minecraft/client/renderer/RenderType$CompositeState;
-#?}
 
-#? if >=1.21.6 {
 accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack
 accessible method net/minecraft/client/gui/GuiGraphics$ScissorStack peek ()Lnet/minecraft/client/gui/navigation/ScreenRectangle;
-#? }

settings.gradle.kts

@@ -3,17 +3,13 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
         maven("https://maven.fabricmc.net/")
-        maven("https://maven.architectury.dev")
         maven("https://maven.neoforged.net/releases/")
-        maven("https://maven.minecraftforge.net/")
         maven("https://maven.kikugie.dev/releases")
-        maven("https://maven.kikugie.dev/snapshots")
-        maven("https://maven.isxander.dev/releases")
     }
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.7-alpha.22"
+    id("dev.kikugie.stonecutter") version "0.7.6"
 }
 
 stonecutter {
@@ -27,6 +23,7 @@ stonecutter {
             }
         }
 
+        mc("1.21.9", loaders = listOf("fabric"))
         mc("1.21.6", loaders = listOf("fabric", "neoforge"))
         mc("1.21.5", loaders = listOf("fabric", "neoforge"))
         mc("1.21.4", loaders = listOf("fabric", "neoforge"))

src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java

@@ -110,12 +110,12 @@ protected boolean isValidMouseClick(int button) {
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(double mouseX, double mouseY, int button /*? if >=1.21.9 {*/ ,boolean doubleClick /*?}*/) {
         if (button == 0 && mouseX >= scrollBarX() && mouseX < scrollBarX() + SCROLLBAR_WIDTH) {
             usingScrollbar = true;
         }
 
-        return super.mouseClicked(mouseX, mouseY, button);
+        return super.mouseClicked(mouseX, mouseY, button /*? if >=1.21.9 {*/ ,doubleClick /*?}*/);
     }
 
     @Override
@@ -262,9 +262,9 @@ public void visitWidgets(Consumer<AbstractWidget> consumer) {
 
     public abstract static class Entry<E extends Entry<E>> extends ContainerObjectSelectionList.Entry<E> {
         @Override
-        public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        public boolean mouseClicked(double mouseX, double mouseY, int button /*? if >=1.21.9 {*/ ,boolean doubleClick /*?}*/) {
             for (GuiEventListener child : this.children()) {
-                if (child.mouseClicked(mouseX, mouseY, button)) {
+                if (child.mouseClicked(mouseX, mouseY, button /*? if >=1.21.9 {*/ ,doubleClick /*?}*/)) {
                     if (button == InputConstants.MOUSE_BUTTON_LEFT || button == InputConstants.MOUSE_BUTTON_RIGHT)
                         this.setDragging(true);
                     return true;

src/main/java/dev/isxander/yacl3/gui/OptionDescriptionWidget.java

@@ -108,7 +108,7 @@ public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float del
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(double mouseX, double mouseY, int button /*? if >=1.21.9 {*/ ,boolean doubleClick /*?}*/) {
         Style clickedStyle = getDescStyle((int) mouseX, (int) mouseY);
         if (clickedStyle != null && clickedStyle.getClickEvent() != null) {
             if (minecraft.screen.handleComponentClicked(clickedStyle)) {

src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java

@@ -147,13 +147,13 @@ public void updateSearchQuery(String query) {
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(double mouseX, double mouseY, int button /*? if >=1.21.9 {*/ ,boolean doubleClick /*?}*/) {
         for (Entry child : children()) {
             if (child != getEntryAtPosition(mouseX, mouseY) && child instanceof OptionEntry optionEntry)
                 optionEntry.widget.unfocus();
         }
 
-        return super.mouseClicked(mouseX, mouseY, button);
+        return super.mouseClicked(mouseX, mouseY, button /*? if >=1.21.9 {*/ ,doubleClick /*?}*/);
     }
 
     @Override

src/main/java/dev/isxander/yacl3/gui/YACLScreen.java

@@ -195,8 +195,8 @@ public void tick() {
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (super.mouseClicked(mouseX, mouseY, button)) {
+    public boolean mouseClicked(double mouseX, double mouseY, int button /*? if >=1.21.9 {*/ ,boolean doubleClick /*?}*/) {
+        if (super.mouseClicked(mouseX, mouseY, button /*? if >=1.21.9 {*/ ,doubleClick /*?}*/)) {
             this.setDragging(true);
             return true;
         }

src/main/java/dev/isxander/yacl3/gui/controllers/ActionController.java

@@ -80,7 +80,7 @@ public void executeAction() {
         }
 
         @Override
-        public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        public boolean mouseClicked(double mouseX, double mouseY, int button /*? if >=1.21.9 {*/ ,boolean doubleClick /*?}*/) {
             if (isMouseOver(mouseX, mouseY) && isAvailable()) {
                 executeAction();
                 return true;