Add permissions

Author: rickiewars

build.gradle

@@ -54,6 +54,8 @@ dependencies {
 	// Add compatibility with lots of economy mods
 	modImplementation include("eu.pb4:common-economy-api:${project.common_economy_api_version}")
 
+	include(modImplementation("me.lucko:fabric-permissions-api:${project.fabric_permissions_api_version}"))
+
 	// Used for unit tests
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 	testImplementation "org.junit.platform:junit-platform-suite:${project.junit_platform_version}"

gradle.properties

@@ -21,6 +21,8 @@ fabric_version=0.121.0+1.21.5
 polymer_version=0.12.3+1.21.5
 # https://github.com/Patbox/common-economy-api
 common_economy_api_version=1.1.1
+# https://github.com/lucko/fabric-permissions-api
+fabric_permissions_api_version=0.3.3
 
 # For Unit Testing
 # See the [fabric-loader-unit maven artifacts](https://mvnrepository.com/artifact/net.fabricmc/fabric-loader-junit)

src/main/java/com/rwconnected/serverkit/command/GetTimeCommand.java

@@ -39,6 +39,7 @@ public class GetTimeCommand {
 
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) {
         var rtcCommand = CommandManager.literal("rtc")
+            .requires(Permission.RTC.require())
             .executes(GetTimeCommand::help);
 
         var getCommand = CommandManager.literal("get")

src/main/java/com/rwconnected/serverkit/command/LoginStreakCommand.java

@@ -28,40 +28,46 @@
 public class LoginStreakCommand {
     public static void register(CommandDispatcher<ServerCommandSource> serverCommandSourceCommandDispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) {
         serverCommandSourceCommandDispatcher.register(CommandManager.literal("loginStreak")
+            .requires(Permission.LOGIN_STREAK.require())
             .executes(ctx -> getStreak(ctx, false))
             .then(CommandManager.literal("help")
+                .requires(Permission.LOGIN_STREAK_HELP.require())
                 .executes(context -> {
                     Log.source(context, Config.instance().loginStreak.welcomeMessage());
                     return 1;
                 })
             ).then(CommandManager.literal("get")
+                .requires(Permission.LOGIN_STREAK_GET.require())
                 .executes(ctx -> getStreak(ctx, false))
                 .then(CommandManager.argument("player", EntityArgumentType.player())
-                    .requires(source -> source.hasPermissionLevel(4))
+                    .requires(Permission.LOGIN_STREAK_GET_PLAYER.require())
                     .executes(ctx -> getStreak(ctx, true))
                 )
             ).then(CommandManager.literal("set")
-                .requires(source -> source.hasPermissionLevel(4))
+                .requires(Permission.LOGIN_STREAK_SET.require())
                 .then(CommandManager.literal("streak")
                     .then(CommandManager.argument("streak", IntegerArgumentType.integer())
                         .executes(ctx -> setStreak(ctx, false))
                         .then(CommandManager.argument("player", EntityArgumentType.player())
+                            .requires(Permission.LOGIN_STREAK_SET_PLAYER.require())
                             .executes(ctx -> setStreak(ctx, true))
                         )
                     )
                 ).then(CommandManager.literal("record")
                     .then(CommandManager.argument("record", IntegerArgumentType.integer())
                         .executes(ctx -> setRecord(ctx, false))
                         .then(CommandManager.argument("player", EntityArgumentType.player())
+                            .requires(Permission.LOGIN_STREAK_SET_PLAYER.require())
                             .executes(ctx -> setRecord(ctx, true))
                         )
                     )
                 )
 
             ).then(CommandManager.literal("milestones")
+                .requires(Permission.LOGIN_STREAK_MILESTONES.require())
                 .executes(LoginStreakCommand::showMilestones)
             ).then(CommandManager.literal("reward")
-                .requires(source -> source.hasPermissionLevel(4))
+                .requires(Permission.LOGIN_STREAK_REWARD.require())
                 .then(CommandManager.argument("player", EntityArgumentType.player())
                     .then(CommandManager.argument("amount", IntegerArgumentType.integer())
                         .executes(LoginStreakCommand::reward)

src/main/java/com/rwconnected/serverkit/command/Permission.java

@@ -0,0 +1,41 @@
+package com.rwconnected.serverkit.command;
+
+import me.lucko.fabric.api.permissions.v0.Permissions;
+import net.minecraft.server.command.ServerCommandSource;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Predicate;
+
+/**
+ * Vanilla permission levels:
+ * 0: Normal player
+ * 1: Moderators can bypass spawn protection
+ * 2: Gamemasters have access to commands like /scoreboard, /advancement, /function, etc. and can use command blocks
+ * 3: Admins have access to most commands including /op and /deop. So effectively these players can do anything.
+ * 4: Owner has access to all commands
+ */
+public enum Permission {
+    LOGIN_STREAK("loginStreak", 0),
+    LOGIN_STREAK_HELP("loginStreak.help", 0),
+    LOGIN_STREAK_MILESTONES("loginStreak.milestones", 0),
+    LOGIN_STREAK_GET("loginStreak.get", 0),
+    LOGIN_STREAK_GET_PLAYER("loginStreak.get.player", 1),
+    LOGIN_STREAK_SET("loginStreak.set", 3),
+    LOGIN_STREAK_SET_PLAYER("loginStreak.set.player", 3),
+    LOGIN_STREAK_REWARD("loginStreak.reward", 3),
+
+    RTC("rtc", 2);
+
+    private final String permission;
+    private final int defaultLevel;
+
+    Permission(String permission, int defaultLevel) {
+        this.permission = permission;
+        this.defaultLevel = defaultLevel;
+    }
+
+    @NotNull
+    public Predicate<ServerCommandSource> require() {
+        return Permissions.require(this.permission, this.defaultLevel);
+    }
+}