release: Version 2.2.2

chore(deps): update plugin org.jetbrains.kotlin.jvm to v1.9.20

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 17
       uses: actions/setup-java@v3

README.md

@@ -5,15 +5,14 @@
 ![Modrinth Downloads](https://img.shields.io/modrinth/dt/HQyibRsN?logo=Modrinth&style=flat-square)
 ![GitHub Downloads](https://img.shields.io/github/downloads/MiniPlaceholders/MiniPlaceholders/total?logo=GitHub&style=flat-square)
 
-MiniMessage Component-based Placeholders for PaperMC, Folia, Fabric, Sponge, Krypton and Velocity platforms
+MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms
 
 ## Compatibility
 - Paper 1.19.3, 1.19.4+
-- Folia 1.19.4
+- Folia 1.19.4+
 - Velocity 3.1.2+
 - Fabric 1.19.4+
-- Sponge API 8, 9, 10
-- Krypton
+- Sponge API 8+
 
 ## Commands
 

build-logic/settings.gradle.kts

@@ -15,5 +15,5 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }

build.gradle.kts

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

common/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("miniplaceholders.auto.module")
+    alias(libs.plugins.idea.ext)
     alias(libs.plugins.blossom)
 }
 
@@ -16,7 +17,12 @@ dependencies {
     compileOnly(libs.adventure.minimesssage)
 }
 
-blossom {
-    replaceToken("{version}", project.version)
-    replaceTokenIn("src/main/java/io/github/miniplaceholders/common/PluginConstants.java")
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+            }
+        }
+    }
 }

common/src/main/java-templates/io/github/miniplaceholders/common/PluginConstants.java.peb

@@ -0,0 +1,7 @@
+package io.github.miniplaceholders.common;
+
+public final class PluginConstants {
+    public static final String VERSION = "{{ version }}";
+
+    private PluginConstants() {}
+}

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

@@ -1,7 +0,0 @@
-package io.github.miniplaceholders.common;
-
-public final class PluginConstants {
-    public static final String VERSION = "{version}";
-
-    private PluginConstants(){}
-}

fabric/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     modImplementation(libs.fabric.api)
 
     includeDependency(libs.adventure.platform.fabric)
+    includeDependency(libs.adventure.serializer.legacy)
     includeDependency(libs.luckopermissionsapi)
     includeDependency(libs.cloud.fabric)
     includeDependency(libs.cloud.core)

fabric/src/main/java/io/github/miniplaceholders/fabric/TickManager.java

@@ -8,7 +8,7 @@ import java.math.RoundingMode;
 final class TickManager {
     private static final int TICK_DURATION = 20;
 
-    private static final BigDecimal TPS_BASE = new BigDecimal(1E9).multiply(new BigDecimal(TICK_DURATION));
+    private static final BigDecimal TPS_BASE = new BigDecimal("1E9").multiply(new BigDecimal(TICK_DURATION));
 
     private final RollingAverage tps1m = new RollingAverage(60);
     private final RollingAverage tps5m = new RollingAverage(60 * 5);

gradle.properties

@@ -1,5 +1,5 @@
 group = io.github.miniplaceholders
-version = 2.2.1
-description = MiniMessage Component-based Placeholders for Paper, Folia, Fabric, Sponge, velocity and Krypton platforms
+version = 2.2.2
+description = MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms
 
 org.gradle.jvmargs=-Xmx2G

gradle/libs.versions.toml

@@ -3,27 +3,27 @@ metadata.format.version = "1.1"
 [versions]
 
 velocity = "3.2.0-SNAPSHOT"
-paper = "1.20.1-R0.1-SNAPSHOT"
+paper = "1.20.2-R0.1-SNAPSHOT"
 krypton = "7796647145"
-minecraft = "1.20.1"
+minecraft = "1.20.2"
 
-runtask = "2.1.0"
+runtask = "2.2.0"
 pluginyml = "0.6.0"
-userdev = "1.5.5"
-blossom = "1.3.1"
-indra = "3.1.2"
+userdev = "1.5.9"
+blossom = "2.1.0"
+indra = "3.1.3"
 shadow = "8.1.1"
-jmh = "0.7.1"
-dokka = "1.8.20"
+jmh = "0.7.2"
+dokka = "1.9.10"
 
-cloud = "1.8.3"
+cloud = "1.8.4"
 adventure = "4.14.0"
-adventurefabric = "5.9.0"
+adventurefabric = "5.10.0"
 brigadier = "1.0.500"
-kotlin="1.9.0"
+kotlin="1.9.20"
 
-fabric-api = "0.86.0+1.20.1"
-fabric-loader = "0.14.21"
+fabric-api = "0.90.1+1.20.3"
+fabric-loader = "0.14.24"
 
 desertwell = "2.0.4"
 
@@ -60,11 +60,11 @@ plugin-shadow = { group = "com.github.johnrengelman", name = "shadow", version.r
 plugin-kotlin =  { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-indra-common = { module = "net.kyori:indra-common", version.ref = "indra" }
 plugin-indra-spotless = { module = "net.kyori:indra-licenser-spotless", version.ref = "indra" }
-plugin-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.8.20"
+plugin-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
 
 desertwell = { group = "net.william278", name = "DesertWell", version.ref = "desertwell" }
 
-junit-bom = "org.junit:junit-bom:5.9.3"
+junit-bom = "org.junit:junit-bom:5.10.0"
 
 [plugins]
 
@@ -76,3 +76,4 @@ blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 jmh = { id = "me.champeau.jmh", version.ref = "jmh" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

paper/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
 
 tasks {
     runServer {
-        minecraftVersion("1.20.1")
+        minecraftVersion("1.20.2")
     }
     processResources {
         filesMatching("paper-plugin.yml") {

settings.gradle.kts

@@ -30,9 +30,9 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("fabric-loom") version "1.3.8"
-    id("org.spongepowered.gradle.plugin") version "2.1.1"
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("fabric-loom") version "1.4.4"
+    id("org.spongepowered.gradle.plugin") version "2.2.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
 
 arrayOf(