Merge remote-tracking branch 'upstream/master' into claude/titan-minestom-deployment-XhoNO

# Conflicts:
#	.github/workflows/ci.yml
#	api/src/main/java/net/luckperms/api/platform/Platform.java
#	build.gradle

Author: claude

.github/workflows/ci.yml

@@ -28,15 +28,13 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: |
-            25
-            21
+          java-version: '25'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
       - name: Run build and tests with Gradle wrapper
-        run: ./gradlew test build publish cyclonedxBom -PdockerTests -Dorg.gradle.java.installations.fromEnv=JAVA_HOME_25_X64
+        run: ./gradlew test build publish cyclonedxBom -PdockerTests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

api/build.gradle

@@ -1,7 +1,8 @@
 group = 'net.luckperms'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+tasks.withType(JavaCompile).configureEach {
+    options.release = 8
+}
 
 jar {
     manifest {

api/src/main/java/net/luckperms/api/platform/Platform.java

@@ -79,7 +79,8 @@ enum Type {
         NEOFORGE("NeoForge"),
         FORGE("Forge"),
         MINESTOM("Minestom"),
-        STANDALONE("Standalone");
+        STANDALONE("Standalone"),
+        HYTALE("Hytale");
 
         private final String friendlyName;
 

build.gradle

@@ -1,26 +1,23 @@
 plugins {
     alias(libs.plugins.licenser) apply false
     id 'org.cyclonedx.bom' version '3.0.1'
+    alias(libs.plugins.loom) apply false
 }
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
-defaultTasks 'licenseFormat', 'build'
-
 subprojects {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-    apply plugin: 'org.cadixdev.licenser'
+    apply plugin: 'dev.yumi.gradle.licenser'
 
     group = 'me.lucko.luckperms'
     version = '5.6-SNAPSHOT'
 
-    sourceCompatibility = 11
-    targetCompatibility = 11
-
     tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
+        options.release = 11
     }
 
     tasks.withType(Test).configureEach {
@@ -38,18 +35,11 @@ subprojects {
     }
 
     def determinePatchVersion = {
-        // get the name of the last tag
-        def tagInfo = new ByteArrayOutputStream()
-        exec {
+        def tagInfo = providers.exec {
             commandLine 'git', 'describe', '--tags'
-            standardOutput = tagInfo
-        }
-        tagInfo = tagInfo.toString()
+        }.standardOutput.asText.get().trim()
 
-        if (!tagInfo.contains('-')) {
-            return 0
-        }
-        return tagInfo.split("-")[1]
+        return tagInfo.contains('-') ? tagInfo.split('-')[1] : 0
     }
 
     project.ext.majorVersion = '5'
@@ -59,9 +49,8 @@ subprojects {
     project.ext.fullVersion = project.ext.apiVersion + '.' + project.ext.patchVersion
 
     license {
-        header = rootProject.file('HEADER.txt')
-        include '**/*.java'
-        newLine = true
+        rule(rootProject.file("HEADER.txt"))
+        exclude '*.xml'
     }
 
     repositories {

bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/BukkitCalculatorFactory.java

@@ -30,17 +30,20 @@
 import me.lucko.luckperms.common.cacheddata.CacheMetadata;
 import me.lucko.luckperms.common.calculator.CalculatorFactory;
 import me.lucko.luckperms.common.calculator.PermissionCalculator;
+import me.lucko.luckperms.common.calculator.PermissionCalculatorMonitored;
 import me.lucko.luckperms.common.calculator.processor.DirectProcessor;
 import me.lucko.luckperms.common.calculator.processor.PermissionProcessor;
 import me.lucko.luckperms.common.calculator.processor.RegexProcessor;
 import me.lucko.luckperms.common.calculator.processor.SpongeWildcardProcessor;
 import me.lucko.luckperms.common.calculator.processor.WildcardProcessor;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.model.HolderType;
+import net.luckperms.api.node.Node;
 import net.luckperms.api.query.QueryOptions;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class BukkitCalculatorFactory implements CalculatorFactory {
     private final LPBukkitPlugin plugin;
@@ -50,25 +53,25 @@ public BukkitCalculatorFactory(LPBukkitPlugin plugin) {
     }
 
     @Override
-    public PermissionCalculator build(QueryOptions queryOptions, CacheMetadata metadata) {
+    public PermissionCalculator build(QueryOptions queryOptions, Map<String, Node> sourceMap, CacheMetadata metadata) {
         List<PermissionProcessor> processors = new ArrayList<>(8);
 
-        processors.add(new DirectProcessor());
+        processors.add(new DirectProcessor(sourceMap));
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLY_BUKKIT_CHILD_PERMISSIONS)) {
-            processors.add(new ChildProcessor(this.plugin));
+            processors.add(new ChildProcessor(this.plugin, sourceMap));
         }
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLYING_REGEX)) {
-            processors.add(new RegexProcessor());
+            processors.add(new RegexProcessor(sourceMap));
         }
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLYING_WILDCARDS)) {
-            processors.add(new WildcardProcessor());
+            processors.add(new WildcardProcessor(sourceMap));
         }
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLYING_WILDCARDS_SPONGE)) {
-            processors.add(new SpongeWildcardProcessor());
+            processors.add(new SpongeWildcardProcessor(sourceMap));
         }
 
         boolean op = queryOptions.option(BukkitContextManager.OP_OPTION).orElse(false);
@@ -82,6 +85,6 @@ public PermissionCalculator build(QueryOptions queryOptions, CacheMetadata metad
             processors.add(OpProcessor.INSTANCE);
         }
 
-        return new PermissionCalculator(this.plugin, metadata, processors);
+        return new PermissionCalculatorMonitored(this.plugin, metadata, processors);
     }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/calculator/ChildProcessor.java

