Sync upstream

.github/workflows/build.yml

@@ -5,12 +5,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [17-jdk, 21-jdk]
+        java: [21-jdk]
     runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:${{ matrix.java }}
       options: --user root
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/actions/wrapper-validation@v4
       - run: ./gradlew build publishToMavenLocal --stacktrace --warning-mode fail

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
       options: --user root
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/actions/wrapper-validation@v4
       - run: ./gradlew build publish --stacktrace
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}

HEADER.txt

@@ -1,22 +1,24 @@
-This file is part of ${name}, licensed under the MIT License (MIT).
-
-Copyright (c) ${organization} <${url}>
-Copyright (c) contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+/*
+ * This file is part of Mixin, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */

build.gradle

@@ -5,29 +5,28 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
         classpath 'com.guardsquare:proguard-gradle:' + (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11) ? '7.5.0' : '7.1.0')
     }
 }
 
 plugins {
-    //id "me.modmuss50.remotesign" version "0.4.0"
-    id "io.github.goooler.shadow"  version "8.1.7"
+    // id "me.modmuss50.remotesign" version "0.5.0"
+    id "com.gradleup.shadow"  version "9.0.0-beta17"
+    id "dev.lukebemish.central-portal-publishing" version "0.1.7"
 }
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 // Apply plugin
 apply plugin: 'java'
-apply plugin: 'com.github.hierynomus.license'
 apply plugin: 'checkstyle'
 apply plugin: 'maven-publish'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'potemkin-modules'
 
 // Default tasks
-defaultTasks 'licenseFormat', 'check', 'build'
+defaultTasks 'check', 'build'
 
 // Basic project information
 group = 'io.github.legacymoddingmc'
@@ -298,22 +297,13 @@ processResources {
 }
 
 // License header formatting
-license {
-    ext {
-        name = "Mixin"
-        organization = "SpongePowered"
-        url = "https://www.spongepowered.org"
-    }
-    include '**/*.java'
-    header file("HEADER.txt")
-    sourceSets = project.sourceSets
-    ignoreFailures false
-    strictCheck true
-    mapping {
-        java = 'SLASHSTAR_STYLE'
-    }
+def validateHeaders = tasks.register("validateHeaders", org.spongepowered.asm.mixin.build.ValidateLicenseHeadersTasks) {
+    header = resources.text.fromFile("HEADER.txt")
+    source = sourceSets.collect { it.allJava }
 }
 
+tasks.check.dependsOn validateHeaders
+
 checkstyle {
     configProperties = [
         "name"        : project.name,
@@ -353,6 +343,7 @@ project.sourceSets.each { set -> {
 
 compileModularityJava {
     inputs.files(modularityInputs)
+    options.javaModuleVersion = project.version as String
     doFirst {
         options.compilerArgs = [
             '--module-path', classpath.asPath,
@@ -457,15 +448,23 @@ ext.excludePomDeps = [
     'junit',
     'mockito-core',
     'mixin-asm-debug-all',
-    'log4j-core'
+    'log4j-core',
+    'gson'
 ]
 
+centralPortalPublishing.bundle('mixin') {
+    username = ENV.MAVEN_CENTRAL_USERNAME
+    password = ENV.MAVEN_CENTRAL_PASSWORD
+}
+
+tasks.publish.dependsOn tasks.named("publishMixinCentralPortalBundle")
+
 publishing {
     publications {
         developer(MavenPublication) { publication ->
-            groupId project.group
-            artifactId project.base.archivesName.get()
-            version project.version
+            groupId = project.group
+            artifactId = project.base.archivesName.get()
+            version = project.version
 
             artifact sourceJar
             artifact javadocJar
@@ -547,24 +546,15 @@ publishing {
     repositories {
         if (ENV.MAVEN_URL) {
             maven {
-                url ENV.MAVEN_URL
+                url = ENV.MAVEN_URL
                 credentials {
-                    username ENV.MAVEN_USERNAME
-                    password ENV.MAVEN_PASSWORD
+                    username = ENV.MAVEN_USERNAME
+                    password = ENV.MAVEN_PASSWORD
                 }
             }
         }
 
-        if (ENV.MAVEN_CENTRAL_URL) {
-            repositories.maven {
-                name "central"
-                url ENV.MAVEN_CENTRAL_URL
-                credentials {
-                    username ENV.MAVEN_CENTRAL_USERNAME
-                    password ENV.MAVEN_CENTRAL_PASSWORD
-                }
-            }
-        }
+        centralPortalPublishing.portalBundle(':', 'mixin')
     }
 }
 

buildSrc/build.gradle

@@ -4,8 +4,8 @@ plugins {
 
 repositories {
     maven {
-        name 'sponge'
-        url 'https://repo.spongepowered.org/repository/maven-public'
+        name = 'sponge'
+        url = 'https://repo.spongepowered.org/repository/maven-public'
     }
 }
 

buildSrc/src/main/groovy/org/spongepowered/asm/mixin/build/ValidateLicenseHeadersTasks.groovy

@@ -0,0 +1,56 @@
+/*
+ * This file is part of Mixin, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.spongepowered.asm.mixin.build
+
+import org.gradle.api.resources.TextResource
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.SourceTask
+import org.gradle.api.tasks.TaskAction
+
+abstract class ValidateLicenseHeadersTasks extends SourceTask {
+    @Input
+    TextResource header
+
+    @TaskAction
+    void run() {
+        def headerStr = header.asString()
+        def javaSources = getSource().matching(pattern -> pattern.include("**/*.java")).files
+
+        def failedFiles = []
+
+        for (def source : javaSources) {
+            if (!source.text.startsWith(headerStr)) {
+                failedFiles.add(source.name)
+                logger.warn("File {} does not have the correct license header", source.path)
+            }
+        }
+
+        if (!failedFiles.isEmpty()) {
+            throw new RuntimeException("License header validation failed for the following files:\n" +
+                                       failedFiles.join("\n"))
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/agent/java/org/spongepowered/tools/agent/MixinAgent.java

@@ -78,7 +78,7 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
 
             try {
                 MixinAgent.log(Level.INFO, "Redefining class {}", className);
-                return MixinAgent.this.classTransformer.transformClassBytes(null, className, classfileBuffer);
+                return MixinAgent.this.classTransformer.transformClassBytes(null, className.replace('/', '.'), classfileBuffer);
             } catch (Throwable th) {
                 MixinAgent.log(Level.ERROR, "Error while re-transforming class {}", className, th);
                 return MixinAgent.ERROR_BYTECODE;

src/main/java/org/spongepowered/asm/mixin/FabricUtil.java

@@ -49,10 +49,20 @@ public final class FabricUtil {
      */
     public static final int COMPATIBILITY_0_14_0 = 14000; // 0.14.0+mixin.0.8.6
 
+    /**
+     * Fabric compatibility version 0.16.5
+     */
+    public static final int COMPATIBILITY_0_16_5 = 16005; // 0.16.5+mixin.0.8.7
+
+    /**
+     * Fabric compatibility version 0.17.0
+     */
+    public static final int COMPATIBILITY_0_17_0 = 17000; // 0.17.0+mixin.0.8.7
+
     /**
      * Latest compatibility version
      */
-    public static final int COMPATIBILITY_LATEST = COMPATIBILITY_0_14_0;
+    public static final int COMPATIBILITY_LATEST = COMPATIBILITY_0_17_0;
 
     public static String getModId(IMixinConfig config) {
         return getModId(config, "(unknown)");