Update luckperms

.github/workflows/ci.yml

@@ -23,6 +23,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -74,17 +77,15 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Retrieve saved standalone jar artifact
         uses: actions/download-artifact@v3
         with:
           name: standalone-binary
           path: standalone/docker/
 
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: standalone/docker/
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
@@ -98,13 +99,23 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Determine the LuckPerms version
+        run: |
+          echo "luckperms_version=$(git describe --tags | awk -F "-" '{print $1 "." $2}')" >> "$GITHUB_ENV"
+
       - name: Extract metadata for Docker
         id: meta
         uses: docker/metadata-action@v3
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             latest=${{ github.ref == 'refs/heads/master' }}
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=tag
+            type=ref,event=pr
+            type=raw,enable=${{ github.ref == 'refs/heads/master' }},value=${{ env.luckperms_version }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v2

.gitignore

@@ -1,3 +1,6 @@
+### LuckPerms Standalone ###
+standalone/loader/data/
+
 ### Gradle & IntelliJ ###
 .gradle/
 /.idea/

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Before reporting a bug or issue, please make sure that the issue is actually bei
 
 If you're unsure, feel free to ask using the above resources BEFORE making a report.
 
-Bugs or issues should be reported using the [GitHub Issues tab](https://github.com/lucko/LuckPerms/issues).
+Bugs or issues should be reported using the [GitHub Issues tab](https://github.com/LuckPerms/LuckPerms/issues).
 
 ### :pencil: Want to contribute code?
 #### Pull Requests

README.md

@@ -24,12 +24,12 @@ For more information, see the wiki article on [Why LuckPerms?](https://luckperms
 LuckPerms uses Gradle to handle dependencies & building.
 
 #### Requirements
-* Java 8 JDK or newer
+* Java 17 JDK or newer
 * Git
 
 #### Compiling from source
 ```sh
-git clone https://github.com/lucko/LuckPerms.git
+git clone https://github.com/LuckPerms/LuckPerms.git
 cd LuckPerms/
 ./gradlew build
 ```
@@ -56,4 +56,4 @@ The project is split up into a few separate modules.
 * **Bukkit, BungeeCord, Fabric, Forge, Nukkit, Sponge & Velocity** - Each use the common module to implement plugins on the respective server platforms.
 
 ## License
-LuckPerms is licensed under the permissive MIT license. Please see [`LICENSE.txt`](https://github.com/lucko/LuckPerms/blob/master/LICENSE.txt) for more info.
+LuckPerms is licensed under the permissive MIT license. Please see [`LICENSE.txt`](https://github.com/LuckPerms/LuckPerms/blob/master/LICENSE.txt) for more info.

build.gradle

@@ -1,7 +1,10 @@
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1' apply false
+    alias(libs.plugins.licenser) apply false
 }
 
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+
 defaultTasks 'licenseFormat', 'build'
 
 subprojects {
@@ -15,10 +18,20 @@ subprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
     }
 
+    tasks.withType(Test).configureEach {
+        testLogging {
+            events = [TestLogEvent.PASSED, TestLogEvent.FAILED, TestLogEvent.SKIPPED]
+            exceptionFormat = TestExceptionFormat.FULL
+            showExceptions = true
+            showCauses = true
+            showStackTraces = true
+        }
+    }
+
     jar {
         from '../LICENSE.txt'
     }

bukkit-legacy/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -29,7 +29,7 @@ shadowJar {
     relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore'
     relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb'
     relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql'
-    relocate 'com.impossibl', 'me.lucko.luckperms.lib.postgresql'
+    relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql'
     relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari'
     relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb'
     relocate 'org.bson', 'me.lucko.luckperms.lib.bson'

bukkit-legacy/loader/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    alias(libs.plugins.shadow)
 }
 
 repositories {

bukkit/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    alias(libs.plugins.shadow)
 }
 
 repositories {
@@ -39,7 +39,7 @@ shadowJar {
     relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore'
     relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb'
     relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql'
-    relocate 'com.impossibl', 'me.lucko.luckperms.lib.postgresql'
+    relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql'
     relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari'
     relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb'
     relocate 'org.bson', 'me.lucko.luckperms.lib.bson'

bukkit/loader/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    alias(libs.plugins.shadow)
 }
 
 repositories {

bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java

@@ -217,7 +217,7 @@ protected void setupPlatformHooks() {
          * Vault in their onEnable without depending on us.
          *
          * Noteworthy discussion here:
-         * - https://github.com/lucko/LuckPerms/issues/1959
+         * - https://github.com/LuckPerms/LuckPerms/issues/1959
          * - https://hub.spigotmc.org/jira/browse/SPIGOT-5546
          * - https://github.com/PaperMC/Paper/pull/3509
          */

bukkit/src/main/resources/config.yml

@@ -8,7 +8,7 @@
 # |                                                                                              | #
 # |  WIKI:        https://luckperms.net/wiki                                                     | #
 # |  DISCORD:     https://discord.gg/luckperms                                                   | #
-# |  BUG REPORTS: https://github.com/lucko/LuckPerms/issues                                      | #
+# |  BUG REPORTS: https://github.com/LuckPerms/LuckPerms/issues                                  | #
 # |                                                                                              | #
 # |  Each option in this file is documented and explained here:                                  | #
 # |   ==>  https://luckperms.net/wiki/Configuration                                              | #
@@ -262,6 +262,7 @@ broadcast-received-log-entries: true
 
 # Settings for Redis.
 # Port 6379 is used by default; set address to "host:port" if differs
+# Multiple Redis nodes can be specified in the same format as a string list under the name "addresses".
 redis:
   enabled: false
   address: localhost

bungee/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -31,7 +31,7 @@ shadowJar {
     relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore'
     relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb'
     relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql'
-    relocate 'com.impossibl', 'me.lucko.luckperms.lib.postgresql'
+    relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql'
     relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari'
     relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb'
     relocate 'org.bson', 'me.lucko.luckperms.lib.bson'

bungee/loader/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    alias(libs.plugins.shadow)
 }
 
 dependencies {

bungee/src/main/resources/config.yml

@@ -8,7 +8,7 @@
 # |                                                                                              | #
 # |  WIKI:        https://luckperms.net/wiki                                                     | #
 # |  DISCORD:     https://discord.gg/luckperms                                                   | #
-# |  BUG REPORTS: https://github.com/lucko/LuckPerms/issues                                      | #
+# |  BUG REPORTS: https://github.com/LuckPerms/LuckPerms/issues                                  | #
 # |                                                                                              | #
 # |  Each option in this file is documented and explained here:                                  | #
 # |   ==>  https://luckperms.net/wiki/Configuration                                              | #
@@ -260,6 +260,7 @@ broadcast-received-log-entries: false
 
 # Settings for Redis.
 # Port 6379 is used by default; set address to "host:port" if differs
+# Multiple Redis nodes can be specified in the same format as a string list under the name "addresses".
 redis:
   enabled: false
   address: localhost

common/build.gradle

@@ -1,11 +1,16 @@
 plugins {
-    id 'java-library'
+    id("java-library")
+    id("jacoco")
 }
 
 test {
     useJUnitPlatform {}
 }
 
+jacocoTestReport {
+    dependsOn test
+}
+
 dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
@@ -45,6 +50,11 @@ dependencies {
         exclude(module: 'adventure-api')
     }
 
+    api("net.kyori:adventure-text-minimessage:4.11.0") {
+        exclude(module: 'adventure-bom')
+        exclude(module: 'adventure-api')
+    }
+
     api('net.kyori:event-api:3.0.0') {
         exclude(module: 'checker-qual')
         exclude(module: 'guava')
@@ -74,10 +84,10 @@ dependencies {
         transitive = false
     }
     compileOnly 'com.zaxxer:HikariCP:4.0.3'
-    compileOnly 'redis.clients:jedis:3.5.2'
+    compileOnly 'redis.clients:jedis:4.4.3'
     compileOnly 'io.nats:jnats:2.16.4'
     compileOnly 'com.rabbitmq:amqp-client:5.12.0'
     compileOnly 'org.mongodb:mongodb-driver-legacy:4.5.0'
-    compileOnly 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.8.9'
+    compileOnly 'org.postgresql:postgresql:42.6.0'
     compileOnly 'org.yaml:snakeyaml:1.28'
 }

common/src/main/java/me/lucko/luckperms/common/cache/BufferedRequest.java

@@ -86,6 +86,17 @@ public CompletableFuture<T> request() {
         }
     }
 
+    /**
+     * Gets if the request buffer has been enqueued
+     *
+     * @return if the buffer is enqueued
+     */
+    public boolean isEnqueued() {
+        synchronized (this.mutex) {
+            return this.processor != null;
+        }
+    }
+
     /**
      * Requests the value, bypassing the buffer
      *

common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderEditor.java

@@ -84,7 +84,7 @@ public void execute(LuckPermsPlugin plugin, Sender sender, T target, ArgumentLis
 
         Message.EDITOR_START.send(sender);
 
-        WebEditorSession.createAndOpen(holders, Collections.emptyList(), sender, label, plugin);
+        WebEditorSession.create(holders, Collections.emptyList(), sender, label, plugin).open();
     }
 
 }

common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java

@@ -107,7 +107,7 @@ public void execute(LuckPermsPlugin plugin, Sender sender, ArgumentList args, St
 
         Message.EDITOR_START.send(sender);
 
-        WebEditorSession.createAndOpen(holders, tracks, sender, label, plugin);
+        WebEditorSession.create(holders, tracks, sender, label, plugin).open();
     }
 
     private enum Type {

common/src/main/java/me/lucko/luckperms/common/commands/track/TrackEditor.java

@@ -97,7 +97,7 @@ public void execute(LuckPermsPlugin plugin, Sender sender, Track target, Argumen
 
         Message.EDITOR_START.send(sender);
 
-        WebEditorSession.createAndOpen(holders, Collections.singletonList(target), sender, label, plugin);
+        WebEditorSession.create(holders, Collections.singletonList(target), sender, label, plugin).open();
     }
 
 }

common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java

@@ -73,6 +73,7 @@
 import static me.lucko.luckperms.common.config.generic.key.ConfigKeyFactory.mapKey;
 import static me.lucko.luckperms.common.config.generic.key.ConfigKeyFactory.notReloadable;
 import static me.lucko.luckperms.common.config.generic.key.ConfigKeyFactory.stringKey;
+import static me.lucko.luckperms.common.config.generic.key.ConfigKeyFactory.stringListKey;
 
 /**
  * All of the {@link ConfigKey}s used by LuckPerms.
@@ -639,6 +640,11 @@ private ConfigKeys() {}
      */
     public static final ConfigKey<String> REDIS_ADDRESS = notReloadable(stringKey("redis.address", null));
 
+    /**
+     * The addresses of the redis servers (only for redis clusters)
+     */
+    public static final ConfigKey<List<String>> REDIS_ADDRESSES = notReloadable(stringListKey("redis.addresses", ImmutableList.of()));
+
     /**
      * The username to connect with, or an empty string if it should use default
      */
@@ -719,6 +725,11 @@ private ConfigKeys() {}
      */
     public static final ConfigKey<String> BYTESOCKS_HOST = stringKey("bytesocks-host", "usersockets.luckperms.net");
 
+    /**
+     * If TLS (https/wss) should be used when connecting to bytesocks
+     */
+    public static final ConfigKey<Boolean> BYTESOCKS_USE_TLS = booleanKey("bytesocks-use-tls", true);
+
     /**
      * The URL of the web editor
      */

common/src/main/java/me/lucko/luckperms/common/config/generic/key/ConfigKeyFactory.java

@@ -28,6 +28,7 @@
 import com.google.common.collect.ImmutableMap;
 import me.lucko.luckperms.common.config.generic.adapter.ConfigurationAdapter;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
@@ -36,6 +37,7 @@ public interface ConfigKeyFactory<T> {
 
     ConfigKeyFactory<Boolean> BOOLEAN = ConfigurationAdapter::getBoolean;
     ConfigKeyFactory<String> STRING = ConfigurationAdapter::getString;
+    ConfigKeyFactory<List<String>> STRING_LIST = ConfigurationAdapter::getStringList;
     ConfigKeyFactory<String> LOWERCASE_STRING = (adapter, path, def) -> adapter.getString(path, def).toLowerCase(Locale.ROOT);
     ConfigKeyFactory<Map<String, String>> STRING_MAP = (config, path, def) -> ImmutableMap.copyOf(config.getStringMap(path, ImmutableMap.of()));
 
@@ -56,6 +58,10 @@ static SimpleConfigKey<String> stringKey(String path, String def) {
         return key(new Bound<>(STRING, path, def));
     }
 
+    static SimpleConfigKey<List<String>> stringListKey(String path, List<String> def) {
+        return key(new Bound<>(STRING_LIST, path, def));
+    }
+
     static SimpleConfigKey<String> lowercaseStringKey(String path, String def) {
         return key(new Bound<>(LOWERCASE_STRING, path, def));
     }