From eb961b10a004633dce28ef852fadabfb5bd27c37 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Tue, 26 Jul 2022 20:03:20 +0200 Subject: [PATCH] Introduced new execution system and nerfed command commands will now be executed on the shell the cmd command can now only do one thing: run commands. changing the settings is no longer possible as it could be a security risk. --- .../consolemc/command/RunCommand.class | Bin 9838 -> 6287 bytes .../consolemc/system/ShellCommand.class | Bin 3559 -> 2905 bytes .../consolemc/command/RunCommand.java | 93 +----------------- 3 files changed, 2 insertions(+), 91 deletions(-) diff --git a/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class b/production/ConsoleMC.main/me/jonasjones/consolemc/command/RunCommand.class index d6e1646c9194752e99d6426d89e8a82502c7b856..31939416848e6397804fba0b4802b49dbccd10bb 100644 GIT binary patch delta 1840 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 a^t9NRerDWhD4TlZ}JxJ5dH^70qMp7 delta 1409 zcmZuxTT@$A6#jP3$=Ts>fRJ#f!4@JyxCAtyh0@wPD3{uBF)daP;S^FJiQz!Owo)&( z-ZkCcT3c=F13EfP+lQpWXkVN@IQ{`2eez9xbq1~LoNCL1lgVCtUBA7)wUVDpeyvo0 z{Co9#0A2VZt%m&WWBR-voYvzL!NJLtp^tmWr)tQB#vrBU;tWG#UD+|vS>Jm<^x#}P zu8&O{ohmr;H8@egP+IqY5%t4XOrZu36b9$4si#biqVzUjO$oyW_^_FZ#V1sFQDzk^ zXDF#VEUrmKc{!-WCJvv5Dm;+B)b88Dz@szc&BlV^LJfl>7`5^q)KH6u(tm8PsArJJ z^w~)l8pzvZdz-8$G>ZeQg0+Y#R>>X~XIWKl2yGng8Xm=C;u_oOYDI?y-zolNK35Q3 zma<(`Im$?RT*FT665AdA+&$RKu}{N(bc-3s#p)2A(C{RB>1D_Dn7J>JBKqp;d#tzj zYZ$-*(I9PhF&xwo#-IpGq1<7Na6GLcf~*(F+)Q{s2!Op$w9pBWq1{lsf@&NTcjjJl=aOP%$@qTJahPB{C8q%;@i z*?4_=a?siWj@QI3rA3&$ZO>aO-o`r|?`n7t?=w{2Uz%8aJ~3qkdu@z9!_<%JQ8STR zWXPS_sQn~<;bY>aD^D3*Od6fNV#Vci*rHUnEMnBdQ0SZ_El84) zbOy3u*XiOwj84l9XgFq{b^xX@O74&xaDuiEiKu# z@(B{ir%y8q3DBxpayO5*I6)d{rIUD`FjI8bY;4OiOE;4&4$Qe#t98-|m))WUIN4X$ z;EhP%p*V}uz8k1G4_~7~YDDsE4o76qQgt}u41_cAk1V6&KUbaQ3f%KFX3*HbhG1k3 zt&ye-9?4>B7TY@Hayf$?kq+l={!#VNc<^SMIyC7h 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; - } }