From 92c4726fcd50dfefb83cd7faf3ed6577d13a41f8 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Mon, 31 Mar 2025 09:03:32 +0700 Subject: [PATCH] refactor: move command contexts into a package --- build-number.txt | 2 +- .../me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java | 2 +- .../command/{ => contexts}/ChomeNSModCommandContext.java | 3 ++- .../command/{ => contexts}/ConsoleCommandContext.java | 3 ++- .../command/{ => contexts}/DiscordCommandContext.java | 3 ++- .../chomens_bot/command/{ => contexts}/IRCCommandContext.java | 3 ++- .../command/{ => contexts}/PlayerCommandContext.java | 3 ++- .../java/me/chayapak1/chomens_bot/commands/HelpCommand.java | 1 + .../java/me/chayapak1/chomens_bot/commands/MusicCommand.java | 1 + .../java/me/chayapak1/chomens_bot/commands/UrbanCommand.java | 1 + .../me/chayapak1/chomens_bot/commands/ValidateCommand.java | 2 ++ .../chomens_bot/plugins/ChatCommandHandlerPlugin.java | 2 +- .../chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java | 4 ++++ .../java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java | 2 +- .../java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java | 2 +- src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java | 2 +- 16 files changed, 25 insertions(+), 11 deletions(-) rename src/main/java/me/chayapak1/chomens_bot/command/{ => contexts}/ChomeNSModCommandContext.java (88%) rename src/main/java/me/chayapak1/chomens_bot/command/{ => contexts}/ConsoleCommandContext.java (86%) rename src/main/java/me/chayapak1/chomens_bot/command/{ => contexts}/DiscordCommandContext.java (96%) rename src/main/java/me/chayapak1/chomens_bot/command/{ => contexts}/IRCCommandContext.java (93%) rename src/main/java/me/chayapak1/chomens_bot/command/{ => contexts}/PlayerCommandContext.java (90%) diff --git a/build-number.txt b/build-number.txt index 05ab9b62..f8eec334 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2288 \ No newline at end of file +2290 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java index b34dc54b..0d843eb4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java @@ -4,7 +4,7 @@ import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.chomeNSMod.clientboundPackets.ClientboundCoreOutputPacket; import me.chayapak1.chomens_bot.chomeNSMod.serverboundPackets.ServerboundRunCommandPacket; import me.chayapak1.chomens_bot.chomeNSMod.serverboundPackets.ServerboundRunCoreCommandPacket; -import me.chayapak1.chomens_bot.command.ChomeNSModCommandContext; +import me.chayapak1.chomens_bot.command.contexts.ChomeNSModCommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/ChomeNSModCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java similarity index 88% rename from src/main/java/me/chayapak1/chomens_bot/command/ChomeNSModCommandContext.java rename to src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java index 77686e31..9b5e981e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/ChomeNSModCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java @@ -1,7 +1,8 @@ -package me.chayapak1.chomens_bot.command; +package me.chayapak1.chomens_bot.command.contexts; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.chomeNSMod.clientboundPackets.ClientboundCommandOutputPacket; +import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/ConsoleCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java similarity index 86% rename from src/main/java/me/chayapak1/chomens_bot/command/ConsoleCommandContext.java rename to src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java index 02e3567f..7fe9a1c4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/ConsoleCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java @@ -1,6 +1,7 @@ -package me.chayapak1.chomens_bot.command; +package me.chayapak1.chomens_bot.command.contexts; import me.chayapak1.chomens_bot.Bot; +import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.data.logging.LogType; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java similarity index 96% rename from src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java rename to src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java index 9b09f7b1..38b13dc5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java @@ -1,6 +1,7 @@ -package me.chayapak1.chomens_bot.command; +package me.chayapak1.chomens_bot.command.contexts; import me.chayapak1.chomens_bot.Bot; +import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.CodeBlockUtilities; import me.chayapak1.chomens_bot.util.ComponentUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java similarity index 93% rename from src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java rename to src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java index ee02d205..a4672248 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java @@ -1,5 +1,6 @@ -package me.chayapak1.chomens_bot.command; +package me.chayapak1.chomens_bot.command.contexts; +import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.util.UUIDUtilities; import org.geysermc.mcprotocollib.auth.GameProfile; import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java similarity index 90% rename from src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java rename to src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java index 6ea19024..f9c9f0a1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java @@ -1,5 +1,6 @@ -package me.chayapak1.chomens_bot.command; +package me.chayapak1.chomens_bot.command.contexts; +import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.Bot; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java index 24f97993..b2f1a682 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java @@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.commands; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.plugins.CommandHandlerPlugin; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java index ca9a787e..2c5d0854 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java @@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.commands; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.plugins.MusicPlayerPlugin; import me.chayapak1.chomens_bot.song.Instrument; import me.chayapak1.chomens_bot.song.Loop; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java index 9c2171ff..1694c749 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java @@ -7,6 +7,7 @@ import com.google.gson.JsonObject; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Main; import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.HttpUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java index 09f53e0a..36728505 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java @@ -1,6 +1,8 @@ package me.chayapak1.chomens_bot.commands; import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; +import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java index a9f14d1a..eefd6dcf 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.command.PlayerCommandContext; +import me.chayapak1.chomens_bot.command.contexts.PlayerCommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; import me.chayapak1.chomens_bot.util.ComponentUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java index e092fb26..c0ab9062 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java @@ -2,6 +2,10 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.contexts.ChomeNSModCommandContext; +import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; +import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; +import me.chayapak1.chomens_bot.command.contexts.PlayerCommandContext; import me.chayapak1.chomens_bot.commands.*; import me.chayapak1.chomens_bot.util.ExceptionUtilities; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java index 7c039b90..6a408017 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java @@ -4,7 +4,7 @@ import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Configuration; import me.chayapak1.chomens_bot.Main; import me.chayapak1.chomens_bot.command.Command; -import me.chayapak1.chomens_bot.command.ConsoleCommandContext; +import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentBuilder; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java index 1c3497cb..7083477f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java @@ -3,7 +3,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Configuration; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.command.DiscordCommandContext; +import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; import me.chayapak1.chomens_bot.util.CodeBlockUtilities; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.ComponentUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java index f4653de2..d82cd69b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java @@ -3,7 +3,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Configuration; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.command.IRCCommandContext; +import me.chayapak1.chomens_bot.command.contexts.IRCCommandContext; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.LoggerUtilities; import net.kyori.adventure.text.Component;