diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java
index b6dc68c..333b0ef 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java
@@ -9,7 +9,7 @@ public class Configuration {
public List<String> prefixes;
public List<String> commandSpyPrefixes;
- public ConsolePrefixes consolePrefixes = new ConsolePrefixes();
+ public String consoleCommandPrefix;
public Keys keys = new Keys();
@@ -35,11 +35,6 @@ public class Configuration {
public String address = "https://sus.red";
}
- public static class ConsolePrefixes {
- public String normalCommandsPrefix;
- public String consoleServerPrefix;
- }
-
public static class Keys {
public String normalKey;
public String ownerKey;
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/command/Command.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/command/Command.java
index 928744a..28dad88 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/command/Command.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/command/Command.java
@@ -8,19 +8,22 @@ public abstract class Command {
public final String[] usages;
public final String[] aliases;
public final TrustLevel trustLevel;
+ public final boolean consoleOnly;
public Command (
String name,
String description,
String[] usages,
String[] aliases,
- TrustLevel trustLevel
+ TrustLevel trustLevel,
+ boolean consoleOnly
) {
this.name = name;
this.description = description;
this.usages = usages;
this.aliases = aliases;
this.trustLevel = trustLevel;
+ this.consoleOnly = consoleOnly;
}
public abstract Component execute (CommandContext context, String[] args, String[] fullArgs) throws Exception;
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java
index 110c859..740b98b 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java
@@ -15,7 +15,8 @@ public class BotVisibilityCommand extends Command {
"Changes the bot's visibility",
new String[] { "<hash> <true|false>", "<hash> <on|off>", "<hash>" },
new String[] { "botvis", "togglevis", "togglevisibility" },
- TrustLevel.TRUSTED
+ TrustLevel.TRUSTED,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BruhifyCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BruhifyCommand.java
index 247a67d..c80475d 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BruhifyCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BruhifyCommand.java
@@ -13,7 +13,8 @@ public class BruhifyCommand extends Command {
"RecycleBots bruhify but actionbar",
new String[] { "[{message}]" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatCommand.java
index 753e772..aee9759 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatCommand.java
@@ -17,7 +17,8 @@ public class ClearChatCommand extends Command {
"Clears the chat",
new String[] { "[player]" },
new String[] { "cc" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatQueueCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatQueueCommand.java
index 830b6ae..5fc3c85 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatQueueCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ClearChatQueueCommand.java
@@ -16,7 +16,8 @@ public class ClearChatQueueCommand extends Command {
"Clears the bots chat queue",
new String[] {},
new String[] { "ccq" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java
index 506a60a..cc0d323 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java
@@ -21,7 +21,8 @@ public class CloopCommand extends Command {
"Loop commands",
new String[] { "<hash> add <interval> <{command}>", "<hash> remove <index>", "<hash> clear", "<hash> list" },
new String[] { "commandloop" },
- TrustLevel.TRUSTED
+ TrustLevel.TRUSTED,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CommandBlockCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CommandBlockCommand.java
index 148b276..23c6347 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CommandBlockCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CommandBlockCommand.java
@@ -20,7 +20,8 @@ public class CommandBlockCommand extends Command {
"Executes a command in the command core and return its output",
new String[] { "<{command}>" },
new String[] { "cmd", "commandblock", "run" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleServerCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleServerCommand.java
new file mode 100644
index 0000000..53c5dd0
--- /dev/null
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleServerCommand.java
@@ -0,0 +1,56 @@
+package land.chipmunk.chayapak.chomens_bot.commands;
+
+import land.chipmunk.chayapak.chomens_bot.Bot;
+import land.chipmunk.chayapak.chomens_bot.command.Command;
+import land.chipmunk.chayapak.chomens_bot.command.CommandContext;
+import land.chipmunk.chayapak.chomens_bot.command.TrustLevel;
+import land.chipmunk.chayapak.chomens_bot.util.ColorUtilities;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConsoleServerCommand extends Command {
+ public ConsoleServerCommand () {
+ super(
+ "consoleserver",
+ "Changes the console server",
+ new String[] { "<{server}>" },
+ new String[] { "csvr" },
+ TrustLevel.OWNER,
+ true
+ );
+ }
+
+ @Override
+ public Component execute(CommandContext context, String[] args, String[] fullArgs) {
+ final Bot bot = context.bot;
+
+ final List<String> servers = new ArrayList<>();
+
+ for (Bot eachBot : bot.bots) {
+ servers.add(eachBot.host + ":" + eachBot.port);
+ }
+
+ for (Bot eachBot : bot.bots) {
+ if (String.join(" ", args).equalsIgnoreCase("all")) {
+ eachBot.console.consoleServer = "all";
+ context.sendOutput(Component.text("Set the console server to all servers").color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)));
+ }
+
+ try {
+ // servers.find(server => server.toLowerCase().includes(args.join(' '))) in js i guess
+ eachBot.console.consoleServer = servers.stream()
+ .filter(server -> server.toLowerCase().contains(String.join(" ", args)))
+ .toArray(String[]::new)[0];
+
+ context.sendOutput(Component.text("Set the console server to " + String.join(", ", bot.console.consoleServer)).color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)));
+ } catch (ArrayIndexOutOfBoundsException e) {
+ return Component.text("Invalid server: " + String.join(" ", args)).color(NamedTextColor.RED);
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CowsayCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CowsayCommand.java
index 1776fcd..10c5530 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CowsayCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CowsayCommand.java
@@ -13,7 +13,8 @@ public class CowsayCommand extends Command {
"Moo",
new String[] { "<{message}>" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/DiscordCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/DiscordCommand.java
index f4b7a9c..0419b2d 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/DiscordCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/DiscordCommand.java
@@ -16,7 +16,8 @@ public class DiscordCommand extends Command {
"Shows the Discord invite",
new String[] {},
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EchoCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EchoCommand.java
index 35717bf..667ecda 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EchoCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EchoCommand.java
@@ -13,7 +13,8 @@ public class EchoCommand extends Command {
"Makes the bot say a message",
new String[] { "<{message}>" },
new String[] { "say" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EndCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EndCommand.java
index 6797d82..2ef5aa9 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EndCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EndCommand.java
@@ -13,7 +13,8 @@ public class EndCommand extends Command {
"End/Reconnects the bot",
new String[] { "<hash>" },
new String[] { "reconnect", "restart" },
- TrustLevel.TRUSTED
+ TrustLevel.TRUSTED,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EvalCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EvalCommand.java
index 580d927..057e1ec 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EvalCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/EvalCommand.java
@@ -19,7 +19,8 @@ public class EvalCommand extends Command {
"Evaluate JavaScript codes",
new String[] { "run <{code}>", "reset" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java
index 19596a2..2bf13dc 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java
@@ -32,7 +32,8 @@ public class FilterCommand extends Command {
"<hash> list"
},
new String[] { "filterplayer", "ban", "blacklist" },
- TrustLevel.TRUSTED
+ TrustLevel.TRUSTED,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java
index 217de9d..20c7464 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java
@@ -23,7 +23,8 @@ public class HelpCommand extends Command {
"Shows a command list or usage for a command",
new String[] { "[command]" },
new String[] { "heko", "cmds", "commands" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
@@ -68,7 +69,7 @@ public class HelpCommand extends Command {
List<String> commandNames = new ArrayList<>();
for (Command command : CommandHandlerPlugin.commands) {
- if (command.trustLevel != trustLevel) continue;
+ if (command.trustLevel != trustLevel || command.consoleOnly) continue;
commandNames.add(command.name);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java
index 860b9c1..b3c30f9 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java
@@ -37,7 +37,8 @@ public class InfoCommand extends Command {
"<uptime>"
},
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/KickCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/KickCommand.java
index 54cc5e3..ab77b81 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/KickCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/KickCommand.java
@@ -18,7 +18,8 @@ public class KickCommand extends Command {
"Kicks a player",
new String[] { "<hash> <{player}>" },
new String[] {},
- TrustLevel.TRUSTED
+ TrustLevel.TRUSTED,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ListCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ListCommand.java
index 20eb9e6..653f274 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ListCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ListCommand.java
@@ -22,7 +22,8 @@ public class ListCommand extends Command {
"Lists all players in the server (including vanished)",
new String[] {},
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java
index 9d92cc6..ca3a959 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java
@@ -37,7 +37,8 @@ public class MailCommand extends Command {
"Sends a mail",
new String[] { "send <player> <{message}>", "sendselecteditem <player>", "read" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
index 746d12e..f57b9c1 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
@@ -45,7 +45,8 @@ public class MusicCommand extends Command {
"info"
},
new String[] { "song" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/NetMessageCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/NetMessageCommand.java
index d7b6ebb..1ada31d 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/NetMessageCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/NetMessageCommand.java
@@ -18,7 +18,8 @@ public class NetMessageCommand extends Command {
"Broadcasts a message to all of the servers that the bot is connected",
new String[] { "<{message}>" },
new String[] { "networkmessage", "irc" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+ false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RandomTeleportCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RandomTeleportCommand.java
index e064e6e..d8e63d3 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RandomTeleportCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RandomTeleportCommand.java
@@ -17,7 +17,8 @@ public class RandomTeleportCommand extends Command {
"Randomly teleports you",
new String[] {},
new String[] { "randomteleport" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RefillCoreCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RefillCoreCommand.java
index 12b0884..694f46f 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RefillCoreCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/RefillCoreCommand.java
@@ -13,7 +13,8 @@ public class RefillCoreCommand extends Command {
"Refills and resets the bots command core",
new String[] {},
new String[] { "rc" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SeenCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SeenCommand.java
index 42a972a..ef6314e 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SeenCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SeenCommand.java
@@ -22,7 +22,8 @@ public class SeenCommand extends Command {
"Shows the last seen of a player",
new String[] { "<{player}>" },
new String[] { "lastseen" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerEvalCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerEvalCommand.java
index 1227c93..4766b76 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerEvalCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerEvalCommand.java
@@ -18,7 +18,8 @@ public class ServerEvalCommand extends Command {
"Evaluate codes using LuaJ",
new String[] { "<ownerHash> <{code}>" },
new String[] {},
- TrustLevel.OWNER
+ TrustLevel.OWNER,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java
index 54fb179..990248a 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java
@@ -15,7 +15,8 @@ public class TPSBarCommand extends Command {
"Shows the server's TPS using Minecraft Bossbar",
new String[] { "<on|off>" },
new String[] { "tps" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TestCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TestCommand.java
index 67eea81..3b24d5c 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TestCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TestCommand.java
@@ -13,7 +13,8 @@ public class TestCommand extends Command {
"Tests if the bot is working",
new String[] { "[{args}]" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TimeCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TimeCommand.java
index ce0515d..03866f6 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TimeCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TimeCommand.java
@@ -19,7 +19,8 @@ public class TimeCommand extends Command {
"Shows the date and time for the specified timezone",
new String[] { "<timezone>" },
new String[] { "dateandtime", "date" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TranslateCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TranslateCommand.java
index e74b070..a675604 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TranslateCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TranslateCommand.java
@@ -24,7 +24,8 @@ public class TranslateCommand extends Command {
"Translates a message using Google Translate",
new String[] { "<fromLanguage> <toLanguage> <{message}>" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UUIDCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UUIDCommand.java
index 4d0470f..b432e68 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UUIDCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UUIDCommand.java
@@ -18,7 +18,8 @@ public class UUIDCommand extends Command {
"Shows your UUID or other player's UUID",
new String[] { "[{username}]" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UrbanCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UrbanCommand.java
index f8bdacc..44df890 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UrbanCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/UrbanCommand.java
@@ -26,7 +26,8 @@ public class UrbanCommand extends Command {
"Urban Dictionary in Minecraft",
new String[] { "<{term}>" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ValidateCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ValidateCommand.java
index f61ddae..05c01b2 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ValidateCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ValidateCommand.java
@@ -14,7 +14,8 @@ public class ValidateCommand extends Command {
"Validates a hash",
new String[] { "<hash|ownerHash>" },
new String[] { "checkhash" },
- TrustLevel.TRUSTED
+ TrustLevel.TRUSTED,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WeatherCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WeatherCommand.java
index c223e13..cb062ce 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WeatherCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WeatherCommand.java
@@ -26,7 +26,8 @@ public class WeatherCommand extends Command {
"Shows the weather in a place",
new String[] { "<{location}>" },
new String[] {},
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WikipediaCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WikipediaCommand.java
index 5e1cd9e..24834a4 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WikipediaCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WikipediaCommand.java
@@ -22,7 +22,8 @@ public class WikipediaCommand extends Command {
"Wikipedia in Minecraft",
new String[] { "<{page}>" },
new String[] { "wiki" },
- TrustLevel.PUBLIC
+ TrustLevel.PUBLIC,
+false
);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java
index 803d499..2a0a93f 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java
@@ -57,6 +57,7 @@ public class CommandHandlerPlugin {
registerCommand(new SeenCommand());
registerCommand(new EvalCommand());
registerCommand(new InfoCommand());
+ registerCommand(new ConsoleServerCommand());
}
public static void registerCommand (Command command) {
@@ -147,6 +148,8 @@ public class CommandHandlerPlugin {
}
}
+ if (!console && command.consoleOnly) return Component.text("This command can only be ran via console").color(NamedTextColor.RED);
+
context.splitInput = splitInput;
try {
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java
index 764ebec..515ff18 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java
@@ -12,7 +12,6 @@ import org.jline.reader.LineReader;
import org.jline.reader.LineReaderBuilder;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
public class ConsolePlugin {
@@ -23,7 +22,6 @@ public class ConsolePlugin {
public String consoleServer = "all";
public String prefix;
- public String consoleServerPrefix;
private static final List<Listener> listeners = new ArrayList<>();
@@ -34,8 +32,7 @@ public class ConsolePlugin {
reader.option(LineReader.Option.DISABLE_EVENT_EXPANSION, true);
for (Bot bot : allBots) {
- prefix = bot.config.consolePrefixes.normalCommandsPrefix;
- consoleServerPrefix = bot.config.consolePrefixes.consoleServerPrefix;
+ prefix = bot.config.consoleCommandPrefix;
bot.console = this;
@@ -65,47 +62,6 @@ public class ConsolePlugin {
public void handleLine (String line) {
if (line == null) return;
- if (line.startsWith(consoleServerPrefix)) {
- final String substringLine = line.substring(consoleServerPrefix.length());
- final String[] splitInput = substringLine.split("\\s+");
-
- final String commandName = splitInput[0];
- final String[] args = Arrays.copyOfRange(splitInput, 1, splitInput.length);
-
- if (commandName.equals("csvr") || commandName.equals("consoleserver")) {
- final List<String> servers = new ArrayList<>();
-
- for (Bot bot : allBots) {
- servers.add(bot.host + ":" + bot.port);
- }
-
- for (Bot bot : allBots) {
- if (args.length == 0) {
- bot.logger.info("No server specified");
- return;
- }
-
- if (String.join(" ", args).equalsIgnoreCase("all")) {
- consoleServer = "all";
- bot.logger.info("Set the console server to all servers");
- return;
- }
- try {
- // servers.find(server => server.toLowerCase().includes(args.join(' '))) in js i guess
- consoleServer = servers.stream()
- .filter(server -> server.toLowerCase().contains(String.join(" ", args)))
- .toArray(String[]::new)[0];
-
- bot.logger.info("Set the console server to " + String.join(", ", consoleServer));
- } catch (ArrayIndexOutOfBoundsException e) {
- bot.logger.info("Invalid server: " + String.join(" ", args));
- }
- }
- }
-
- return;
- }
-
for (Bot bot : allBots) {
final String hostAndPort = bot.host + ":" + bot.port;
diff --git a/src/main/resources/default-config.yml b/src/main/resources/default-config.yml
index a6163d8..d53d2d6 100644
--- a/src/main/resources/default-config.yml
+++ b/src/main/resources/default-config.yml
@@ -7,9 +7,7 @@ prefixes:
commandSpyPrefixes:
- '/defaultcbot '
-consolePrefixes:
- normalCommandsPrefix: '.'
- consoleServerPrefix: '/'
+consoleCommandPrefix: '.'
internetCheck:
enabled: true