From ac811c807e84209839dafdfb7f39760dcf53ee9c Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Mon, 20 Jun 2022 20:43:06 +0200 Subject: [PATCH] code cleanup --- .../consolemc/command/RunCommand.class | Bin 12128 -> 10673 bytes .../consolemc/config/ConfigHandler.class | Bin 326 -> 0 bytes .../consolemc/command/RunCommand.java | 67 ++++++------------ 3 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 production/ConsoleMC.main/me/jonasjones/consolemc/config/ConfigHandler.class diff --git a/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class b/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class index 4059f3879dc2d11b7fb2e93e75265d1539347c67..a96c267f7383eb878ef82283c67baa32ff5abfe5 100644 GIT binary patch literal 10673 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 serverCommandSourceCommandDispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) { - serverCommandSourceCommandDispatcher.register((((((((((((CommandManager.literal("cmd").requires(source -> source.hasPermissionLevel(4)) //requires OP //TODO: implement config "require-op:[True/False]" + serverCommandSourceCommandDispatcher.register((((((((((CommandManager.literal("cmd").requires(source -> source.hasPermissionLevel(4)) .then(CommandManager.literal("run") .then(CommandManager.argument("Console Command", MessageArgumentType.message()) .executes((context -> run(MessageArgumentType.getMessage(context, "Console Command").getString(), context))))) @@ -38,38 +35,22 @@ public class RunCommand { //allow-commandBlocks Command ).then(CommandManager.literal("allow-commandBlocks") .then(CommandManager.literal("True") - .executes(context -> toggleAllow(context)))) + .executes(context -> enableCmdBlocks(context)))) ).then(CommandManager.literal("allow-commandBlocks") .then(CommandManager.literal("False") - .executes(context -> toggleAllow(context)))) - - //op-permissionLevel Command - ).then(CommandManager.literal("op-permissionLevel") - .then(CommandManager.argument("level", IntegerArgumentType.integer(1, 4)) - .executes(context -> setLevel(IntegerArgumentType.integer(IntegerArgumentType.getInteger(context, "level")), context)))) + .executes(context -> disableCmdBlocks(context)))) //enable command ).then(CommandManager.literal("enable") - .executes(context -> toggle(context))) + .executes(context -> enable(context))) //disable command ).then(CommandManager.literal("disable") - .executes(context -> toggle(context))) + .executes(context -> disable(context))) //help command ).then(CommandManager.literal("help") .executes(context -> help())) - - //whitelist [add /remove ] - ).then(CommandManager.literal("whitelist") - .then(CommandManager.literal("add") - .then(CommandManager.argument("target", EntityArgumentType.players()) - .executes(context -> whitelistAdd(EntityArgumentType.getPlayer(context, "Player"), context))))) - ).then(CommandManager.literal("whitelist") - .then(CommandManager.literal("remove") - .then((CommandManager.argument("target", EntityArgumentType.players()) - .executes(context -> whitelistRemove(EntityArgumentType.getPlayer(context, "Player"), context))))) - //blacklist [add/remove] ).then(CommandManager.literal("blacklist") .then(CommandManager.literal("add") @@ -112,60 +93,56 @@ public class RunCommand { //e.printStackTrace(); String errorLog = "Error: \"" + cmd + "\", No such file or directory!"; ConsoleMC.LOGGER.info(errorLog); - context.getSource().sendFeedback(Text.of(errorLog), false); + broadcastToOP(errorLog, context); return -1; } } public static void returnCommandOutput(String cmd, String commandFeedback, CommandContext context) { String consoleLog = " [" + cmd + "]: " + commandFeedback; - context.getSource().sendFeedback(Text.of(consoleLog), false); + broadcastToOP(consoleLog, context); ConsoleMC.LOGGER.info(consoleLog); } - public static int toggleAllow(CommandContext context) { + public static int enableCmdBlocks(CommandContext context) { - ConsoleMC.LOGGER.info("Toggle Allow-CommandBlocks"); + broadcastToOP("Enabled ConsoleMC in Commandblocks", context); + return 1; + } + public static int disableCmdBlocks(CommandContext context) { + + broadcastToOP("Disabled ConsoleMC in Commandblocks", context); return 1; } public static int blacklistAdd(ServerPlayerEntity player, CommandContext context) { - ConsoleMC.LOGGER.info("Add " + player.toString() + " to the blacklist"); + broadcastToOP("Added " + player.toString() + " to the ConsoleMC blacklist", context); return 1; } public static int blacklistRemove(ServerPlayerEntity player, CommandContext context) { - ConsoleMC.LOGGER.info("Remove " + player.toString() + " from the blacklist"); + broadcastToOP("Removed " + player.toString() + " from the ConsoleMC blacklist", context); return 1; } public static int reloadCommands(CommandContext context) { registerCommands(); - ConsoleMC.LOGGER.info("Reloaded Commands!"); + broadcastToOP("DEBUG Reregistered /cmd command", context); return 1; } - public static int setLevel(IntegerArgumentType level, CommandContext context) { - ConsoleMC.LOGGER.info("Set Command OP Permission Level to: " + level.toString()); - return 1; - } public static int help() { ConsoleMC.LOGGER.info("Print help"); return 1; } public static int reload(CommandContext context) { - ConsoleMC.LOGGER.info("Reloading!"); + broadcastToOP("Reloaded ConsoleMC Config", context); return 1; } - public static int toggle(CommandContext context) { - ConsoleMC.LOGGER.info("Toggle Enable"); + public static int enable(CommandContext context) { + broadcastToOP("Enabled ConsoleMC commands", context); return 1; } - - public static int whitelistAdd(ServerPlayerEntity player, CommandContext context) { - ConsoleMC.LOGGER.info("Add " + player.toString() + " to whitelist"); - return 1; - } - public static int whitelistRemove(ServerPlayerEntity player, CommandContext context) { - ConsoleMC.LOGGER.info("Remove " + player.toString() + " from whitelist"); + public static int disable(CommandContext context) { + broadcastToOP("Disabled ConsoleMC commands", context); return 1; } }