Add support for permission api, lower required op level

NucleoidMC · Aug 8, 2023 · 2842bc2 · 2842bc2
1 parent cc34915
commit 2842bc2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,6 @@ loader_version=0.14.21
 fabric_version=0.83.0+1.20
 
 # Mod Properties
-mod_version=0.2.1
+mod_version=0.2.2
 maven_group=xyz.nucleoid
 archives_base_name=nucleoid-creator-tools
diff --git a/src/main/java/xyz/nucleoid/creator_tools/command/MapManageCommand.java b/src/main/java/xyz/nucleoid/creator_tools/command/MapManageCommand.java
@@ -6,6 +6,7 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.command.argument.BlockPosArgumentType;
 import net.minecraft.command.argument.IdentifierArgumentType;
 import net.minecraft.command.argument.NbtCompoundArgumentType;
@@ -62,7 +63,7 @@ public final class MapManageCommand {
     // @formatter:off
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         dispatcher.register(
-            literal("map").requires(source -> source.hasPermissionLevel(4))
+            literal("map").requires(Permissions.require("nucleoid_creator_extras.map", 2))
                 .then(literal("open")
                     .then(argument("workspace", IdentifierArgumentType.identifier())
                     .executes(context -> MapManageCommand.openWorkspace(context, null))

diff --git a/src/main/java/xyz/nucleoid/creator_tools/command/MapMetadataCommand.java b/src/main/java/xyz/nucleoid/creator_tools/command/MapMetadataCommand.java
@@ -8,6 +8,7 @@
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
+import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.BlockPosArgumentType;
 import net.minecraft.command.argument.EntityArgumentType;
@@ -68,7 +69,7 @@ public final class MapMetadataCommand {
     // @formatter:off
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         dispatcher.register(
-            literal("map").requires(source -> source.hasPermissionLevel(4))
+                literal("map").requires(Permissions.require("nucleoid_creator_extras.map", 2))
                 .then(literal("region")
                     .then(literal("add")
                         .then(argument("marker", StringArgumentType.word())