From c430cd894d2743af0ccba7c576539b2e3f322b1b Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Fri, 28 Apr 2023 18:10:47 +0700
Subject: [PATCH] revert commit
---
.idea/workspace.xml | 25 +++++++++++--------
.../chayapak/chomens_bot/command/Command.java | 22 ++++++----------
.../chomens_bot/commands/BotUserCommand.java | 12 ++++++---
.../commands/BotVisibilityCommand.java | 12 ++++++---
.../chomens_bot/commands/BruhifyCommand.java | 12 ++++++---
.../commands/ClearChatCommand.java | 12 ++++++---
.../commands/ClearChatQueueCommand.java | 12 ++++++---
.../chomens_bot/commands/CloopCommand.java | 12 ++++++---
.../commands/CommandBlockCommand.java | 12 ++++++---
.../chomens_bot/commands/CowsayCommand.java | 12 ++++++---
.../chomens_bot/commands/CreatorCommand.java | 12 ++++++---
.../chomens_bot/commands/DiscordCommand.java | 12 ++++++---
.../chomens_bot/commands/EchoCommand.java | 12 ++++++---
.../chomens_bot/commands/EndCommand.java | 12 ++++++---
.../chomens_bot/commands/FilterCommand.java | 12 ++++++---
.../commands/GenerateMazeCommand.java | 12 ++++++---
.../chomens_bot/commands/GrepLogCommand.java | 12 ++++++---
.../chomens_bot/commands/HelpCommand.java | 24 ++++++++++--------
.../chomens_bot/commands/KickCommand.java | 12 ++++++---
.../chomens_bot/commands/ListCommand.java | 12 ++++++---
.../chomens_bot/commands/MusicCommand.java | 14 +++++++----
.../commands/NetMessageCommand.java | 12 ++++++---
.../commands/RandomTeleportCommand.java | 12 ++++++---
.../commands/RefillCoreCommand.java | 12 ++++++---
.../commands/ServerEvalCommand.java | 12 ++++++---
.../commands/ServerInfoCommand.java | 12 ++++++---
.../chomens_bot/commands/SudoAllCommand.java | 12 ++++++---
.../chomens_bot/commands/TPSBarCommand.java | 12 ++++++---
.../chomens_bot/commands/TestCommand.java | 12 ++++++---
.../chomens_bot/commands/ThrowCommand.java | 12 ++++++---
.../chomens_bot/commands/TimeCommand.java | 12 ++++++---
.../commands/TranslateCommand.java | 12 ++++++---
.../chomens_bot/commands/UUIDCommand.java | 12 ++++++---
.../chomens_bot/commands/UrbanCommand.java | 12 ++++++---
.../chomens_bot/commands/ValidateCommand.java | 12 ++++++---
.../chomens_bot/commands/WeatherCommand.java | 12 ++++++---
.../commands/WikipediaCommand.java | 12 ++++++---
.../plugins/CommandHandlerPlugin.java | 16 ++++++------
.../plugins/CommandSuggestionPlugin.java | 4 +--
.../chomens_bot/util/ElementUtilities.java | 2 +-
40 files changed, 319 insertions(+), 184 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 18fbd831..1816f3bf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -43,6 +43,8 @@
+
+
@@ -61,6 +63,7 @@
+
@@ -134,6 +137,13 @@
1680245437032
+
+ 1682060041610
+
+
+
+ 1682060041611
+
1682073074933
@@ -470,14 +480,7 @@
1682673335876
-
- 1682676091534
-
-
-
- 1682676091535
-
-
+
@@ -516,8 +519,8 @@
-
-
+
+
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 c5750737..e548a93b 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
@@ -1,23 +1,15 @@
package land.chipmunk.chayapak.chomens_bot.command;
import net.kyori.adventure.text.Component;
-import org.apache.commons.lang3.RandomStringUtils;
-import java.util.Collections;
import java.util.List;
-public class Command {
- public String name = "unnamed" + RandomStringUtils.randomNumeric(4);
- public String description = "No Description";
- public List usage () {
- return Collections.emptyList();
- }
- public List alias () {
- return Collections.emptyList();
- }
- public int trustLevel = 0;
+public interface Command {
+ String name();
+ String description();
+ List usage();
+ List alias();
+ int trustLevel();
- public Component execute(CommandContext context, String[] args, String[] fullArgs) throws Exception {
- return null;
- }
+ Component execute(CommandContext context, String[] args, String[] fullArgs) throws Exception;
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotUserCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotUserCommand.java
index 053d104e..49aeb222 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotUserCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotUserCommand.java
@@ -11,10 +11,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class BotUserCommand extends Command {
- public String name = "botuser";
+public class BotUserCommand implements Command {
+ public String name() { return "botuser"; }
- public String description = "Shows the bot's username and UUID";
+ public String description() {
+ return "Shows the bot's username and UUID";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -30,7 +32,9 @@ public class BotUserCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 405671bb..50a7d051 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
@@ -9,10 +9,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class BotVisibilityCommand extends Command {
- public String name = "botvisibility";
+public class BotVisibilityCommand implements Command {
+ public String name() { return "botvisibility"; }
- public String description = "Changes the bot's visibility";
+ public String description() {
+ return "Changes the bot's visibility";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -32,7 +34,9 @@ public class BotVisibilityCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 59e23b10..a6fc094c 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
-public class BruhifyCommand extends Command {
- public String name = "bruhify";
+public class BruhifyCommand implements Command {
+ public String name() { return "bruhify"; }
- public String description = "RecycleBot bruhify but actionbar";
+ public String description() {
+ return "RecycleBot bruhify but actionbar";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class BruhifyCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 e2d96d89..e22e34c7 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
@@ -11,10 +11,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-public class ClearChatCommand extends Command {
- public String name = "clearchat";
+public class ClearChatCommand implements Command {
+ public String name() { return "clearchat"; }
- public String description = "Clears the chat";
+ public String description() {
+ return "Clears the chat";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -30,7 +32,9 @@ public class ClearChatCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 020b322f..b7a7d160 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
-public class ClearChatQueueCommand extends Command {
- public String name = "clearchatqueue";
+public class ClearChatQueueCommand implements Command {
+ public String name() { return "clearchatqueue"; }
- public String description = "Clears the bot's chat queue";
+ public String description() {
+ return "Clears the bot's chat queue";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class ClearChatQueueCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 b9da274b..b86eedaf 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
@@ -12,10 +12,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class CloopCommand extends Command {
- public String name = "cloop";
+public class CloopCommand implements Command {
+ public String name() { return "cloop"; }
- public String description = "Loop commands";
+ public String description() {
+ return "Loop commands";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -34,7 +36,9 @@ public class CloopCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 5cd7d309..5671405f 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
@@ -14,10 +14,12 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
-public class CommandBlockCommand extends Command {
- public String name = "cb";
+public class CommandBlockCommand implements Command {
+ public String name() { return "cb"; }
- public String description = "Executes a command in the command core and return it's output";
+ public String description() {
+ return "Executes a command in the command core and return it's output";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -35,7 +37,9 @@ public class CommandBlockCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) throws ExecutionException, InterruptedException {
final Bot bot = context.bot();
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 a8996039..df698b78 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
@@ -9,10 +9,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class CowsayCommand extends Command {
- public String name = "cowsay";
+public class CowsayCommand implements Command {
+ public String name() { return "cowsay"; }
- public String description = "Moo";
+ public String description() {
+ return "Moo";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -28,7 +30,9 @@ public class CowsayCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final String cow = args[0];
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CreatorCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CreatorCommand.java
index 6e7ccac7..16fcdf54 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CreatorCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CreatorCommand.java
@@ -9,10 +9,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class CreatorCommand extends Command {
- public String name = "creator";
+public class CreatorCommand implements Command {
+ public String name() { return "creator"; }
- public String description = "Shows the bot's creator";
+ public String description() {
+ return "Shows the bot's creator";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -28,7 +30,9 @@ public class CreatorCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 299183e7..c3733d87 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
@@ -9,10 +9,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class DiscordCommand extends Command {
- public String name = "discord";
+public class DiscordCommand implements Command {
+ public String name() { return "discord"; }
- public String description = "Shows the Discord invite";
+ public String description() {
+ return "Shows the Discord invite";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -28,7 +30,9 @@ public class DiscordCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final String link = "https://discord.gg/xdgCkUyaA4";
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 66d61508..8bb2087f 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
-public class EchoCommand extends Command {
- public String name = "echo";
+public class EchoCommand implements Command {
+ public String name() { return "echo"; }
- public String description = "Says a message";
+ public String description() {
+ return "Says a message";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class EchoCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 56f83c83..65a5ad61 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
-public class EndCommand extends Command {
- public String name = "end";
+public class EndCommand implements Command {
+ public String name() { return "end"; }
- public String description = "End/Restarts the bot";
+ public String description() {
+ return "End/Restarts the bot";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class EndCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 f5ae671a..b6446410 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
@@ -12,10 +12,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class FilterCommand extends Command {
- public String name = "filter";
+public class FilterCommand implements Command {
+ public String name() { return "filter"; }
- public String description = "Filter players";
+ public String description() {
+ return "Filter players";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -37,7 +39,9 @@ public class FilterCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
// most of these codes are from cloop and greplog
public Component execute(CommandContext context, String[] _args, String[] fullArgs) {
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GenerateMazeCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GenerateMazeCommand.java
index 7983c520..68c8abd3 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GenerateMazeCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GenerateMazeCommand.java
@@ -10,10 +10,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class GenerateMazeCommand extends Command {
- public String name = "generatemaze";
+public class GenerateMazeCommand implements Command {
+ public String name() { return "generatemaze"; }
- public String description = "Generates a maze";
+ public String description() {
+ return "Generates a maze";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -30,7 +32,9 @@ public class GenerateMazeCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java
index f32beae3..d63bd76a 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java
@@ -10,10 +10,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class GrepLogCommand extends Command {
- public String name = "greplog";
+public class GrepLogCommand implements Command {
+ public String name() { return "greplog"; }
- public String description = "Queries the bot's log files";
+ public String description() {
+ return "Queries the bot's log files";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -34,7 +36,9 @@ public class GrepLogCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] _args, String[] fullArgs) {
final Bot bot = context.bot();
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 651f14a4..7e495c3c 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
@@ -11,10 +11,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-public class HelpCommand extends Command {
- public String name = "help";
+public class HelpCommand implements Command {
+ public String name() { return "help"; }
- public String description = "Shows the help";
+ public String description() {
+ return "Shows the help";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -32,7 +34,9 @@ public class HelpCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
private Bot bot;
@@ -71,9 +75,9 @@ public class HelpCommand extends Command {
List commandNames = new ArrayList<>();
for (Command command : bot.commandHandler().commands()) {
- if (command.trustLevel != trustLevel) continue;
+ if (command.trustLevel() != trustLevel) continue;
- commandNames.add(command.name);
+ commandNames.add(command.name());
}
Collections.sort(commandNames);
@@ -100,9 +104,9 @@ public class HelpCommand extends Command {
final String prefix = context.prefix();
for (Command command : bot.commandHandler().commands()) {
- if (!command.name.equals(args[0]) && !command.alias().contains(args[0])) continue;
+ if (!command.name().equals(args[0]) && !command.alias().contains(args[0])) continue;
- final String commandName = command.name;
+ final String commandName = command.name();
final List usages = new ArrayList<>();
usages.add(
@@ -113,13 +117,13 @@ public class HelpCommand extends Command {
" (" + String.join(", ", command.alias()) + ")" :
""
))
- .append(Component.text(" - " + command.description).color(NamedTextColor.GRAY))
+ .append(Component.text(" - " + command.description()).color(NamedTextColor.GRAY))
);
usages.add(
Component.empty()
.append(Component.text("Trust level: ").color(NamedTextColor.GREEN))
- .append(Component.text(command.trustLevel).color(NamedTextColor.YELLOW))
+ .append(Component.text(command.trustLevel()).color(NamedTextColor.YELLOW))
);
for (String usage : command.usage()) {
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 190a3156..ffe390b4 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
@@ -11,10 +11,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-public class KickCommand extends Command {
- public String name = "kick";
+public class KickCommand implements Command {
+ public String name() { return "kick"; }
- public String description = "Kicks a player";
+ public String description() {
+ return "Kicks a player";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -30,7 +32,9 @@ public class KickCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 e825a67e..f24738f3 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
@@ -13,10 +13,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class ListCommand extends Command {
- public String name = "list";
+public class ListCommand implements Command {
+ public String name() { return "list"; }
- public String description = "Lists all players in the server (including vanished)";
+ public String description() {
+ return "Lists all players in the server (including vanished)";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -32,7 +34,9 @@ public class ListCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 4b6fef7c..13151c8d 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
@@ -21,12 +21,14 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-public class MusicCommand extends Command {
+public class MusicCommand implements Command {
private Path root;
- public String name = "music";
+ public String name() { return "music"; }
- public String description = "Plays music";
+ public String description() {
+ return "Plays music";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -54,7 +56,9 @@ public class MusicCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
root = Path.of(MusicPlayerPlugin.SONG_DIR.getPath());
@@ -241,7 +245,7 @@ public class MusicCommand extends Command {
.clickEvent(
ClickEvent.suggestCommand(
prefix +
- name + // command name !!!
+ name() +
(file.isFile() ? " play " : " list ") +
joinedPath
)
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 d0870706..f8298596 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
@@ -11,10 +11,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class NetMessageCommand extends Command {
- public String name = "netmsg";
+public class NetMessageCommand implements Command {
+ public String name() { return "netmsg"; }
- public String description = "Broadcasts a message to all of the servers that the bot is connected";
+ public String description() {
+ return "Broadcasts a message to all of the servers that the bot is connected";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -31,7 +33,9 @@ public class NetMessageCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 2c3fc227..c8975742 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
@@ -11,10 +11,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class RandomTeleportCommand extends Command {
- public String name = "rtp";
+public class RandomTeleportCommand implements Command {
+ public String name() { return "rtp"; }
- public String description = "Randomly teleports you";
+ public String description() {
+ return "Randomly teleports you";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -30,7 +32,9 @@ public class RandomTeleportCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 c1855e14..c86a0c8b 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
-public class RefillCoreCommand extends Command {
- public String name = "refillcore";
+public class RefillCoreCommand implements Command {
+ public String name() { return "refillcore"; }
- public String description = "Refills and resets the bot's command core";
+ public String description() {
+ return "Refills and resets the bot's command core";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class RefillCoreCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 5da3fffa..1d8d9135 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
@@ -11,10 +11,12 @@ import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import java.util.ArrayList;
import java.util.List;
-public class ServerEvalCommand extends Command {
- public String name = "servereval";
+public class ServerEvalCommand implements Command {
+ public String name() { return "servereval"; }
- public String description = "Evaluate codes using LuaJ";
+ public String description() {
+ return "Evaluate codes using LuaJ";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -30,7 +32,9 @@ public class ServerEvalCommand extends Command {
return aliases;
}
- public int trustLevel = 2;
+ public int trustLevel() {
+ return 2;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
try {
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerInfoCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerInfoCommand.java
index e20dca47..9041024a 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerInfoCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ServerInfoCommand.java
@@ -19,10 +19,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
-public class ServerInfoCommand extends Command {
- public String name = "serverinfo";
+public class ServerInfoCommand implements Command {
+ public String name() { return "serverinfo"; }
- public String description = "Shows the info about the server that is hosting the bot";
+ public String description() {
+ return "Shows the info about the server that is hosting the bot";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -38,7 +40,9 @@ public class ServerInfoCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
// totallynotskidded™ from extras' serverinfo
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SudoAllCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SudoAllCommand.java
index 30348bb4..304a8183 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SudoAllCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/SudoAllCommand.java
@@ -10,10 +10,12 @@ import java.util.ArrayList;
import java.util.List;
// ayunsudo renamed.
-public class SudoAllCommand extends Command {
- public String name = "sudoall";
+public class SudoAllCommand implements Command {
+ public String name() { return "sudoall"; }
- public String description = "Sudoes everyone";
+ public String description() {
+ return "Sudoes everyone";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -29,7 +31,9 @@ public class SudoAllCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 d780269f..c7dc1dda 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
@@ -9,10 +9,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class TPSBarCommand extends Command {
- public String name = "tpsbar";
+public class TPSBarCommand implements Command {
+ public String name() { return "tpsbar"; }
- public String description = "Shows the server's TPS using Minecraft Bossbar";
+ public String description() {
+ return "Shows the server's TPS using Minecraft Bossbar";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -28,7 +30,9 @@ public class TPSBarCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 ceb10971..c5c940f2 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class TestCommand extends Command {
- public String name = "test";
+public class TestCommand implements Command {
+ public String name() { return "test"; }
- public String description = "Tests if the bot is working";
+ public String description() {
+ return "Tests if the bot is working";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class TestCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
return Component.translatable(
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ThrowCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ThrowCommand.java
index 6b628ccf..5a9f637a 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ThrowCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ThrowCommand.java
@@ -7,10 +7,12 @@ import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
-public class ThrowCommand extends Command {
- public String name = "throw";
+public class ThrowCommand implements Command {
+ public String name() { return "throw"; }
- public String description = "A command to throw an error, kinda useless";
+ public String description() {
+ return "A command to throw an error, kinda useless";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -26,7 +28,9 @@ public class ThrowCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) throws Exception {
final String message = String.join(" ", args);
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 8f2655b0..980ae4d7 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
@@ -12,10 +12,12 @@ import org.joda.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
-public class TimeCommand extends Command {
- public String name = "time";
+public class TimeCommand implements Command {
+ public String name() { return "time"; }
- public String description = "Shows the date and time for the specified timezone";
+ public String description() {
+ return "Shows the date and time for the specified timezone";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -32,7 +34,9 @@ public class TimeCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final String timezone = args[0];
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 b2a018fa..400c3f2e 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
@@ -16,10 +16,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class TranslateCommand extends Command {
- public String name = "translate";
+public class TranslateCommand implements Command {
+ public String name() { return "translate"; }
- public String description = "Translate a message using Google Translate";
+ public String description() {
+ return "Translate a message using Google Translate";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -35,7 +37,9 @@ public class TranslateCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final String from = args[0];
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 36b26343..d4d74982 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
@@ -12,10 +12,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class UUIDCommand extends Command {
- public String name = "uuid";
+public class UUIDCommand implements Command {
+ public String name() { return "uuid"; }
- public String description = "Shows your UUID or other player's UUID";
+ public String description() {
+ return "Shows your UUID or other player's UUID";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -31,7 +33,9 @@ public class UUIDCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 0b6b0f1f..0ecf2fdb 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
@@ -16,10 +16,12 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-public class UrbanCommand extends Command {
- public String name = "urban";
+public class UrbanCommand implements Command {
+ public String name() { return "urban"; }
- public String description = "Urban Dictionary in Minecraft";
+ public String description() {
+ return "Urban Dictionary in Minecraft";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -35,7 +37,9 @@ public class UrbanCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute (CommandContext context, String[] args, String[] fullArgs) {
final String term = String.join(" ", args);
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 12e96ea7..9b643ccb 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
@@ -8,10 +8,12 @@ import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList;
import java.util.List;
-public class ValidateCommand extends Command {
- public String name = "validate";
+public class ValidateCommand implements Command {
+ public String name() { return "validate"; }
- public String description = "Validates a hash";
+ public String description() {
+ return "Validates a hash";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -27,7 +29,9 @@ public class ValidateCommand extends Command {
return aliases;
}
- public int trustLevel = 1;
+ public int trustLevel() {
+ return 1;
+ }
public Component execute(CommandContext context, String[] args, String[] fullArgs) {
final String hash = fullArgs[0];
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 4091c22a..74bfb407 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
@@ -19,10 +19,12 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-public class WeatherCommand extends Command {
- public String name = "weather";
+public class WeatherCommand implements Command {
+ public String name() { return "weather"; }
- public String description = "Shows the weather in a place";
+ public String description() {
+ return "Shows the weather in a place";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -38,7 +40,9 @@ public class WeatherCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute (CommandContext context, String[] args, String[] fullArgs) {
final Bot bot = context.bot();
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 d274fd2c..9cd4ef8f 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
@@ -15,10 +15,12 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-public class WikipediaCommand extends Command {
- public String name = "wikipedia";
+public class WikipediaCommand implements Command {
+ public String name() { return "wikipedia"; }
- public String description = "Wikipedia in Minecraft";
+ public String description() {
+ return "Wikipedia in Minecraft";
+ }
public List usage() {
final List usages = new ArrayList<>();
@@ -34,7 +36,9 @@ public class WikipediaCommand extends Command {
return aliases;
}
- public int trustLevel = 0;
+ public int trustLevel() {
+ return 0;
+ }
public Component execute (CommandContext context, String[] args, String[] fullArgs) {
final String page = String.join(" ", args);
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 352d73ee..18b0bdb6 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
@@ -81,13 +81,13 @@ public class CommandHandlerPlugin {
if (command == null) return Component.text("Unknown command: " + commandName).color(NamedTextColor.RED);
- final int trustLevel = command.trustLevel;
+ final int trustLevel = command.trustLevel();
final String[] fullArgs = Arrays.copyOfRange(splitInput, 1, splitInput.length);
final int longestUsageIndex = getLongestUsageIndex(command.usage());
final String usage = command.usage().get(longestUsageIndex);
- final int minimumArgs = getMinimumArgs(usage, inGame, command.trustLevel);
- final int maximumArgs = getMaximumArgs(usage, inGame, command.trustLevel);
+ final int minimumArgs = getMinimumArgs(usage, inGame, command.trustLevel());
+ final int maximumArgs = getMaximumArgs(usage, inGame, command.trustLevel());
if (fullArgs.length < minimumArgs) return Component.text("Excepted minimum of " + minimumArgs + " argument(s), got " + fullArgs.length).color(NamedTextColor.RED);
if (fullArgs.length > maximumArgs && !usage.contains("{")) return Component.text("Too much arguments, expected " + maximumArgs + " max").color(NamedTextColor.RED);
@@ -98,7 +98,7 @@ public class CommandHandlerPlugin {
final String[] args = Arrays.copyOfRange(splitInput, (trustLevel > 0 && inGame) ? 2 : 1, splitInput.length);
- if (command.trustLevel > 0 && !console) {
+ if (command.trustLevel() > 0 && !console) {
if (discord) {
final List roles = event.getMember().getRoles();
@@ -106,24 +106,24 @@ public class CommandHandlerPlugin {
final String adminRoleName = bot.config().discord().adminRoleName();
if (
- command.trustLevel == 1 &&
+ command.trustLevel() == 1 &&
roles.stream().noneMatch(role -> role.getName().equalsIgnoreCase(trustedRoleName)) &&
roles.stream().noneMatch(role -> role.getName().equalsIgnoreCase(adminRoleName))
) return Component.text("You're not in the trusted role!").color(NamedTextColor.RED);
if (
- command.trustLevel == 2 &&
+ command.trustLevel() == 2 &&
roles.stream().noneMatch(role -> role.getName().equalsIgnoreCase(adminRoleName))
) return Component.text("You're not in the admin role!").color(NamedTextColor.RED);
} else {
if (
- command.trustLevel == 1 &&
+ command.trustLevel() == 1 &&
!userHash.equals(hash) &&
!userHash.equals(ownerHash)
) return Component.text("Invalid hash").color(NamedTextColor.RED);
if (
- command.trustLevel == 2 &&
+ command.trustLevel() == 2 &&
!userHash.equals(ownerHash)
) return Component.text("Invalid OwnerHash").color(NamedTextColor.RED);
}
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandSuggestionPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandSuggestionPlugin.java
index 2a4cfd1f..2b6b98d6 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandSuggestionPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandSuggestionPlugin.java
@@ -48,9 +48,9 @@ public class CommandSuggestionPlugin extends ChatPlugin.ChatListener {
output.add(Component.text(transactionId));
for (Command command : bot.commandHandler().commands()) {
- if (!command.name.startsWith(input)) continue;
+ if (!command.name().startsWith(input)) continue;
- output.add(Component.text(command.name));
+ output.add(Component.text(command.name()));
}
bot.chat().tellraw(Component.join(JoinConfiguration.noSeparators(), output), player);
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/util/ElementUtilities.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/util/ElementUtilities.java
index 48d46e84..03b5f901 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/util/ElementUtilities.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/util/ElementUtilities.java
@@ -9,7 +9,7 @@ public class ElementUtilities {
for (Command command : commands) {
if (
(
- command.name.equals(searchTerm.toLowerCase()) ||
+ command.name().equals(searchTerm.toLowerCase()) ||
command.alias().contains(searchTerm.toLowerCase())
) &&
!searchTerm.equals("") // ig yup