Update to 26.1

Author: shedaniel

.github/workflows/publish.yml

@@ -28,16 +28,17 @@ on:
             - v19
             - v20
             - v21.11
+            - v26.1
 
 jobs:
     build:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v1
-            - name: Set up JDK 21
+            - name: Set up JDK 25
               uses: actions/setup-java@v2
               with:
-                  java-version: 21
+                  java-version: 25
                   distribution: 'temurin'
             - name: Upload to Maven
               run: ./gradlew publish modPublish --stacktrace

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.5-SNAPSHOT"
+    id "dev.architectury.loom-no-remap" version "1.14-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id "maven-publish"
     id "org.cadixdev.licenser" version "0.6.1" apply false
@@ -12,11 +12,8 @@ architectury {
 
 subprojects {
     if (it.name != "neoforge_coremods") {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-        silentMojangMappingsLicense()
-    }}
+        apply plugin: "dev.architectury.loom-no-remap"
+    }
 
     repositories {
         maven { url "https://maven.neoforged.net/releases/" }
@@ -33,7 +30,7 @@ subprojects {
 
 allprojects {
     apply plugin: 'java'
-    apply plugin: 'org.cadixdev.licenser'
+//    apply plugin: 'org.cadixdev.licenser' // Fails in Gradle 9
 
     def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? "9999" : System.getenv("GITHUB_RUN_NUMBER"))
 
@@ -46,30 +43,31 @@ allprojects {
     group = rootProject.maven_group
 
     if (it.name != "neoforge_coremods") {
-    apply plugin: 'architectury-plugin'
+        apply plugin: 'architectury-plugin'
+    }
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
 
         // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
         // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
         // We'll use that if it's available, but otherwise we'll use the older option.
-        options.release = 21
-    }}
+        options.release = 25
+    }
 
-    license {
+    /*license {
         header = rootProject.file("HEADER")
 
         ext {
             name = "shedaniel"
             year = "2020 - 2021"
         }
 
-        include "**/*.java"
-        exclude "**/ScrollingContainer.java"
+        include "**/ /**.java"
+        exclude "**/ /*ScrollingContainer.java"
 
         ignoreFailures = true
-    }
+    }*/
 }
 
 task licenseFormatAll

common/build.gradle

@@ -13,12 +13,11 @@ configurations {
 
 dependencies {
     minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}"
-    mappings loom.officialMojangMappings()
     // We depend on fabric loader here to use the fabric @Environment annotations
     // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    modApi("me.shedaniel.cloth:basic-math:0.6.1")
+    api("me.shedaniel.cloth:basic-math:0.6.1")
 
     compileOnly("blue.endless:jankson:${rootProject.jankson_version}")
     compileOnly("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}")
@@ -34,28 +33,38 @@ architectury {
     common("fabric", /*"forge", */"neoforge")
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = "sources"
-    from sourceSets.main.allSource
+jar {
+    archiveClassifier = "raw"
+}
+
+java {
+    withSourcesJar()
 }
 
 shadowJar {
+    dependsOn(jar)
+    mainSpec.sourcePaths.clear()
+    from(zipTree(jar.archiveFile))
     relocate "blue.endless.jankson", "${rootProject.maven_group}.clothconfig.shadowed.blue.endless.jankson"
     relocate "com.moandjiezana.toml", "${rootProject.maven_group}.clothconfig.shadowed.com.moandjiezana.toml"
     relocate "org.yaml.snakeyaml", "${rootProject.maven_group}.clothconfig.shadowed.org.yaml.snakeyaml"
 
     configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "shadow"
-}
-
-remapJar {
-    dependsOn(shadowJar)
-    input.set(shadowJar.archiveFile)
     archiveClassifier = null
-
     from rootProject.file("LICENSE.md")
 }
 
+configurations {
+    apiElements {
+        outgoing.artifacts.clear()
+        outgoing.artifact(shadowJar)
+    }
+    runtimeElements {
+        outgoing.artifacts.clear()
+        outgoing.artifact(shadowJar)
+    }
+}
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {

common/src/main/java/me/shedaniel/autoconfig/AutoConfig.java

@@ -19,18 +19,12 @@
 
 package me.shedaniel.autoconfig;
 
-import dev.architectury.injectables.annotations.PlatformOnly;
 import me.shedaniel.autoconfig.annotation.Config;
-import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
 import me.shedaniel.autoconfig.serializer.ConfigSerializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.screens.Screen;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Supplier;
 
 /**
  * @see AutoConfigClient
@@ -75,18 +69,4 @@ public static <T extends ConfigData> ConfigHolder<T> getConfigHolder(Class<T> co
             throw new RuntimeException(String.format("Config '%s' has not been registered", configClass));
         }
     }
-    
-    @Environment(EnvType.CLIENT)
-    @PlatformOnly(PlatformOnly.FABRIC)
-    @Deprecated(forRemoval = true)
-    public static <T extends ConfigData> GuiRegistry getGuiRegistry(Class<T> configClass) {
-        return AutoConfigClient.getGuiRegistry(configClass);
-    }
-    
-    @Environment(EnvType.CLIENT)
-    @PlatformOnly(PlatformOnly.FABRIC)
-    @Deprecated(forRemoval = true)
-    public static <T extends ConfigData> Supplier<Screen> getConfigScreen(Class<T> configClass, Screen parent) {
-        return AutoConfigClient.getConfigScreen(configClass, parent);
-    }
 }