@@ -26,28 +26,37 @@
 package me.lucko.luckperms.bukkit.calculator;
 
 import me.lucko.luckperms.bukkit.LPBukkitPlugin;
+import me.lucko.luckperms.bukkit.inject.server.LuckPermsPermissionMap;
 import me.lucko.luckperms.common.cacheddata.result.TristateResult;
-import me.lucko.luckperms.common.calculator.processor.AbstractSourceBasedProcessor;
+import me.lucko.luckperms.common.calculator.processor.AbstractPermissionProcessor;
 import me.lucko.luckperms.common.calculator.processor.PermissionProcessor;
+import net.luckperms.api.node.Node;
 import net.luckperms.api.util.Tristate;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Permission Processor for Bukkits "child" permission system.
  */
-public class ChildProcessor extends AbstractSourceBasedProcessor implements PermissionProcessor {
+public class ChildProcessor extends AbstractPermissionProcessor implements PermissionProcessor {
     private static final TristateResult.Factory RESULT_FACTORY = new TristateResult.Factory(ChildProcessor.class);
 
     private final LPBukkitPlugin plugin;
+    private final Map<String, Node> sourceMap;
+
     private final AtomicBoolean needsRefresh = new AtomicBoolean(false);
-    private Map<String, TristateResult> childPermissions = Collections.emptyMap();
+    private Map<String, TristateResult> childPermissions;
 
-    public ChildProcessor(LPBukkitPlugin plugin) {
+    public ChildProcessor(LPBukkitPlugin plugin, Map<String, Node> sourceMap) {
         this.plugin = plugin;
+        this.sourceMap = sourceMap;
+        refresh();
+    }
+
+    private void refresh() {
+        this.childPermissions = processChildPermissions(this.sourceMap, this.plugin.getPermissionMap());
     }
 
     @Override
@@ -59,20 +68,18 @@ public TristateResult hasPermission(String permission) {
     }
 
     @Override
-    public void refresh() {
+    public void invalidate() {
+        this.needsRefresh.set(true);
+    }
+
+    private static Map<String, TristateResult> processChildPermissions(Map<String, Node> sourceMap, LuckPermsPermissionMap permissionMap) {
         Map<String, TristateResult> childPermissions = new HashMap<>();
-        this.sourceMap.forEach((key, node) -> {
-            Map<String, Boolean> children = this.plugin.getPermissionMap().getChildPermissions(key, node.getValue());
+        sourceMap.forEach((key, node) -> {
+            Map<String, Boolean> children = permissionMap.getChildPermissions(key, node.getValue());
             children.forEach((childKey, childValue) -> {
                 childPermissions.put(childKey, RESULT_FACTORY.resultWithOverride(node, Tristate.of(childValue)));
             });
         });
-        this.childPermissions = childPermissions;
-        this.needsRefresh.set(false);
-    }
-
-    @Override
-    public void invalidate() {
-        this.needsRefresh.set(true);
+        return childPermissions;
     }
 }

bukkit/src/main/resources/config.yml

@@ -268,6 +268,16 @@ redis:
   address: localhost
   username: ''
   password: ''
+  # Settings for Redis Sentinel.
+  # Sentinel provides high availability for Redis by monitoring master/replica instances.
+  # Port 26379 is used by default for sentinel nodes.
+  sentinel:
+    enabled: false
+    master: mymaster
+    addresses:
+      - localhost:26379
+    username: ''
+    password: ''
 
 # Settings for Nats.
 # Port 4222 is used by default; set address to "host:port" if differs
@@ -276,6 +286,7 @@ nats:
   address: localhost
   username: ''
   password: ''
+  token: ''
 
 # Settings for RabbitMQ.
 # Port 5672 is used by default; set address to "host:port" if differs

bukkit/src/main/resources/luckperms.commodore

@@ -543,7 +543,9 @@ luckperms {
 
       editor;
       listmembers {
-        page brigadier:integer;
+        page brigadier:integer {
+          context brigadier:string greedy_phrase;
+        }
       }
       setweight {
         weight brigadier:integer;

bungee/src/main/java/me/lucko/luckperms/bungee/calculator/BungeeCalculatorFactory.java

@@ -29,16 +29,19 @@
 import me.lucko.luckperms.common.cacheddata.CacheMetadata;
 import me.lucko.luckperms.common.calculator.CalculatorFactory;
 import me.lucko.luckperms.common.calculator.PermissionCalculator;
+import me.lucko.luckperms.common.calculator.PermissionCalculatorMonitored;
 import me.lucko.luckperms.common.calculator.processor.DirectProcessor;
 import me.lucko.luckperms.common.calculator.processor.PermissionProcessor;
 import me.lucko.luckperms.common.calculator.processor.RegexProcessor;
 import me.lucko.luckperms.common.calculator.processor.SpongeWildcardProcessor;
 import me.lucko.luckperms.common.calculator.processor.WildcardProcessor;
 import me.lucko.luckperms.common.config.ConfigKeys;
+import net.luckperms.api.node.Node;
 import net.luckperms.api.query.QueryOptions;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class BungeeCalculatorFactory implements CalculatorFactory {
     private final LPBungeePlugin plugin;
@@ -48,23 +51,23 @@ public BungeeCalculatorFactory(LPBungeePlugin plugin) {
     }
 
     @Override
-    public PermissionCalculator build(QueryOptions queryOptions, CacheMetadata metadata) {
+    public PermissionCalculator build(QueryOptions queryOptions, Map<String, Node> sourceMap, CacheMetadata metadata) {
         List<PermissionProcessor> processors = new ArrayList<>(4);
 
-        processors.add(new DirectProcessor());
+        processors.add(new DirectProcessor(sourceMap));
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLYING_REGEX)) {
-            processors.add(new RegexProcessor());
+            processors.add(new RegexProcessor(sourceMap));
         }
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLYING_WILDCARDS)) {
-            processors.add(new WildcardProcessor());
+            processors.add(new WildcardProcessor(sourceMap));
         }
 
         if (this.plugin.getConfiguration().get(ConfigKeys.APPLYING_WILDCARDS_SPONGE)) {
-            processors.add(new SpongeWildcardProcessor());
+            processors.add(new SpongeWildcardProcessor(sourceMap));
         }
 
-        return new PermissionCalculator(this.plugin, metadata, processors);
+        return new PermissionCalculatorMonitored(this.plugin, metadata, processors);
     }
 }

bungee/src/main/resources/config.yml

@@ -266,6 +266,16 @@ redis:
   address: localhost
   username: ''
   password: ''
+  # Settings for Redis Sentinel.
+  # Sentinel provides high availability for Redis by monitoring master/replica instances.
+  # Port 26379 is used by default for sentinel nodes.
+  sentinel:
+    enabled: false
+    master: mymaster
+    addresses:
+      - localhost:26379
+    username: ''
+    password: ''
 
 # Settings for Nats.
 # Port 4222 is used by default; set address to "host:port" if differs
@@ -274,6 +284,7 @@ nats:
   address: localhost
   username: ''
   password: ''
+  token: ''
 
 # Settings for RabbitMQ.
 # Port 5672 is used by default; set address to "host:port" if differs