fix consolable commands only support for global permission

Author: code-lime

src/main/java/org/lime/velocircon/RconService.java

@@ -12,6 +12,9 @@
 import org.lime.velocircon.permissions.PermissionFactory;
 import org.lime.velocircon.server.RconBinder;
 import org.lime.velocircon.server.RconServer;
+import org.lime.velocircon.sources.BaseRconCommandSource;
+import org.lime.velocircon.sources.PermissibleRconCommandSource;
+import org.lime.velocircon.sources.RootRconCommandSource;
 import org.lime.velocircon.utils.NettyFutureUtils;
 import org.slf4j.Logger;
 
@@ -98,15 +101,27 @@ public String password() {
     }
     @Override
     public CompletableFuture<Component> execute(String command) {
-        RconCommandSource source = new RconCommandSource(
-                command,
-                this.plugin,
-                this.server.getScheduler(),
-                this.permissionFactories,
-                FLUSH_MILLISECONDS,
-                FLUSH_WAIT_COUNT,
-                this.consoleOutput,
-                this.componentLogger);
+        BaseRconCommandSource source;
+        if (permissionFactories.isEmpty()) {
+            source = new RootRconCommandSource(
+                    command,
+                    this.plugin,
+                    this.server.getScheduler(),
+                    FLUSH_MILLISECONDS,
+                    FLUSH_WAIT_COUNT,
+                    this.consoleOutput,
+                    this.componentLogger);
+        } else {
+            source = new PermissibleRconCommandSource(
+                    command,
+                    this.plugin,
+                    this.server.getScheduler(),
+                    this.permissionFactories,
+                    FLUSH_MILLISECONDS,
+                    FLUSH_WAIT_COUNT,
+                    this.consoleOutput,
+                    this.componentLogger);
+        }
         return this.server
                 .getCommandManager()
                 .executeAsync(source, command)

…g/lime/velocircon/RconCommandSource.java …ircon/sources/BaseRconCommandSource.javasrc/main/java/org/lime/velocircon/RconCommandSource.java renamed to src/main/java/org/lime/velocircon/sources/BaseRconCommandSource.java src/main/java/org/lime/velocircon/RconCommandSource.java renamed to src/main/java/org/lime/velocircon/sources/BaseRconCommandSource.java

@@ -1,27 +1,23 @@
-package org.lime.velocircon;
+package org.lime.velocircon.sources;
 
 import com.velocitypowered.api.command.CommandSource;
-import com.velocitypowered.api.permission.Tristate;
 import com.velocitypowered.api.scheduler.Scheduler;
 import net.kyori.adventure.audience.MessageType;
 import net.kyori.adventure.identity.Identity;
-import net.kyori.adventure.platform.facet.FacetPointers;
 import net.kyori.adventure.permission.PermissionChecker;
+import net.kyori.adventure.platform.facet.FacetPointers;
 import net.kyori.adventure.pointer.Pointers;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.jetbrains.annotations.NotNull;
-import org.lime.velocircon.permissions.PermissionFactory;
-import org.slf4j.Logger;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 
-public class RconCommandSource
+public abstract class BaseRconCommandSource
         implements CommandSource {
     private final Pointers pointers = CommandSource.super.pointers().toBuilder()
             .withDynamic(PermissionChecker.POINTER, this::getPermissionChecker)
@@ -33,25 +29,22 @@ public class RconCommandSource
     private final String command;
     private final Object plugin;
     private final Scheduler scheduler;
-    private final Collection<PermissionFactory> permissionFactories;
     private final long flushMs;
     private final int flushWaitCount;
     private final boolean consoleOutput;
     private final ComponentLogger componentLogger;
 
-    public RconCommandSource(
+    public BaseRconCommandSource(
             String command,
             Object plugin,
             Scheduler scheduler,
-            Collection<PermissionFactory> permissionFactories,
             long flushMs,
             int flushWaitCount,
             boolean consoleOutput,
             ComponentLogger componentLogger) {
         this.command = command;
         this.plugin = plugin;
         this.scheduler = scheduler;
-        this.permissionFactories = permissionFactories;
         this.flushMs = flushMs;
         this.flushWaitCount = flushWaitCount;
         this.consoleOutput = consoleOutput;
@@ -67,23 +60,6 @@ public void sendMessage(@NotNull Identity identity, @NotNull Component message,
                     .append(message));
     }
 
-    @Override
-    public @NotNull Tristate getPermissionValue(@NotNull String permission) {
-        if (permissionFactories.isEmpty())
-            return Tristate.TRUE;
-        Tristate current = Tristate.UNDEFINED;
-        for (var permissionFactory : permissionFactories) {
-            var value = permissionFactory.check(permission);
-            switch (value) {
-                case FALSE -> {
-                    return Tristate.FALSE;
-                }
-                case TRUE -> current = Tristate.TRUE;
-            }
-        }
-        return current;
-    }
-
     @Override
     public @NotNull Pointers pointers() {
         return pointers;

src/main/java/org/lime/velocircon/sources/PermissibleRconCommandSource.java

@@ -0,0 +1,45 @@
+package org.lime.velocircon.sources;
+
+import com.velocitypowered.api.permission.Tristate;
+import com.velocitypowered.api.scheduler.Scheduler;
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import org.jetbrains.annotations.NotNull;
+import org.lime.velocircon.permissions.PermissionFactory;
+
+import java.util.Collection;
+
+public class PermissibleRconCommandSource
+        extends BaseRconCommandSource {
+    private final Collection<PermissionFactory> permissionFactories;
+
+    public PermissibleRconCommandSource(
+            String command,
+            Object plugin,
+            Scheduler scheduler,
+            Collection<PermissionFactory> permissionFactories,
+            long flushMs,
+            int flushWaitCount,
+            boolean consoleOutput,
+            ComponentLogger componentLogger) {
+        super(command, plugin, scheduler, flushMs, flushWaitCount, consoleOutput, componentLogger);
+        this.permissionFactories = permissionFactories;
+    }
+
+
+    @Override
+    public @NotNull Tristate getPermissionValue(@NotNull String permission) {
+        if (permissionFactories.isEmpty())
+            return Tristate.TRUE;
+        Tristate current = Tristate.UNDEFINED;
+        for (var permissionFactory : permissionFactories) {
+            var value = permissionFactory.check(permission);
+            switch (value) {
+                case FALSE -> {
+                    return Tristate.FALSE;
+                }
+                case TRUE -> current = Tristate.TRUE;
+            }
+        }
+        return current;
+    }
+}

src/main/java/org/lime/velocircon/sources/RootRconCommandSource.java

@@ -0,0 +1,28 @@
+package org.lime.velocircon.sources;
+
+import com.velocitypowered.api.permission.Tristate;
+import com.velocitypowered.api.proxy.ConsoleCommandSource;
+import com.velocitypowered.api.scheduler.Scheduler;
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import org.jetbrains.annotations.NotNull;
+
+public class RootRconCommandSource
+        extends BaseRconCommandSource
+        implements ConsoleCommandSource {
+    public RootRconCommandSource(
+            String command,
+            Object plugin,
+            Scheduler scheduler,
+            long flushMs,
+            int flushWaitCount,
+            boolean consoleOutput,
+            ComponentLogger componentLogger) {
+        super(command, plugin, scheduler, flushMs, flushWaitCount, consoleOutput, componentLogger);
+    }
+
+
+    @Override
+    public @NotNull Tristate getPermissionValue(@NotNull String permission) {
+        return Tristate.TRUE;
+    }
+}