Fixed MiniPlaceholders 3.x support

.github/workflows/build.yml

@@ -8,54 +8,54 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ "17" ]
+        java: [ "21" ]
         os: [ "ubuntu-latest" ]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup java"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: gradle build
         run: ./gradlew clean build
 
       # Upload Artifacts
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: message
           path: build/libs
           retention-days: 60
   publish:
     strategy:
       matrix:
-        java: [ "17" ]
+        java: [ "21" ]
         os: [ "ubuntu-latest" ]
 
     needs: build
     runs-on: ${{ matrix.os }}
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup java"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: gradle publish
         run: ./gradlew build publish publishAllPublicationsToHangar

.github/workflows/pr_build.yml

@@ -7,24 +7,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup jdk"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
-          java-version: 17
-          distribution: 'adopt'
+          java-version: 21
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: "build with gradle"
         run: ./gradlew clean build
 
       # Upload Artifacts
       - name: "upload artifacts"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: message-pr-${{ github.event.pullrequest.number }}
           path: build/libs

.github/workflows/release.yml

@@ -8,26 +8,26 @@ jobs:
   release:
     strategy:
       matrix:
-        java: [ "17" ]
+        java: [ "21" ]
         os: [ "ubuntu-latest" ]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup jdk ${{ matrix.java }}"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: "setup gradle"
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: "gradle build and publish"
         run: ./gradlew clean build publish publishAllPublicationsToHangar
@@ -39,15 +39,15 @@ jobs:
           HANGAR_API_KEY: ${{ SECRETS.HANGAR_API_KEY }}
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: message
           path: build/libs/*.jar
           retention-days: 365
 
       # Release Artifacts
       - name: release artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.event.release.tag_name }}
           files: build/libs/*.jar

build.gradle.kts

@@ -1,26 +1,26 @@
 import io.papermc.hangarpublishplugin.model.Platforms
 import java.io.*
+import java.util.Date
 
 plugins {
     java
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "9.2.2"
     `maven-publish`
-    id("xyz.jpenilla.run-velocity") version "2.0.0"
+    id("xyz.jpenilla.run-velocity") version "3.0.2"
     id("io.papermc.hangar-publish-plugin") version "0.0.4"
 }
 
 repositories {
-    mavenCentral()
     maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
-    implementation("org.bstats:bstats-velocity:3.0.1")
-    implementation("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
-    implementation("cloud.commandframework:cloud-velocity:1.8.2")
-    implementation("cloud.commandframework:cloud-minecraft-extras:1.8.2")
-    compileOnly("net.luckperms:api:5.4")
-    compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.0.0")
+    implementation("org.bstats:bstats-velocity:3.1.0")
+    implementation("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
+    implementation("org.incendo:cloud-velocity:2.0.0-SNAPSHOT") {}
+    implementation("org.incendo:cloud-minecraft-extras:2.0.0-SNAPSHOT")
+    compileOnly("net.luckperms:api:5.5")
+    compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.1.0")
 }
 
 fun runCommand(command: String): String {
@@ -48,38 +48,56 @@ if (!release) {
 
 
 tasks {
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(21)
+    }
+
     processResources {
         expand("project" to project)
     }
 
     shadowJar {
         dependencies {
             include {
-                it.moduleGroup == "org.bstats" || it.moduleGroup == "cloud.commandframework" || it.moduleGroup == "io.leangen.geantyref"
+                it.moduleGroup == "org.bstats" || it.moduleGroup == "org.incendo" || it.moduleGroup == "io.leangen.geantyref"
+            }
+            exclude{
+                it.moduleGroup == "io.leangen.geantyref"
             }
         }
         relocate("org.bstats", "com.oskarsmc.message.relocated.bstats")
-        relocate("cloud.commandframework", "com.oskarsmc.message.relocated.cloud")
-        relocate("io.leangen.geantyref", "com.oskarsmc.message.relocated.geantyref")
+        relocate("org.incendo", "com.oskarsmc.message.relocated.incendo")
+        //relocate("io.leangen.geantyref", "com.oskarsmc.message.relocated.geantyref")
     }
 
     build {
-        dependsOn(named("shadowJar"))
+        dependsOn(shadowJar)
     }
 
     runVelocity {
         // Configure the Velocity version for our task.
         // This is the only required configuration besides applying the plugin.
         // Your plugin's jar (or shadowJar if present) will be used automatically.
-        velocityVersion("3.1.2-SNAPSHOT")
+        velocityVersion("3.4.0-SNAPSHOT")
+    }
+
+    jar {
+        manifest {
+            attributes(
+                "Implementation-Title" to "message",
+                "Implementation-Version" to project.version,
+                "Implementation-Build-Date" to Date(),
+                "Implementation-Vendor" to "OskarsMC"
+            )
+        }
     }
 }
 
-val jar by tasks.getting(Jar::class) {
-    manifest {
-        attributes["Implementation-Title"] = "message"
-        attributes["Implementation-Version"] = project.version
-        attributes["Implementation-Vendor"] = "OskarsMC"
+java {
+    toolchain{
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 
@@ -120,7 +138,7 @@ hangarPublish {
             platforms {
                 register(Platforms.VELOCITY) {
                     jar.set(tasks.shadowJar.flatMap { it.archiveFile })
-                    platformVersions.set(listOf("3.2"))
+                    platformVersions.set(listOf("3.4"))
                 }
             }
         }
@@ -137,7 +155,7 @@ hangarPublish {
             platforms {
                 register(Platforms.VELOCITY) {
                     jar.set(tasks.shadowJar.flatMap { it.archiveFile })
-                    platformVersions.set(listOf("3.2"))
+                    platformVersions.set(listOf("3.4"))
                 }
             }
         }

docs/TECHNICAL.md

@@ -11,9 +11,9 @@
 
 ## Java
 
-Recommended Version: 17
+Recommended Version: 21
 
-Tested Versions: 16, 17
+Tested Versions: 21, 25
 
 ## API
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists