Cleanup permission holders

MrSlimeDiamond · MrSlimeDiamond · commit 7b52535d343d · 2025-04-04T09:31:43.000+13:00
diff --git a/lib/src/main/java/org/galliumpowered/annotation/Command.java b/lib/src/main/java/org/galliumpowered/annotation/Command.java
@@ -27,7 +27,7 @@
      * Required permissions
      * TODO-ish
      */
-    String neededPerms() default "NONE";
+    String permission() default "";
 
     Args[] args() default {};
 }
diff --git a/lib/src/main/java/org/galliumpowered/command/CommandManager.java b/lib/src/main/java/org/galliumpowered/command/CommandManager.java
@@ -56,12 +56,12 @@ private void doRegister(MCommand cmd, PluginMetadata meta) {
 
     private void internalRegister(String alias, MCommand cmd, PluginMetadata meta) {
         if (cmd.getCommand().args().length == 0) {
-            Gallium.getBridge().registerCommand(alias, cmd.getCommand().neededPerms());
-            Gallium.getBridge().registerCommand(meta.getId() + ":" + alias, cmd.getCommand().neededPerms());
+            Gallium.getBridge().registerCommand(alias, cmd.getCommand().permission());
+            Gallium.getBridge().registerCommand(meta.getId() + ":" + alias, cmd.getCommand().permission());
         } else {
             // FIXME: Multiple args
-            Gallium.getBridge().registerCommand(alias, cmd.getCommand().neededPerms(), cmd.getCommand().args());
-            Gallium.getBridge().registerCommand(meta.getId() + ":" + alias, cmd.getCommand().neededPerms(), cmd.getCommand().args());
+            Gallium.getBridge().registerCommand(alias, cmd.getCommand().permission(), cmd.getCommand().args());
+            Gallium.getBridge().registerCommand(meta.getId() + ":" + alias, cmd.getCommand().permission(), cmd.getCommand().args());
         }
     }
 
diff --git a/lib/src/main/java/org/galliumpowered/command/MCommand.java b/lib/src/main/java/org/galliumpowered/command/MCommand.java
@@ -48,7 +48,7 @@ public List<String> suggest(CommandContext ctx) {
             if (parent == this) {
                 AtomicBoolean canExec = new AtomicBoolean(false);
                 ctx.ifConsole(caller -> canExec.set(true));
-                ctx.ifPlayer(player -> canExec.set(player.hasPermission(sub.getCommand().neededPerms())));
+                ctx.ifPlayer(player -> canExec.set(player.hasPermission(sub.getCommand().permission())));
                 if (canExec.get()) {
                     subcmdNames.addAll(Arrays.asList(sub.getCommand().aliases()));
                 }
diff --git a/lib/src/main/java/org/galliumpowered/database/Database.java b/lib/src/main/java/org/galliumpowered/database/Database.java
@@ -6,7 +6,7 @@
 import org.galliumpowered.exceptions.GalliumDatabaseException;
 import org.galliumpowered.permission.Group;
 import org.galliumpowered.permission.GroupManager;
-import org.galliumpowered.permission.PermissionOwner;
+import org.galliumpowered.permission.PermissionHolder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -239,7 +239,7 @@ public void setPlayerPrefix(Player player, String prefix) throws SQLException {
      * @param owner group or player permission owner
      * @throws SQLException
      */
-    public void insertPermission(String permission, PermissionOwner owner) throws SQLException {
+    public void insertPermission(String permission, PermissionHolder owner) throws SQLException {
         insertPermission.setString(1, permission);
         insertPermission.setString(2, owner.getName());
         insertPermission.execute();
@@ -251,7 +251,7 @@ public void insertPermission(String permission, PermissionOwner owner) throws SQ
      * @param owner group or player permission owner
      * @throws SQLException
      */
-    public void removePermission(String permission, PermissionOwner owner) throws SQLException {
+    public void removePermission(String permission, PermissionHolder owner) throws SQLException {
         removePermisson.setString(1, permission);
         removePermisson.setString(2, owner.getName());
         removePermisson.execute();
diff --git a/lib/src/main/java/org/galliumpowered/permission/Group.java b/lib/src/main/java/org/galliumpowered/permission/Group.java
@@ -4,15 +4,15 @@
 import org.galliumpowered.chat.Colors;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
-public class Group {
-    String name;
-    ArrayList<String> permissions;
+public class Group implements PermissionHolder {
+    private final String name;
+    private final List<String> permissions;
     String prefix;
 
-    public Group(String name, ArrayList<String> permissions, String prefix) {
+    public Group(String name, List<String> permissions, String prefix) {
         this.name = name;
         this.permissions = permissions;
         this.prefix = prefix;
@@ -30,7 +30,7 @@ public String getName() {
      * The permissions the group holds
      * @return Permisisons of the group
      */
-    public ArrayList<String> getPermissions() {
+    public List<String> getPermissions() {
         return permissions;
     }
 
@@ -48,7 +48,7 @@ public String getPrefix() {
      * @throws SQLException
      */
     public void addPermission(String permission) throws SQLException {
-        Gallium.getDatabase().insertPermission(permission, new PermissionOwner(this));
+        Gallium.getDatabase().insertPermission(permission, this);
     }
 
     /**
@@ -57,14 +57,15 @@ public void addPermission(String permission) throws SQLException {
      * @throws SQLException
      */
     public void removePermission(String permission) throws SQLException {
-        Gallium.getDatabase().removePermission(permission, new PermissionOwner(this));
+        Gallium.getDatabase().removePermission(permission, this);
     }
 
     /**
      * Whether the group has a specific permission
      * @param permission The permission to check
      * @return True if the permission is present, otherwise false
      */
+    @Override
     public boolean hasPermission(String permission) {
         return permissions.contains(permission);
     }
diff --git a/lib/src/main/java/org/galliumpowered/permission/GroupManager.java b/lib/src/main/java/org/galliumpowered/permission/GroupManager.java
@@ -4,12 +4,9 @@
 
 import java.util.ArrayList;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 
 public class GroupManager {
-    private ArrayList<Group> groups = new ArrayList<>();
-
-    public GroupManager() {}
+    private final ArrayList<Group> groups = new ArrayList<>();
 
     /**
      * Add a {@link Group}
@@ -51,16 +48,8 @@ public ArrayList<Group> getGroups() {
      * @return the group
      */
     public Optional<Group> getGroupByName(String name) {
-        AtomicReference<Group> returnGroup = new AtomicReference<>();
-        groups.stream()
+        return groups.stream()
                 .filter(group -> group.getName().equalsIgnoreCase(name))
-                .findFirst()
-                .ifPresent(returnGroup::set);
-//        System.out.println(returnGroup.get());
-        if (returnGroup.get() == null) {
-            return Optional.empty();
-        } else {
-            return Optional.of(returnGroup.get());
-        }
+                .findFirst();
     }
 }
diff --git a/lib/src/main/java/org/galliumpowered/permission/PermissionHolder.java b/lib/src/main/java/org/galliumpowered/permission/PermissionHolder.java
@@ -0,0 +1,27 @@
+package org.galliumpowered.permission;
+
+
+import java.util.List;
+
+public interface PermissionHolder {
+    /**
+     * The name of the permission owner
+     * @return Permission owner name
+     */
+    String getName();
+
+    /**
+     * Check if this permission holder has a permission
+     *
+     * @param permissionNode Permission to check
+     * @return If the holder has the permission
+     */
+    boolean hasPermission(String permissionNode);
+
+    /**
+     * Get a list of permissions this permission holder has
+     *
+     * @return Permission list
+     */
+    List<String> getPermissions();
+}
diff --git a/lib/src/main/java/org/galliumpowered/permission/PermissionManager.java b/lib/src/main/java/org/galliumpowered/permission/PermissionManager.java
@@ -8,14 +8,10 @@
 
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Objects;
 import java.util.Optional;
 
 public class PermissionManager {
-    private static final Logger log = LogManager.getLogger("Gallium/PluginManager");
-    public PermissionManager() {
-
-    }
+    private static final Logger log = LogManager.getLogger("Gallium/PermissionManager");
 
     /**
      * Check if a player has a permission
@@ -25,7 +21,7 @@ public PermissionManager() {
      */
     public boolean playerHasPermission(Player player, String permission) {
         log.debug("Called playerHasPermission");
-        if (Objects.equals(permission, "NONE")) return true;
+        if (permission.isEmpty()) return true;
         try {
             // Check against player
             log.debug("Checking against player...");
diff --git a/lib/src/main/java/org/galliumpowered/permission/PermissionOwner.java b/lib/src/main/java/org/galliumpowered/permission/PermissionOwner.java
diff --git a/lib/src/main/java/org/galliumpowered/world/entity/Player.java b/lib/src/main/java/org/galliumpowered/world/entity/Player.java
@@ -6,15 +6,15 @@
 import org.galliumpowered.chat.Colors;
 import org.galliumpowered.command.CommandCaller;
 import org.galliumpowered.permission.Group;
-import org.galliumpowered.permission.PermissionOwner;
+import org.galliumpowered.permission.PermissionHolder;
 import org.galliumpowered.world.World;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Optional;
 
-public interface Player extends Entity, CommandCaller {
+public interface Player extends Entity, CommandCaller, PermissionHolder {
     /**
      * Get the player's UUID
      * @return the uuid
@@ -87,7 +87,7 @@ default void setGroup(Group group) throws SQLException {
      * @throws SQLException
      */
     default void addPermission(String permission) throws SQLException {
-        Gallium.getDatabase().insertPermission(permission, new PermissionOwner(this));
+        Gallium.getDatabase().insertPermission(permission, this);
     }
 
     /**
@@ -96,7 +96,7 @@ default void addPermission(String permission) throws SQLException {
      * @throws SQLException
      */
     default void removePermission(String permission) throws SQLException {
-        Gallium.getDatabase().removePermission(permission, new PermissionOwner(this));
+        Gallium.getDatabase().removePermission(permission, this);
     }
 
     /**
diff --git a/server/src/main/java/org/galliumpowered/internal/plugin/commands/GamemodeCommand.java b/server/src/main/java/org/galliumpowered/internal/plugin/commands/GamemodeCommand.java
@@ -5,20 +5,17 @@
 import org.galliumpowered.Gallium;
 import org.galliumpowered.Gamemode;
 import org.galliumpowered.annotation.Command;
-import org.galliumpowered.chat.Colors;
 import org.galliumpowered.internal.plugin.GalliumPlugin;
 import org.galliumpowered.world.entity.Player;
 import org.galliumpowered.command.CommandContext;
 import org.galliumpowered.util.NumberUtils;
 
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 
 public class GamemodeCommand {
     private static final Component USAGE = Component.text("/gamemode <survival|creative|adventure|spectator|0|1|2|3|s|c|a|sp> [player]").color(NamedTextColor.RED);
 
-    @Command(aliases = { "gamemode", "gm" }, description = "Change a gamemode", neededPerms = "GAMEMODE")
+    @Command(aliases = { "gamemode", "gm" }, description = "Change a gamemode", permission = "GAMEMODE")
     public void gamemodeCommand(CommandContext ctx) {
         Gamemode gamemode = Gamemode.SURVIVAL;
         Player target = null;
diff --git a/server/src/main/java/org/galliumpowered/internal/plugin/commands/permissions/GroupmodCommand.java b/server/src/main/java/org/galliumpowered/internal/plugin/commands/permissions/GroupmodCommand.java
@@ -13,7 +13,7 @@
 import java.util.StringJoiner;
 
 public class GroupmodCommand {
-    @Command(aliases = {"groupmod"}, description = "Modify a group", neededPerms = "PERMSYS")
+    @Command(aliases = {"groupmod"}, description = "Modify a group", permission = "PERMSYS")
     public void groupmodCommand(CommandContext ctx) throws SQLException {
         String[] args = ctx.getCommandArgs();
         CommandCaller caller = ctx.getCaller();
diff --git a/server/src/main/java/org/galliumpowered/internal/plugin/commands/permissions/PlayermodCommand.java b/server/src/main/java/org/galliumpowered/internal/plugin/commands/permissions/PlayermodCommand.java
@@ -13,7 +13,7 @@
 import java.util.StringJoiner;
 
 public class PlayermodCommand {
-    @Command(aliases = {"playermod"}, description = "Modify a player's permissions and groups", neededPerms = "PERMSYS")
+    @Command(aliases = {"playermod"}, description = "Modify a player's permissions and groups", permission = "PERMSYS")
     public void playerModCommand(CommandContext ctx) {
         CommandCaller caller = ctx.getCaller();
         String[] args = ctx.getCommandArgs();
diff --git a/server/src/main/java/org/galliumpowered/internal/plugin/commands/plugin/PluginInfoCommand.java b/server/src/main/java/org/galliumpowered/internal/plugin/commands/plugin/PluginInfoCommand.java
@@ -10,7 +10,7 @@
 import org.galliumpowered.internal.plugin.GalliumPlugin;
 
 public class PluginInfoCommand {
-    @Command(aliases = {"plugininfo"}, description = "Show information about a plugin", neededPerms = "PLUGINS", args = @Args(type = ArgumentType.SINGLE, name = "plugin"))
+    @Command(aliases = {"plugininfo"}, description = "Show information about a plugin", permission = "PLUGINS", args = @Args(type = ArgumentType.SINGLE, name = "plugin"))
     public void pluginInfoCommand(CommandContext ctx) {
         ctx.getArgument("plugin").ifPresentOrElse(pluginId -> {
             Gallium.getPluginManager().getPluginById(pluginId).ifPresentOrElse(container -> {
diff --git a/server/src/main/java/org/galliumpowered/internal/plugin/commands/plugin/PluginListCommand.java b/server/src/main/java/org/galliumpowered/internal/plugin/commands/plugin/PluginListCommand.java
@@ -10,7 +10,7 @@
 import org.galliumpowered.internal.plugin.GalliumPlugin;
 
 public class PluginListCommand {
-    @Command(aliases = {"pluginlist", "plugins"}, description = "Show all plugins loaded on the server", neededPerms = "PLUGINS")
+    @Command(aliases = {"pluginlist", "plugins"}, description = "Show all plugins loaded on the server", permission = "PLUGINS")
     public void pluginListCommand(CommandContext ctx) {
         ctx.getCaller().sendMessage(
                 Component.text()
diff --git a/server/src/main/java/org/galliumpowered/world/entity/PlayerImpl.java b/server/src/main/java/org/galliumpowered/world/entity/PlayerImpl.java
@@ -7,7 +7,6 @@
 import org.galliumpowered.Gamemode;
 import org.galliumpowered.world.World;
 import org.galliumpowered.world.WorldImpl;
-import org.galliumpowered.world.entity.Player;
 import org.galliumpowered.util.TextTransformer;
 
 import javax.annotation.Nullable;

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`* Required permissions`
`28`	`28`	`* TODO-ish`
`29`	`29`	`*/`
`30`		`- String neededPerms() default "NONE";`
	`30`	`+ String permission() default "";`
`31`	`31`
`32`	`32`	`Args[] args() default {};`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public List<String> suggest(CommandContext ctx) {`
`48`	`48`	`if (parent == this) {`
`49`	`49`	`AtomicBoolean canExec = new AtomicBoolean(false);`
`50`	`50`	`ctx.ifConsole(caller -> canExec.set(true));`
`51`		`- ctx.ifPlayer(player -> canExec.set(player.hasPermission(sub.getCommand().neededPerms())));`
	`51`	`+ ctx.ifPlayer(player -> canExec.set(player.hasPermission(sub.getCommand().permission())));`
`52`	`52`	`if (canExec.get()) {`
`53`	`53`	`subcmdNames.addAll(Arrays.asList(sub.getCommand().aliases()));`
`54`	`54`	`}`