From ce071841a232feaf041c2a687559d2766a2da090 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Sat, 11 Dec 2021 19:35:35 +0100 Subject: [PATCH] fix an oopsie --- .../{chat => velocitychat}/VelocityChat.java | 20 +++++++++---------- .../commands/GlobalAdminChat.java | 4 ++-- .../commands/Reload.java | 12 ++--------- .../commands/SendMail.java | 4 ++-- .../data/ServerWrapper.java | 2 +- .../events/GlobalAdminChatEvent.java | 2 +- .../handlers/ChatHandler.java | 8 ++------ .../handlers/ServerHandler.java | 10 +++------- .../listeners/ChatListener.java | 6 +++--- .../listeners/PluginMessageListener.java | 6 ++---- .../listeners/ProxyPlayerListener.java | 8 ++++---- 11 files changed, 32 insertions(+), 50 deletions(-) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/VelocityChat.java (87%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/commands/GlobalAdminChat.java (95%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/commands/Reload.java (74%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/commands/SendMail.java (98%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/data/ServerWrapper.java (97%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/events/GlobalAdminChatEvent.java (93%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/handlers/ChatHandler.java (96%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/handlers/ServerHandler.java (87%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/listeners/ChatListener.java (91%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/listeners/PluginMessageListener.java (96%) rename velocity/src/main/java/com/alttd/{chat => velocitychat}/listeners/ProxyPlayerListener.java (96%) diff --git a/velocity/src/main/java/com/alttd/chat/VelocityChat.java b/velocity/src/main/java/com/alttd/velocitychat/VelocityChat.java similarity index 87% rename from velocity/src/main/java/com/alttd/chat/VelocityChat.java rename to velocity/src/main/java/com/alttd/velocitychat/VelocityChat.java index 3e1a4fe..f546334 100755 --- a/velocity/src/main/java/com/alttd/chat/VelocityChat.java +++ b/velocity/src/main/java/com/alttd/velocitychat/VelocityChat.java @@ -1,19 +1,20 @@ -package com.alttd.chat; +package com.alttd.velocitychat; -import com.alttd.chat.commands.GlobalAdminChat; -import com.alttd.chat.commands.Reload; +import com.alttd.chat.ChatAPI; +import com.alttd.chat.ChatImplementation; +import com.alttd.velocitychat.commands.GlobalAdminChat; +import com.alttd.velocitychat.commands.Reload; import com.alttd.chat.config.Config; import com.alttd.chat.database.DatabaseConnection; -import com.alttd.chat.handlers.ChatHandler; -import com.alttd.chat.handlers.ServerHandler; -import com.alttd.chat.listeners.ChatListener; -import com.alttd.chat.listeners.ProxyPlayerListener; -import com.alttd.chat.listeners.PluginMessageListener; +import com.alttd.velocitychat.handlers.ChatHandler; +import com.alttd.velocitychat.handlers.ServerHandler; +import com.alttd.velocitychat.listeners.ChatListener; +import com.alttd.velocitychat.listeners.ProxyPlayerListener; +import com.alttd.velocitychat.listeners.PluginMessageListener; import com.alttd.chat.util.ALogger; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.google.inject.Inject; -import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.plugin.Dependency; @@ -22,7 +23,6 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; -import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import org.slf4j.Logger; import java.io.File; diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java b/velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java similarity index 95% rename from velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java rename to velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java index 30b17bd..c865cc2 100755 --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/GlobalAdminChat.java @@ -1,6 +1,6 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.VelocityChat; +import com.alttd.velocitychat.VelocityChat; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/velocity/src/main/java/com/alttd/chat/commands/Reload.java b/velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java similarity index 74% rename from velocity/src/main/java/com/alttd/chat/commands/Reload.java rename to velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java index 348ca5f..930ac07 100755 --- a/velocity/src/main/java/com/alttd/chat/commands/Reload.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/Reload.java @@ -1,21 +1,13 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.VelocityChat; -import com.alttd.chat.config.Config; -import com.mojang.brigadier.arguments.StringArgumentType; +import com.alttd.velocitychat.VelocityChat; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.builder.RequiredArgumentBuilder; -import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.tree.LiteralCommandNode; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import java.util.ArrayList; -import java.util.Collection; - public class Reload { public Reload(ProxyServer proxyServer) { diff --git a/velocity/src/main/java/com/alttd/chat/commands/SendMail.java b/velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java similarity index 98% rename from velocity/src/main/java/com/alttd/chat/commands/SendMail.java rename to velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java index ba3ab4f..551e677 100755 --- a/velocity/src/main/java/com/alttd/chat/commands/SendMail.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/SendMail.java @@ -1,6 +1,6 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.VelocityChat; +import com.alttd.velocitychat.VelocityChat; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; diff --git a/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java b/velocity/src/main/java/com/alttd/velocitychat/data/ServerWrapper.java similarity index 97% rename from velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java rename to velocity/src/main/java/com/alttd/velocitychat/data/ServerWrapper.java index 1ce4531..518a844 100755 --- a/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java +++ b/velocity/src/main/java/com/alttd/velocitychat/data/ServerWrapper.java @@ -1,4 +1,4 @@ -package com.alttd.chat.data; +package com.alttd.velocitychat.data; import com.alttd.chat.config.ServerConfig; import com.alttd.chat.managers.ChatUserManager; diff --git a/velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java b/velocity/src/main/java/com/alttd/velocitychat/events/GlobalAdminChatEvent.java similarity index 93% rename from velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java rename to velocity/src/main/java/com/alttd/velocitychat/events/GlobalAdminChatEvent.java index b066e89..57c81a1 100755 --- a/velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java +++ b/velocity/src/main/java/com/alttd/velocitychat/events/GlobalAdminChatEvent.java @@ -1,4 +1,4 @@ -package com.alttd.chat.events; +package com.alttd.velocitychat.events; import com.velocitypowered.api.command.CommandSource; diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java similarity index 96% rename from velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java rename to velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java index cd2f750..2a7f43c 100755 --- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java +++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java @@ -1,20 +1,16 @@ -package com.alttd.chat.handlers; +package com.alttd.velocitychat.handlers; -import com.alttd.chat.VelocityChat; +import com.alttd.velocitychat.VelocityChat; import com.alttd.chat.config.Config; import com.alttd.chat.managers.ChatUserManager; import com.alttd.chat.managers.PartyManager; -import com.alttd.chat.managers.RegexManager; import com.alttd.chat.objects.ChatUser; -import com.alttd.chat.objects.Mail; import com.alttd.chat.objects.Party; import com.alttd.chat.util.ALogger; -import com.alttd.chat.util.Utility; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; -import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ServerConnection; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ServerHandler.java similarity index 87% rename from velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java rename to velocity/src/main/java/com/alttd/velocitychat/handlers/ServerHandler.java index 9fe9e0a..5295b2b 100755 --- a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java +++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ServerHandler.java @@ -1,19 +1,15 @@ -package com.alttd.chat.handlers; +package com.alttd.velocitychat.handlers; -import com.alttd.chat.VelocityChat; +import com.alttd.velocitychat.VelocityChat; import com.alttd.chat.config.ServerConfig; -import com.alttd.chat.data.ServerWrapper; +import com.alttd.velocitychat.data.ServerWrapper; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class ServerHandler { diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java similarity index 91% rename from velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java rename to velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java index aa2efdf..f607cbd 100755 --- a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java @@ -1,7 +1,7 @@ -package com.alttd.chat.listeners; +package com.alttd.velocitychat.listeners; -import com.alttd.chat.VelocityChat; -import com.alttd.chat.events.GlobalAdminChatEvent; +import com.alttd.velocitychat.VelocityChat; +import com.alttd.velocitychat.events.GlobalAdminChatEvent; import com.alttd.chat.config.Config; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.PostOrder; diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/PluginMessageListener.java similarity index 96% rename from velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java rename to velocity/src/main/java/com/alttd/velocitychat/listeners/PluginMessageListener.java index 63d3186..f4d2d8c 100755 --- a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java +++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/PluginMessageListener.java @@ -1,8 +1,7 @@ -package com.alttd.chat.listeners; +package com.alttd.velocitychat.listeners; -import com.alttd.chat.VelocityChat; +import com.alttd.velocitychat.VelocityChat; import com.alttd.chat.database.Queries; -import com.alttd.chat.managers.PartyManager; import com.alttd.chat.objects.channels.CustomChannel; import com.alttd.chat.util.ALogger; import com.google.common.io.ByteArrayDataInput; @@ -16,7 +15,6 @@ import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.server.RegisteredServer; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; -import java.util.Collection; import java.util.UUID; public class PluginMessageListener { diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java similarity index 96% rename from velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java rename to velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java index 60bd55f..b15f4cb 100755 --- a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java +++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java @@ -1,9 +1,9 @@ -package com.alttd.chat.listeners; +package com.alttd.velocitychat.listeners; -import com.alttd.chat.VelocityChat; +import com.alttd.velocitychat.VelocityChat; import com.alttd.chat.config.Config; -import com.alttd.chat.data.ServerWrapper; -import com.alttd.chat.handlers.ServerHandler; +import com.alttd.velocitychat.data.ServerWrapper; +import com.alttd.velocitychat.handlers.ServerHandler; import com.alttd.chat.managers.PartyManager; import com.alttd.chat.objects.Party; import com.google.common.io.ByteArrayDataOutput;