Merge pull request #412 from MiniPlaceholders/renovate/org.spongepowered.gradle.plugin-2.x

chore(deps): update plugin spongegradle to v2.5.1

.github/workflows/build.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
 
     - name: Set up JDK 25
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v6
       with:
         java-version: 25
         distribution: 'zulu'

CHANGELOG.md

@@ -2,21 +2,34 @@
 MiniPlaceholders Changelog
 -->
 
-## 3.2.0 (unreleased)
+# 3.2.2 (unreleased)
 
 ### Features
 
-- Added support to Fabric 26.1+
-- Added Minestom support
-
 
 ### Fixes
 
 
-
 ### API Additions
 
 
+<!--                                 -->
+
+# 3.2.1 (07/09/2026)
+
+### Fixes
+
+- Fixed Fabric 26.2 support
+
+
+## 3.2.0 (27/03/2026)
+
+### Features
+
+- Added support to Fabric 26.1+
+- Added Minestom support
+- Updated to Java 25
+
 
 ## 3.1.0 (10/10/2025)
 

api/build.gradle.kts

@@ -39,9 +39,7 @@ tasks {
         val o = options as StandardJavadocDocletOptions
         o.encoding = Charsets.UTF_8.name()
         o.links(
-            "https://jd.advntr.dev/api/${libs.versions.adventure.get()}/",
-            "https://jd.advntr.dev/text-minimessage/${libs.versions.adventure.get()}/",
-            "https://javadoc.io/doc/org.jspecify/jspecify/latest/"
+            "https://jd.papermc.io/adventure/${libs.versions.adventure.get()}/",
         )
         o.tags(
             "apiNote:a:API Note:",

api/src/main/java/io/github/miniplaceholders/api/placeholder/AudiencePlaceholder.java

@@ -72,7 +72,6 @@ public record AudiencePlaceholder<A extends Audience>(
             : null;
   }
 
-  @SuppressWarnings("OverrideOnly")
   private @Nullable A forwardingFilter(final Pointered source) {
     //noinspection DataFlowIssue
     if (targetClass.isInstance(source)) {

api/src/main/java/io/github/miniplaceholders/api/placeholder/GlobalPlaceholder.java

@@ -33,7 +33,7 @@ public record GlobalPlaceholder(@TagPattern String key, String name, GlobalTagRe
     if (this == obj) {
       return true;
     }
-    if (obj instanceof GlobalPlaceholder(var oKey, var __, var ___)) {
+    if (obj instanceof GlobalPlaceholder(var oKey, var _, var _)) {
       return Objects.equals(oKey, this.key);
     }
     return false;

api/src/main/java/io/github/miniplaceholders/api/placeholder/RelationalPlaceholder.java

@@ -96,7 +96,6 @@ public record RelationalPlaceholder<A extends Audience>(
         : null;
   }
 
-  @SuppressWarnings("OverrideOnly")
   private @Nullable A forwardingFilter(final Pointered source) {
     //noinspection DataFlowIssue
     if (targetClass.isInstance(source)) {

api/src/main/java/module-info.java

@@ -7,13 +7,13 @@ import org.jspecify.annotations.NullMarked;
 open module io.github.miniplaceholders.api {
   requires io.github.miniplaceholders.connect;
 
-  requires net.kyori.adventure;
+  requires net.kyori.adventure.api;
   requires net.kyori.adventure.text.minimessage;
   requires net.kyori.adventure.text.serializer.legacy;
-  requires net.kyori.examination.api;
 
   requires static org.jetbrains.annotations;
   requires static org.jspecify;
+  requires static team.unnamed.inject;
 
   exports io.github.miniplaceholders.api;
   exports io.github.miniplaceholders.api.types;

api/src/test/java/io/github/miniplaceholders/test/MiniPlaceholdersTest.java

@@ -13,7 +13,7 @@ class MiniPlaceholdersTest implements MiniTest {
     void methodEquality(){
         Expansion.builder("equality")
             .audiencePlaceholder("audience", Tags.emptyAudienceResolver())
-            .globalPlaceholder("global", (queue, ctx) -> Tags.EMPTY_TAG)
+            .globalPlaceholder("global", (_, _) -> Tags.EMPTY_TAG)
             .build()
         .register();
 

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "2.3.20" apply false
+    kotlin("jvm") version "2.4.21" apply false
 }
 
 tasks {

common/src/main/java/io/github/miniplaceholders/common/PlaceholdersPlugin.java

@@ -10,6 +10,7 @@ import io.github.miniplaceholders.common.loader.ExpansionProviderLoader;
 import io.github.miniplaceholders.common.loader.FailedToLoadExpansion;
 import io.github.miniplaceholders.common.loader.ProviderLoadResult;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
@@ -51,11 +52,13 @@ public interface PlaceholdersPlugin {
 
     final Component expansionsInfo = loadedExpansions.stream()
         .map(this::expansionInfo)
+        // Adventure 5.x/4.x support
+        .map(ComponentLike::asComponent)
         .collect(Component.toComponent(Component.text(", ", NamedTextColor.WHITE)));
     logInfo(Component.text("Loaded expansions: ", NamedTextColor.GREEN).append(expansionsInfo));
   }
 
-  private Component expansionInfo(Expansion expansion) {
+  private ComponentLike expansionInfo(Expansion expansion) {
     final TextComponent.Builder builder = Component.text();
     builder.append(Component.text(expansion.name(), NamedTextColor.AQUA));
     final String author = expansion.author();
@@ -84,7 +87,7 @@ public interface PlaceholdersPlugin {
       );
     }
     builder.append(Component.text(']', NamedTextColor.DARK_GRAY));
-    return builder.build();
+    return builder;
   }
 
   default ProviderLoadResult tryLoad(final ExpansionProvider provider, final LoadRequirement loadRequirement) {

fabric/src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
     "fabric-api": "*",
     "java": ">=25",
     "adventure-platform-fabric": ">6.8.0",
-    "minecraft": ">=26.1",
+    "minecraft": ">=26.2",
     "fabric-permissions-api-v0": ">=0.7.0"
   }
 }

gradle.properties

@@ -1,5 +1,5 @@
 group = io.github.miniplaceholders
-version = 3.2.0
+version = 3.2.2-SNAPSHOT
 description = MiniMessage Component-based Placeholders API
 
 org.gradle.jvmargs=-Xmx2G

gradle/libs.versions.toml

@@ -5,23 +5,23 @@ metadata.format.version = "1.1"
 # Platform
 minecraft = "26.1"
 paper = "1.21.11-R0.1-SNAPSHOT"
-velocity = "3.5.0-SNAPSHOT"
-minestom = "2026.03.03-1.21.11"
-fabric-loader = "0.18.5"
-fabric-api = "0.144.3+26.1"
+velocity = "4.3.0"
+minestom = "2026.10.07-26.2"
+fabric-loader = "0.20.1"
+fabric-api = "0.145.0+26.1"
 
 # Libraries
-kotlin = "2.3.20"
-adventure = "4.26.1"
-adventureModded = "6.9.0-SNAPSHOT"
+kotlin = "2.4.21"
+adventure = "5.2.0"
+adventureModded = "7.2.0"
 desertwell = "2.0.4"
 bstats = "3.2.1"
-jspecify = "1.0.0"
+jspecify = "1.0.1"
 
 # Gradle Plugins
-runtask = "3.0.2"
+runtask = "3.1.0"
 blossom = "2.2.0"
-shadow = "9.4.0"
+shadow = "9.6.1"
 jmh = "0.7.3"
 dokka = "2.2.0"
 
@@ -49,11 +49,12 @@ plugin-runtask = { module = "xyz.jpenilla.run-velocity:xyz.jpenilla.run-velocity
 
 # Libraries
 desertwell = { group = "net.william278", name = "DesertWell", version.ref = "desertwell" }
-junit-bom = "org.junit:junit-bom:6.0.3"
+junit-bom = "org.junit:junit-bom:6.1.3"
 jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
 luckopermissionsapi = { group = "me.lucko", name = "fabric-permissions-api", version = "0.7.0" }
 unnamedinject = "team.unnamed:inject:2.0.1"
 brigadier = "com.mojang:brigadier:1.0.500"
+slf4j = "org.slf4j:slf4j-api:2.0.20"
 
 # Bstats
 bstats-core = { group = "org.bstats", name = "bstats-base", version.ref = "bstats" }
@@ -66,8 +67,8 @@ bstats-bukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "b
 # Platform Plugins
 runpaper = { id = "xyz.jpenilla.run-paper", version.ref = "runtask" }
 runvelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
-fabric-loom = { id = "net.fabricmc.fabric-loom", version = "1.15.5"}
-spongegradle = { id = "org.spongepowered.gradle.plugin", version = "2.3.0" }
+fabric-loom = { id = "net.fabricmc.fabric-loom", version = "1.18.4"}
+spongegradle = { id = "org.spongepowered.gradle.plugin", version = "2.5.1" }
 
 # General Plugins
 blossom = { id = "net.kyori.blossom", version.ref = "blossom" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -19,12 +19,39 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+@rem Catch executions from older scripts and ensure they exit cleanly.
+@rem This can be removed once we can be reasonably confident that few people
+@rem will be migrating directly to this new wrapper.
+goto afterSafetyNet
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+goto exitWithErrorLevel
+:afterSafetyNet
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -45,13 +72,14 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
 
-goto fail
+"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,35 +87,26 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
 
-goto fail
+"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
 
 :execute
 @rem Setup the command line
 
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem This label must not be changed. We rely on old scripts being able to jump to this point.
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

minestom/build.gradle.kts

@@ -4,26 +4,40 @@ plugins {
     id("miniplaceholders.shadow")
     id("miniplaceholders.auto.module")
     id("miniplaceholders.runtask")
+    `java-library`
     id("com.vanniktech.maven.publish")
 }
 
+val shadowInclude by configurations.creating
+
+configurations {
+    compileOnly.get().extendsFrom(shadowInclude)
+    testImplementation.get().extendsFrom(shadowInclude)
+}
+
 dependencies {
     compileOnly(libs.minestom)
     compileOnly(libs.adventure.api)
+    compileOnly(libs.slf4j)
     annotationProcessor(libs.minestom)
-    implementation(projects.miniplaceholdersCommon)
-    implementation(projects.miniplaceholdersApi)
-    implementation(projects.miniplaceholdersConnect)
+    shadowInclude(projects.miniplaceholdersCommon)
+    api(projects.miniplaceholdersApi)
+    shadowInclude(projects.miniplaceholdersConnect)
 
     testImplementation(libs.minestom)
     testImplementation(libs.adventure.api)
     testImplementation(libs.adventure.minimessage)
-    testImplementation("ch.qos.logback:logback-classic:1.5.32") // logger
-    testImplementation("com.google.guava:guava:33.5.0-jre")
+    testImplementation("ch.qos.logback:logback-classic:1.6.6") // logger
+    testImplementation("com.google.guava:guava:33.7.2-jre")
 }
 
-tasks.test {
-    failOnNoDiscoveredTests = false
+tasks {
+    shadowJar {
+        configurations = listOf(shadowInclude)
+    }
+    test {
+        failOnNoDiscoveredTests = false
+    }
 }
 
 mavenPublishing {

paper/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 tasks {
     runServer {
         jvmArgs("-Dcom.mojang.eula.agree=true")
-        minecraftVersion(libs.versions.minecraft.get())
+        minecraftVersion(libs.versions.paper.get().substringBefore('-'))
     }
     val projectVersion = project.version
     processResources {

settings.gradle.kts

@@ -27,8 +27,8 @@ dependencyResolutionManagement {
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
-    id("com.vanniktech.maven.publish") version "0.36.0" apply false
-    kotlin("jvm") version "2.3.20" apply false
+    id("com.vanniktech.maven.publish") version "0.37.0" apply false
+    kotlin("jvm") version "2.4.21" apply false
 }
 
 arrayOf(