diff --git a/build-number.txt b/build-number.txt index daa7729f..3e19de01 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1552 \ No newline at end of file +1556 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java index 2d811d52..273e656b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java @@ -5,12 +5,11 @@ import org.geysermc.mcprotocollib.auth.GameProfile; import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.chat.ChatParser; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; -import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java index b0902f62..65c760ff 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.chatParsers; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.ChatParser; 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/chatParsers/MinecraftChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java index bb37cd08..29b7e805 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.chatParsers; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.chat.ChatParser; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java index 12de0d66..60cb8a47 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.chatParsers; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.chat.ChatParser; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java index 3e05898a..b91958e7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.command; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.StringUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java index 6874c305..9b09f7b1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/DiscordCommandContext.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.command; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.CodeBlockUtilities; import me.chayapak1.chomens_bot.util.ComponentUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java index 5990f446..ee02d205 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/IRCCommandContext.java @@ -4,12 +4,10 @@ import me.chayapak1.chomens_bot.util.UUIDUtilities; import org.geysermc.mcprotocollib.auth.GameProfile; import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; -import java.util.UUID; - public class IRCCommandContext extends CommandContext { private final Bot bot; private final String nickName; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java index 906a90b7..6ea19024 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/PlayerCommandContext.java @@ -1,6 +1,6 @@ package me.chayapak1.chomens_bot.command; -import me.chayapak1.chomens_bot.data.PlayerEntry; +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/ClearChatCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java index 68555e9a..37706d8c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java index ccf18e8e..56e524d5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.CommandLoop; +import me.chayapak1.chomens_bot.data.cloop.CommandLoop; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.JoinConfiguration; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java index 9819f9d9..644f4d2d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java index fee75f93..55a95989 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.FilteredPlayer; +import me.chayapak1.chomens_bot.data.filter.FilteredPlayer; import me.chayapak1.chomens_bot.plugins.DatabasePlugin; import me.chayapak1.chomens_bot.plugins.PlayerFilterPlugin; import me.chayapak1.chomens_bot.util.ColorUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java index 437b4168..8602b3e8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java @@ -6,7 +6,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java index b807c989..4b9e2539 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.exploitMethods.Kick; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java index d459f0b9..3edc4cb1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.JoinConfiguration; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java index 3ded9089..14e802b2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java @@ -5,8 +5,8 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.Mail; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.mail.Mail; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.plugins.DatabasePlugin; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java index 74d030d5..32b7a2d7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.MathUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java index 2f56598b..3d0f306b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java @@ -5,7 +5,7 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/BossBar.java b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java similarity index 95% rename from src/main/java/me/chayapak1/chomens_bot/data/BossBar.java rename to src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java index c6da8dca..72376ff2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/BossBar.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.bossbar; import org.geysermc.mcprotocollib.protocol.data.game.BossBarColor; import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/BotBossBar.java b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java similarity index 99% rename from src/main/java/me/chayapak1/chomens_bot/data/BotBossBar.java rename to src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java index a48fd8dd..48f4713c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/BotBossBar.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.bossbar; import me.chayapak1.chomens_bot.Bot; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java b/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java index 0e1a7348..43b84159 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java @@ -1,6 +1,6 @@ package me.chayapak1.chomens_bot.data.chat; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; public class PlayerMessage { diff --git a/src/main/java/me/chayapak1/chomens_bot/data/CommandLoop.java b/src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java similarity index 61% rename from src/main/java/me/chayapak1/chomens_bot/data/CommandLoop.java rename to src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java index bbb88af2..11d5bc18 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/CommandLoop.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.cloop; public record CommandLoop ( diff --git a/src/main/java/me/chayapak1/chomens_bot/data/Rotation.java b/src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java similarity index 57% rename from src/main/java/me/chayapak1/chomens_bot/data/Rotation.java rename to src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java index 2a2d9354..52912152 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/Rotation.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.entity; public record Rotation ( float yaw, diff --git a/src/main/java/me/chayapak1/chomens_bot/data/FilteredPlayer.java b/src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java similarity index 95% rename from src/main/java/me/chayapak1/chomens_bot/data/FilteredPlayer.java rename to src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java index d600e80b..3a57efe7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/FilteredPlayer.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/Mail.java b/src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java similarity index 95% rename from src/main/java/me/chayapak1/chomens_bot/data/Mail.java rename to src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java index 48382211..45225853 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/Mail.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.mail; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java b/src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java similarity index 97% rename from src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java rename to src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java index 3726ae27..d8d9668b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.player; import net.kyori.adventure.text.Component; import org.geysermc.mcprotocollib.auth.GameProfile; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/Team.java b/src/main/java/me/chayapak1/chomens_bot/data/team/Team.java similarity index 98% rename from src/main/java/me/chayapak1/chomens_bot/data/Team.java rename to src/main/java/me/chayapak1/chomens_bot/data/team/Team.java index f463b377..2521780f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/Team.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/team/Team.java @@ -1,4 +1,4 @@ -package me.chayapak1.chomens_bot.data; +package me.chayapak1.chomens_bot.data.team; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java index 3481bf95..a6607f44 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java @@ -3,7 +3,7 @@ package me.chayapak1.chomens_bot.evalFunctions; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.eval.EvalFunction; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java index d5347ad0..d8cea573 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java index e03a456d..6ed3196e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java @@ -1,9 +1,9 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.BossBar; -import me.chayapak1.chomens_bot.data.BotBossBar; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.bossbar.BossBar; +import me.chayapak1.chomens_bot.data.bossbar.BotBossBar; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import org.geysermc.mcprotocollib.network.Session; import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent; 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 abb786c1..4aacca4b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java @@ -2,7 +2,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.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; import me.chayapak1.chomens_bot.util.ComponentUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java index a852f952..90d35a42 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java @@ -5,8 +5,8 @@ import me.chayapak1.chomens_bot.chatParsers.CreayunChatParser; import me.chayapak1.chomens_bot.chatParsers.KaboomChatParser; import me.chayapak1.chomens_bot.chatParsers.MinecraftChatParser; import me.chayapak1.chomens_bot.chatParsers.U203aChatParser; -import me.chayapak1.chomens_bot.data.PlayerEntry; -import me.chayapak1.chomens_bot.data.Team; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; +import me.chayapak1.chomens_bot.data.team.Team; import me.chayapak1.chomens_bot.data.chat.ChatParser; 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/ClearChatNameAnnouncerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java index 33d15d0a..1e9a59d6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java index d2023f11..cb1dda43 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.CommandLoop; +import me.chayapak1.chomens_bot.data.cloop.CommandLoop; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java index 5725d059..b6af0263 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java index a0912d63..c5e09a3c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; import me.chayapak1.chomens_bot.util.ComponentUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java index 5caa008e..8406181a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.plugins; import com.google.common.hash.Hashing; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java index 840735ee..4a3be3bd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.plugins; import com.google.common.hash.Hashing; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java index d89f8955..0cb24311 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.LoggerUtilities; import java.sql.PreparedStatement; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java index 27f03ddd..52c3c788 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java @@ -2,8 +2,8 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.data.Mail; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.mail.Mail; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.LoggerUtilities; import net.kyori.adventure.text.Component; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java index 37bc4326..497a321d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java @@ -1,8 +1,8 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.BotBossBar; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.bossbar.BotBossBar; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.song.Loop; import me.chayapak1.chomens_bot.song.Note; import me.chayapak1.chomens_bot.song.Song; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java index 89c642f9..d277fe80 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java @@ -2,8 +2,8 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.data.FilteredPlayer; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.filter.FilteredPlayer; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.LoggerUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java index f8296fd0..970ed66a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.LoggerUtilities; import java.sql.PreparedStatement; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java index 6558048c..eaa07ae9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.plugins; import com.fasterxml.jackson.databind.JsonNode; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.JoinConfiguration; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java index 16a539a9..8fb8c220 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java @@ -1,8 +1,8 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; -import me.chayapak1.chomens_bot.data.Rotation; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; +import me.chayapak1.chomens_bot.data.entity.Rotation; import me.chayapak1.chomens_bot.util.MathUtilities; import org.cloudburstmc.math.vector.Vector3d; import org.cloudburstmc.math.vector.Vector3f; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java index 77361f02..49ff69b0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java @@ -7,7 +7,7 @@ import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.BotBossBar; +import me.chayapak1.chomens_bot.data.bossbar.BotBossBar; import me.chayapak1.chomens_bot.util.MathUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java index db5406f6..c85b43b3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.Team; +import me.chayapak1.chomens_bot.data.team.Team; import me.chayapak1.chomens_bot.util.UUIDUtilities; import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java index 09cb9c76..a6dd8814 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.Team; +import me.chayapak1.chomens_bot.data.team.Team; import org.geysermc.mcprotocollib.network.Session; import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; import org.geysermc.mcprotocollib.network.packet.Packet; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java index 16e1a907..7af17ea6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java index ab49c0a1..2fb20378 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.PlayerEntry; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import java.util.ArrayList; import java.util.List;