Merge pull request #12 from jfglzs/dev

Update EnableCommand rules

TODO: remove enableLoggerCommand

Author: OptiJava

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

@@ -245,4 +245,28 @@ public class OptCarpetSettings {
             options = {"true", "false"}
     )
     public static boolean allowSpectatorTpToAnyPlayer = false;
+
+    @Rule(
+            desc = "enableLoggerCommand",
+            category = {RuleCategory.COMMAND , OCA}
+    )
+    public static boolean enableLoggerCommand = true;
+
+    @Rule(
+            desc = "enableCrashCommand",
+            category = {RuleCategory.COMMAND , OCA}
+    )
+    public static boolean enableCrashCommand = true;
+
+    @Rule(
+            desc = "enableListAdvanceCommand",
+            category = {RuleCategory.COMMAND , OCA}
+    )
+    public static boolean enableListAdvanceCommand = true;
+
+    @Rule(
+            desc = "enableTpmanagerCommand",
+            category = {RuleCategory.COMMAND , OCA}
+    )
+    public static boolean enableTpmanagerCommand = true;
 }

src/main/java/io/github/optijava/opt_carpet_addition/commands/CommandLoggerCommand.java

@@ -4,17 +4,23 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import io.github.optijava.opt_carpet_addition.utils.CommandLogger;
+import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
-
-import static net.minecraft.server.command.CommandManager.literal;
+import static io.github.optijava.opt_carpet_addition.OptCarpetSettings.enableLoggerCommand;
 
 public class CommandLoggerCommand {
     public static void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
-        LiteralArgumentBuilder<ServerCommandSource> argumentBuilder = literal("commandlogger")
+        LiteralArgumentBuilder<ServerCommandSource> argumentBuilder = CommandManager.literal("commandlogger")
+                //#if MC < 12004
+                //$$.requires((player) -> carpet.settings.SettingsManager.canUseCommand(source, enableLoggerCommand))
+                //#else
+                //$$.requires((player) ->  carpet.utils.CommandHelper.canUseCommand(player, enableLoggerCommand))
+                //#endif
                 .then(
-                        literal("reload")
+                        CommandManager.literal("reload")
                                 .executes(CommandLoggerCommand::reload)
                 );
+
         dispatcher.register(argumentBuilder);
     }
 

src/main/java/io/github/optijava/opt_carpet_addition/commands/CrashCommand.java

@@ -6,6 +6,7 @@
 import com.mojang.brigadier.context.CommandContext;
 import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
 import net.minecraft.server.command.ServerCommandSource;
+import static io.github.optijava.opt_carpet_addition.OptCarpetSettings.enableCrashCommand;
 
 import static net.minecraft.server.command.CommandManager.literal;
 
@@ -17,7 +18,13 @@ private CrashCommand() {
 
     public static void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
         LiteralArgumentBuilder<ServerCommandSource> argumentBuilder = literal("crash")
-                .requires((serverCommandSource -> serverCommandSource.hasPermissionLevel(4)))
+                //#if MC < 12004
+                //$$ .requires((serverCommandSource -> serverCommandSource.hasPermissionLevel(4)))
+                //$$.requires((player) -> carpet.settings.SettingsManager.canUseCommand(source, enableCrashCommand))
+                //#else
+                //$$.requires((serverCommandSource -> serverCommandSource.hasPermissionLevel(4)))
+                //$$.requires((player) ->  carpet.utils.CommandHelper.canUseCommand(player, enableCrashCommand))
+                //#endif
                 .executes(CrashCommand::prepare)
                 .then(
                         literal("confirm")

src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java

@@ -8,13 +8,19 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
+import static io.github.optijava.opt_carpet_addition.OptCarpetSettings.enableListAdvanceCommand;
 
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class ListAdvanceCommand {
 
     public static void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
         LiteralArgumentBuilder<ServerCommandSource> argumentBuilder = literal("list")
+                //#if MC < 12004
+                //$$.requires((player) -> carpet.settings.SettingsManager.canUseCommand(source, enableListAdvanceCommand))
+                //#else
+                //$$.requires((player) ->  carpet.utils.CommandHelper.canUseCommand(player, enableListAdvanceCommand))
+                //#endif
                 .then(literal("-advance").executes(ListAdvanceCommand::listAdvance));
         dispatcher.register(argumentBuilder);
     }

src/main/java/io/github/optijava/opt_carpet_addition/commands/TpLimitCommand.java

@@ -12,6 +12,8 @@
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
 
+import static io.github.optijava.opt_carpet_addition.OptCarpetSettings.enableTpmanagerCommand;
+
 public class TpLimitCommand {
 
     private TpLimitCommand() {
@@ -22,6 +24,11 @@ public static void registerCommand(CommandDispatcher<ServerCommandSource> dispat
 
 
         LiteralArgumentBuilder<ServerCommandSource> argument = literal("tpmanager")
+                //#if MC < 12004
+                //$$.requires((player) -> carpet.settings.SettingsManager.canUseCommand(source, enableTpmanagerCommand))
+                //#else
+                //$$.requires((player) ->  carpet.utils.CommandHelper.canUseCommand(player, enableTpmanagerCommand))
+                //#endif
                 .then(
                         literal("reload")
                                 .executes(TpLimit::reload)