Jonas_Jones/ConsoleMC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/ConsoleMC.git synced 2025-10-23 02:39:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
Jonas_Jones 2022-06-20 20:43:06 +02:00
parent 7784f65c74
commit ac811c807e
3 changed files with 22 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class
View file

Binary file not shown.

BIN
production/ConsoleMC.main/me/jonasjones/consolemc/config/ConfigHandler.class
View file

Binary file not shown.

67
src/main/java/me/jonasjones/consolemc/command/RunCommand.java
View file

@ -1,9 +1,7 @@
package me.jonasjones.consolemc.command; package me.jonasjones.consolemc.command;
import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import me.jonasjones.consolemc.ConsoleMC; import me.jonasjones.consolemc.ConsoleMC;
import net.minecraft.command.CommandRegistryAccess; import net.minecraft.command.CommandRegistryAccess;
import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.command.argument.EntityArgumentType;
@ -12,7 +10,6 @@ import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.apache.logging.log4j.core.jmx.Server;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -22,7 +19,7 @@ import static me.jonasjones.consolemc.ConsoleMC.registerCommands;
public class RunCommand { public class RunCommand {
public static void register(CommandDispatcher<ServerCommandSource> serverCommandSourceCommandDispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) { public static void register(CommandDispatcher<ServerCommandSource> 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.literal("run")
.then(CommandManager.argument("Console Command", MessageArgumentType.message()) .then(CommandManager.argument("Console Command", MessageArgumentType.message())
.executes((context -> run(MessageArgumentType.getMessage(context, "Console Command").getString(), context))))) .executes((context -> run(MessageArgumentType.getMessage(context, "Console Command").getString(), context)))))
@ -38,38 +35,22 @@ public class RunCommand {
//allow-commandBlocks Command //allow-commandBlocks Command
).then(CommandManager.literal("allow-commandBlocks") ).then(CommandManager.literal("allow-commandBlocks")
.then(CommandManager.literal("True") .then(CommandManager.literal("True")
.executes(context -> toggleAllow(context)))) .executes(context -> enableCmdBlocks(context))))
).then(CommandManager.literal("allow-commandBlocks") ).then(CommandManager.literal("allow-commandBlocks")
.then(CommandManager.literal("False") .then(CommandManager.literal("False")
.executes(context -> toggleAllow(context)))) .executes(context -> disableCmdBlocks(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))))
//enable command //enable command
).then(CommandManager.literal("enable") ).then(CommandManager.literal("enable")
.executes(context -> toggle(context))) .executes(context -> enable(context)))
//disable command //disable command
).then(CommandManager.literal("disable") ).then(CommandManager.literal("disable")
.executes(context -> toggle(context))) .executes(context -> disable(context)))
//help command //help command
).then(CommandManager.literal("help") ).then(CommandManager.literal("help")
.executes(context -> help())) .executes(context -> help()))
//whitelist [add <player>/remove <player>]
).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] //blacklist [add/remove]
).then(CommandManager.literal("blacklist") ).then(CommandManager.literal("blacklist")
.then(CommandManager.literal("add") .then(CommandManager.literal("add")
@ -112,60 +93,56 @@ public class RunCommand {
//e.printStackTrace(); //e.printStackTrace();
String errorLog = "Error: \"" + cmd + "\", No such file or directory!"; String errorLog = "Error: \"" + cmd + "\", No such file or directory!";
ConsoleMC.LOGGER.info(errorLog); ConsoleMC.LOGGER.info(errorLog);
context.getSource().sendFeedback(Text.of(errorLog), false); broadcastToOP(errorLog, context);
return -1; return -1;
} }
} }
public static void returnCommandOutput(String cmd, String commandFeedback, CommandContext<ServerCommandSource> context) { public static void returnCommandOutput(String cmd, String commandFeedback, CommandContext<ServerCommandSource> context) {
String consoleLog = " [" + cmd + "]: " + commandFeedback; String consoleLog = " [" + cmd + "]: " + commandFeedback;
context.getSource().sendFeedback(Text.of(consoleLog), false); broadcastToOP(consoleLog, context);
ConsoleMC.LOGGER.info(consoleLog); ConsoleMC.LOGGER.info(consoleLog);
} }
public static int toggleAllow(CommandContext<ServerCommandSource> context) { public static int enableCmdBlocks(CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Toggle Allow-CommandBlocks"); broadcastToOP("Enabled ConsoleMC in Commandblocks", context);
return 1;
}
public static int disableCmdBlocks(CommandContext<ServerCommandSource> context) {
broadcastToOP("Disabled ConsoleMC in Commandblocks", context);
return 1; return 1;
} }
public static int blacklistAdd(ServerPlayerEntity player, CommandContext<ServerCommandSource> context) { public static int blacklistAdd(ServerPlayerEntity player, CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Add " + player.toString() + " to the blacklist"); broadcastToOP("Added " + player.toString() + " to the ConsoleMC blacklist", context);
return 1; return 1;
} }
public static int blacklistRemove(ServerPlayerEntity player, CommandContext<ServerCommandSource> context) { public static int blacklistRemove(ServerPlayerEntity player, CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Remove " + player.toString() + " from the blacklist"); broadcastToOP("Removed " + player.toString() + " from the ConsoleMC blacklist", context);
return 1; return 1;
} }
public static int reloadCommands(CommandContext<ServerCommandSource> context) { public static int reloadCommands(CommandContext<ServerCommandSource> context) {
registerCommands(); registerCommands();
ConsoleMC.LOGGER.info("Reloaded Commands!"); broadcastToOP("DEBUG Reregistered /cmd command", context);
return 1; return 1;
} }
public static int setLevel(IntegerArgumentType level, CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Set Command OP Permission Level to: " + level.toString());
return 1;
}
public static int help() { public static int help() {
ConsoleMC.LOGGER.info("Print help"); ConsoleMC.LOGGER.info("Print help");
return 1; return 1;
} }
public static int reload(CommandContext<ServerCommandSource> context) { public static int reload(CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Reloading!"); broadcastToOP("Reloaded ConsoleMC Config", context);
return 1; return 1;
} }
public static int toggle(CommandContext<ServerCommandSource> context) { public static int enable(CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Toggle Enable"); broadcastToOP("Enabled ConsoleMC commands", context);
return 1; return 1;
} }
public static int disable(CommandContext<ServerCommandSource> context) {
public static int whitelistAdd(ServerPlayerEntity player, CommandContext<ServerCommandSource> context) { broadcastToOP("Disabled ConsoleMC commands", context);
ConsoleMC.LOGGER.info("Add " + player.toString() + " to whitelist");
return 1;
}
public static int whitelistRemove(ServerPlayerEntity player, CommandContext<ServerCommandSource> context) {
ConsoleMC.LOGGER.info("Remove " + player.toString() + " from whitelist");
return 1; return 1;
} }
} }