diff --git a/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class b/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class index d6e1646..3193941 100644 Binary files a/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class and b/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class differ diff --git a/production/ConsoleMC.main/me/jonasjones/consolemc/system/ShellCommand.class b/production/ConsoleMC.main/me/jonasjones/consolemc/system/ShellCommand.class index a25c7f1..8fc0d9f 100644 Binary files a/production/ConsoleMC.main/me/jonasjones/consolemc/system/ShellCommand.class and b/production/ConsoleMC.main/me/jonasjones/consolemc/system/ShellCommand.class differ diff --git a/src/main/java/me/jonasjones/consolemc/command/RunCommand.java b/src/main/java/me/jonasjones/consolemc/command/RunCommand.java index cf40aff..8b1ca9a 100644 --- a/src/main/java/me/jonasjones/consolemc/command/RunCommand.java +++ b/src/main/java/me/jonasjones/consolemc/command/RunCommand.java @@ -5,62 +5,16 @@ import com.mojang.brigadier.context.CommandContext; import me.jonasjones.consolemc.ConsoleMC; import me.jonasjones.consolemc.system.ShellCommand; import net.minecraft.command.CommandRegistryAccess; -import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.command.argument.MessageArgumentType; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; - -import static me.jonasjones.consolemc.ConsoleMC.registerCommands; - public class RunCommand { public static void register(CommandDispatcher serverCommandSourceCommandDispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) { - serverCommandSourceCommandDispatcher.register((((((((((CommandManager.literal("cmd").requires(source -> source.hasPermissionLevel(4)) - .then(CommandManager.literal("run") - .then(CommandManager.argument("Console Command", MessageArgumentType.message()) + serverCommandSourceCommandDispatcher.register((CommandManager.literal("cmd").requires(source -> source.hasPermissionLevel(4)) + .then(CommandManager.argument("Console Command", MessageArgumentType.message()) .executes((context -> run(MessageArgumentType.getMessage(context, "Console Command").getString(), context))))) - //Debug Command - ).then(CommandManager.literal("debug") - .then(CommandManager.literal("reloadCommand") - .executes(context -> reloadCommands(context)))) - - //reload Command - ).then(CommandManager.literal("reload") - .executes(context -> reload(context))) - - //allow-commandBlocks Command - ).then(CommandManager.literal("allow-commandBlocks") - .then(CommandManager.literal("True") - .executes(context -> enableCmdBlocks(context)))) - ).then(CommandManager.literal("allow-commandBlocks") - .then(CommandManager.literal("False") - .executes(context -> disableCmdBlocks(context)))) - - //enable command - ).then(CommandManager.literal("enable") - .executes(context -> enable(context))) - - //disable command - ).then(CommandManager.literal("disable") - .executes(context -> disable(context))) - - //help command - ).then(CommandManager.literal("help") - .executes(context -> help())) - //blacklist [add/remove] - ).then(CommandManager.literal("blacklist") - .then(CommandManager.literal("add") - .then(CommandManager.argument("target", EntityArgumentType.players()) - .executes(context -> blacklistAdd(EntityArgumentType.getPlayer(context, "Player"), context))))) - ).then(CommandManager.literal("blacklist") - .then(CommandManager.literal("remove") - .then(CommandManager.argument("targets", EntityArgumentType.players()) - .executes(context -> blacklistRemove(EntityArgumentType.getPlayer(context, "Player"), context))))) ); } public static void broadcastToOP(String message, CommandContext context) { @@ -84,47 +38,4 @@ public class RunCommand { broadcastToOP(consoleLog, context); ConsoleMC.LOGGER.info(consoleLog); } - public static int enableCmdBlocks(CommandContext context) { - - 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) { - broadcastToOP("Added " + player.toString() + " to the ConsoleMC blacklist", context); - return 1; - } - public static int blacklistRemove(ServerPlayerEntity player, CommandContext context) { - broadcastToOP("Removed " + player.toString() + " from the ConsoleMC blacklist", context); - return 1; - } - - public static int reloadCommands(CommandContext context) { - registerCommands(); - broadcastToOP("DEBUG Reregistered /cmd command", context); - return 1; - } - - public static int help() { - ConsoleMC.LOGGER.info("Print help"); - return 1; - } - public static int reload(CommandContext context) { - broadcastToOP("Reloaded ConsoleMC Config", context); - return 1; - } - - public static int enable(CommandContext context) { - broadcastToOP("Enabled ConsoleMC commands", context); - return 1; - } - public static int disable(CommandContext context) { - broadcastToOP("Disabled ConsoleMC commands", context); - return 1; - } }