Merge branch 'WiIIiam278:master' into master

Author: Prince527GitHub

.github/workflows/ci.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - name: 'Checkout for CI 🛎️'
         uses: actions/checkout@v4
-      - name: 'Set up JDK 17 📦'
+      - name: 'Set up JDK 21 📦'
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v3
@@ -128,4 +128,8 @@ jobs:
             1.21.3
             1.21.4
             1.21.5
-          java: 17
+            1.21.6
+            1.21.7
+            1.21.8
+            1.21.9
+          java: 21

.github/workflows/pr_tests.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: 'Checkout for CI 🛎'
         uses: actions/checkout@v4
-      - name: 'Set up JDK 17 📦'
+      - name: 'Set up JDK 21 📦'
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v3

.github/workflows/release.yml

@@ -15,10 +15,10 @@ jobs:
     steps:
       - name: 'Checkout for CI 🛎️'
         uses: actions/checkout@v4
-      - name: 'Set up JDK 17 📦'
+      - name: 'Set up JDK 21 📦'
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v3
@@ -117,4 +117,8 @@ jobs:
             1.21.3
             1.21.4
             1.21.5
-          java: 17
+            1.21.6
+            1.21.7
+            1.21.8
+            1.21.9
+          java: 21

.github/workflows/update_docs.yml

@@ -20,6 +20,6 @@ jobs:
       - name: 'Checkout for CI 🛎️'
         uses: actions/checkout@v4
       - name: 'Push Docs to Github Wiki 📄️'
-        uses: Andrew-Chen-Wang/github-wiki-action@v4
+        uses: Andrew-Chen-Wang/github-wiki-action@v5
         with:
           path: 'docs'

build.gradle

@@ -2,9 +2,9 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
     id 'xyz.jpenilla.run-velocity' version '2.3.1'
-    id 'com.gradleup.shadow' version '8.3.6'
+    id 'com.gradleup.shadow' version '8.3.8'
     id 'org.cadixdev.licenser' version '0.6.1'
-    id 'org.ajoberstar.grgit' version '5.3.0'
+    id 'org.ajoberstar.grgit' version '5.3.2'
     id 'maven-publish'
     id 'java'
 }
@@ -25,10 +25,10 @@ ext {
 
 repositories {
     mavenCentral()
+    maven { url = 'https://repo.papermc.io/repository/maven-public/' }
     maven { url = 'https://repo.william278.net/velocity/' }
     maven { url = 'https://repo.william278.net/releases/' }
     maven { url = 'https://repo.william278.net/snapshots/' }
-    maven { url = 'https://repo.papermc.io/repository/maven-public/' }
     maven { url = 'https://repo.minebench.de/' }
     maven { url = 'https://jitpack.io' }
 }
@@ -41,9 +41,9 @@ dependencies {
     compileOnly 'io.netty:netty-codec-http:4.2.2.Final'
     compileOnly 'org.projectlombok:lombok:1.18.38'
     compileOnly 'net.luckperms:api:5.5'
-    compileOnly 'io.github.miniplaceholders:miniplaceholders-api:2.2.3'
-    compileOnly 'it.unimi.dsi:fastutil:8.5.15'
-    compileOnly 'net.kyori:adventure-nbt:4.21.0'
+    compileOnly 'io.github.miniplaceholders:miniplaceholders-api:3.0.1'
+    compileOnly 'it.unimi.dsi:fastutil:8.5.16'
+    compileOnly 'net.kyori:adventure-nbt:4.23.0'
 
     implementation 'org.apache.commons:commons-text:1.13.1'
     implementation 'net.william278:desertwell:2.0.4'
@@ -52,17 +52,25 @@ dependencies {
     implementation 'de.exlll:configlib-yaml:4.6.1'
     implementation 'org.mvel:mvel2:2.5.2.Final'
     implementation 'net.jodah:expiringmap:0.5.11'
-    implementation 'net.william278.toilet:toilet-velocity:1.0.12'
+    implementation 'net.william278.toilet:toilet-velocity:1.0.14'
 
     annotationProcessor 'org.projectlombok:lombok:1.18.38'
 }
 
 processResources {
-    def tokenMap = rootProject.ext.properties
-    tokenMap.merge("grgit",'',(s, s2) -> s)
+    def tokenMap = [:]
+    rootProject.ext.properties.each { key, value ->
+        if (value != null) {
+            tokenMap[key] = value.toString()
+        }
+    }
+
     filesMatching(['**/*.json', '**/*.yml']) {
-        filter ReplaceTokens as Class, beginToken: '${', endToken: '}',
-                tokens: tokenMap
+        filter(ReplaceTokens,
+                'beginToken': '${',
+                'endToken'  : '}',
+                'tokens'    : tokenMap
+        )
     }
 }
 
@@ -169,7 +177,7 @@ tasks {
 
         downloadPlugins {
 //            github ("WiIIiam278", "PAPIProxyBridge", "1.7.1", "PAPIProxyBridge-Velocity-1.7.1.jar")
-            modrinth ("miniplaceholders", "2.2.4")
+            modrinth ("miniplaceholders", "3.0.1")
         }
     }
 }

docs/Conditional-Placeholders.md

@@ -1,8 +1,6 @@
 Conditional placeholders allow you to display different values based on certain conditions. The format
 is `<velocitab_condition|<condition>|<true>|<false>>` and the relational format is `<velocitab_rel_condition|<condition>|<true>|<false>>`.
 
-Currently, this system is only available for the `format` and `nametag` fields in the tab groups configuration.
-
 **Note:** The difference between the two is that relational placeholders are evaluated from the viewer's perspective, while the conditional placeholders are evaluated from the player's perspective.
 So if you have 200 players, if you use a conditional placeholder, the placeholder will be evaluated 200 times, while if you use a relational placeholder, it will be evaluated 200*200 = 40000 times.
 Using relational placeholders could be really slow, so it is recommended to not use them unless you need them.

docs/Placeholders-Replacements.md

@@ -9,6 +9,7 @@ You can specify a list of replacements for a placeholder, and the replacements w
 
 The replacements are specified as a list of objects with two properties: `placeholder` and `replacement`.
 `placeholder` is the placeholder to replace, and `replacement` is the replacement text.
+To retrieve a placeholder's original value during replacement, simply use `%placeholder_value%`.
 
 ### Example section
 ```yaml
@@ -36,6 +37,18 @@ placeholder_replacements:
       replacement: <aqua>River</aqua>
 ```
 
+## Example for the server placeholder
+```yaml
+  placeholder_replacements:
+    '%server%':
+    - placeholder: spawn
+      replacement: <bold><#ff8080>Spawn
+    - placeholder: realms
+      replacement: <bold><#ff0000>Realms
+    - placeholder: dungeons
+      replacement: <bold><#00ff00>Dungeons
+```
+
 ## Specified cases
 
 ### Vanish status
@@ -85,4 +98,4 @@ placeholder_replacements:
   '%huskhomes_homes_count%':
     - placeholder: '%huskhomes_homes_count%'
       replacement: ''
-```
+```