From 9d3b0ea0cd3e1d801c612c5745498ddafbe1a0fc Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 22 Jun 2024 12:25:03 +0200 Subject: [PATCH] Chat, Softreload, Renaming package Signed-off-by: Lixfel --- Persistent/build.gradle | 11 - .../de/steamwar/bungeecore/Arenaserver.java | 18 -- .../de/steamwar/bungeecore/Persistent.java | 81 ------- .../de/steamwar/bungeecore/Servertype.java | 26 --- .../de/steamwar/persistent/Arenaserver.java | 37 ++++ .../{bungeecore => persistent}/Bauserver.java | 38 ++-- .../Builderserver.java | 36 ++-- .../de/steamwar/persistent/Persistent.java | 203 ++++++++++++++++++ .../de/steamwar/persistent/Reflection.java | 75 +++++++ .../steamwar/persistent/ReloadablePlugin.java | 28 +++ .../de/steamwar/persistent/Servertype.java | 26 +++ .../{bungeecore => persistent}/Storage.java | 38 ++-- .../{bungeecore => persistent}/Subserver.java | 44 ++-- src/de/steamwar/bungeecore/Reflection.java | 115 ---------- src/de/steamwar/bungeecore/util/Chat19.java | 41 ---- src/de/steamwar/command/SWCommand.java | 6 +- src/de/steamwar/command/TypeUtils.java | 6 +- src/de/steamwar/messages/Chatter.java | 6 +- src/de/steamwar/sql/SQLConfigImpl.java | 2 +- src/de/steamwar/sql/SQLWrapperImpl.java | 6 +- .../ArenaMode.java | 2 +- .../Broadcaster.java | 2 +- .../{bungeecore => velocitycore}/Config.java | 2 +- .../ErrorLogger.java | 22 +- .../EventStarter.java | 5 +- .../GameModeConfig.java | 2 +- .../{bungeecore => velocitycore}/Node.java | 2 +- .../ServerStarter.java | 6 +- .../ServerVersion.java | 2 +- .../SubserverSystem.java | 7 +- .../VelocityCore.java | 49 +++-- .../commands/AlertCommand.java | 4 +- .../commands/ArenaCommand.java | 9 +- .../commands/BauCommand.java | 19 +- .../commands/BugCommand.java | 2 +- .../commands/BuilderCloudCommand.java | 11 +- .../commands/ChallengeCommand.java | 12 +- .../commands/CheckCommand.java | 12 +- .../commands/DevCommand.java | 4 +- .../commands/EventCommand.java | 8 +- .../commands/EventRescheduleCommand.java | 2 +- .../commands/EventreloadCommand.java | 2 +- .../commands/FightCommand.java | 11 +- .../commands/GDPRQuery.java | 4 +- .../commands/HelpCommand.java | 2 +- .../commands/HistoricCommand.java | 6 +- .../commands/IgnoreCommand.java | 2 +- .../commands/JoinmeCommand.java | 2 +- .../commands/KickCommand.java | 2 +- .../commands/ListCommand.java | 8 +- .../commands/LocalCommand.java | 4 +- .../commands/ModCommand.java | 11 +- .../commands/MsgCommand.java | 6 +- .../commands/PingCommand.java | 2 +- .../commands/PlaytimeCommand.java | 2 +- .../commands/PollCommand.java | 4 +- .../commands/PollresultCommand.java | 4 +- .../commands/PunishmentCommand.java | 6 +- .../commands/RCommand.java | 4 +- .../commands/RankCommand.java | 4 +- .../commands/ReplayCommand.java | 13 +- .../commands/RulesCommand.java | 2 +- .../commands/ServerSwitchCommand.java | 4 +- .../commands/ServerTeamchatCommand.java | 4 +- .../commands/SetLocaleCommand.java | 4 +- .../commands/StatCommand.java | 4 +- .../commands/TeamCommand.java | 14 +- .../commands/TeamchatCommand.java | 4 +- .../commands/TpCommand.java | 14 +- .../commands/TutorialCommand.java | 20 +- .../commands/TypeMappers.java | 4 +- .../commands/UnIgnoreCommand.java | 2 +- .../commands/VerifyCommand.java | 6 +- .../commands/WebpasswordCommand.java | 2 +- .../commands/WhoisCommand.java | 8 +- .../discord/DiscordBot.java | 16 +- .../discord/DiscordConfig.java | 6 +- .../discord/DiscordTicketType.java | 2 +- .../discord/channels/ChecklistChannel.java | 4 +- .../discord/channels/DiscordChannel.java | 6 +- .../discord/channels/DiscordChatRoom.java | 4 +- .../discord/channels/EventChannel.java | 2 +- .../discord/channels/InteractionReply.java | 2 +- .../channels/StaticMessageChannel.java | 2 +- .../discord/listeners/ChannelListener.java | 8 +- .../discord/listeners/DiscordSchemUpload.java | 6 +- .../discord/listeners/DiscordTeamEvent.java | 8 +- .../listeners/DiscordTicketHandler.java | 10 +- .../discord/util/AuthManager.java | 6 +- .../discord/util/DiscordAlert.java | 6 +- .../discord/util/DiscordRanks.java | 4 +- .../inventory/InvCallback.java | 2 +- .../inventory/SWInventory.java | 6 +- .../inventory/SWItem.java | 2 +- .../inventory/SWListInv.java | 2 +- .../inventory/SWStreamInv.java | 2 +- .../listeners/BanListener.java | 6 +- .../listeners/BasicListener.java | 4 +- .../listeners/ChatListener.java | 23 +- .../listeners/CheckListener.java | 10 +- .../listeners/ConnectionListener.java | 22 +- .../listeners/EventModeListener.java | 2 +- .../listeners/IPSanitizer.java | 10 +- .../listeners/PluginMessage.java | 10 +- .../listeners/PollSystem.java | 6 +- .../listeners/SessionManager.java | 6 +- .../listeners/SettingsChangedListener.java | 6 +- .../mods/Badlion.java | 2 +- .../mods/Controlify.java | 4 +- .../mods/FML.java | 6 +- .../mods/FML2.java | 8 +- .../mods/FabricModSender.java | 8 +- .../mods/Feather.java | 2 +- .../mods/Hostname.java | 12 +- .../mods/LabyMod.java | 6 +- .../mods/Lunar.java | 4 +- .../mods/ModUtils.java | 6 +- .../mods/ReplayMod.java | 14 +- .../mods/Schematica.java | 4 +- .../mods/ServerListPing.java | 2 +- .../mods/WorldDownloader.java | 4 +- .../network/NetworkSender.java | 2 +- .../network/ServerMetaInfo.java | 2 +- .../network/handlers/EloPlayerHandler.java | 6 +- .../network/handlers/EloSchemHandler.java | 4 +- .../handlers/ExecuteCommandHandler.java | 4 +- .../network/handlers/FightInfoHandler.java | 8 +- .../network/handlers/ImALobbyHandler.java | 4 +- .../handlers/InventoryCallbackHandler.java | 10 +- .../network/handlers/PrepareSchemHandler.java | 8 +- .../tablist/Tablist.java | 6 +- .../tablist/TablistBuild.java | 9 +- .../tablist/TablistGroup.java | 2 +- .../tablist/TablistManager.java | 12 +- .../tablist/TablistPart.java | 2 +- .../tablist/TablistServer.java | 9 +- .../util/BauLock.java | 2 +- .../util/BauLockState.java | 2 +- 138 files changed, 850 insertions(+), 753 deletions(-) delete mode 100644 Persistent/src/de/steamwar/bungeecore/Arenaserver.java delete mode 100644 Persistent/src/de/steamwar/bungeecore/Persistent.java delete mode 100644 Persistent/src/de/steamwar/bungeecore/Servertype.java create mode 100644 Persistent/src/de/steamwar/persistent/Arenaserver.java rename Persistent/src/de/steamwar/{bungeecore => persistent}/Bauserver.java (58%) rename Persistent/src/de/steamwar/{bungeecore => persistent}/Builderserver.java (58%) create mode 100644 Persistent/src/de/steamwar/persistent/Persistent.java create mode 100644 Persistent/src/de/steamwar/persistent/Reflection.java create mode 100644 Persistent/src/de/steamwar/persistent/ReloadablePlugin.java create mode 100644 Persistent/src/de/steamwar/persistent/Servertype.java rename Persistent/src/de/steamwar/{bungeecore => persistent}/Storage.java (60%) rename Persistent/src/de/steamwar/{bungeecore => persistent}/Subserver.java (88%) delete mode 100644 src/de/steamwar/bungeecore/Reflection.java delete mode 100644 src/de/steamwar/bungeecore/util/Chat19.java rename src/de/steamwar/{bungeecore => velocitycore}/ArenaMode.java (99%) rename src/de/steamwar/{bungeecore => velocitycore}/Broadcaster.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/Config.java (99%) rename src/de/steamwar/{bungeecore => velocitycore}/ErrorLogger.java (80%) rename src/de/steamwar/{bungeecore => velocitycore}/EventStarter.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/GameModeConfig.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/Node.java (99%) rename src/de/steamwar/{bungeecore => velocitycore}/ServerStarter.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/ServerVersion.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/SubserverSystem.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/VelocityCore.java (90%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/AlertCommand.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ArenaCommand.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/BauCommand.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/BugCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/BuilderCloudCommand.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ChallengeCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/CheckCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/DevCommand.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/EventCommand.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/EventRescheduleCommand.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/EventreloadCommand.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/FightCommand.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/GDPRQuery.java (99%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/HelpCommand.java (99%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/HistoricCommand.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/IgnoreCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/JoinmeCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/KickCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ListCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/LocalCommand.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ModCommand.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/MsgCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/PingCommand.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/PlaytimeCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/PollCommand.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/PollresultCommand.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/PunishmentCommand.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/RCommand.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/RankCommand.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ReplayCommand.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/RulesCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ServerSwitchCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/ServerTeamchatCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/SetLocaleCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/StatCommand.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/TeamCommand.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/TeamchatCommand.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/TpCommand.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/TutorialCommand.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/TypeMappers.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/UnIgnoreCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/VerifyCommand.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/WebpasswordCommand.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/commands/WhoisCommand.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/DiscordBot.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/DiscordConfig.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/DiscordTicketType.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/channels/ChecklistChannel.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/channels/DiscordChannel.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/channels/DiscordChatRoom.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/channels/EventChannel.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/channels/InteractionReply.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/channels/StaticMessageChannel.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/listeners/ChannelListener.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/listeners/DiscordSchemUpload.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/listeners/DiscordTeamEvent.java (90%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/listeners/DiscordTicketHandler.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/util/AuthManager.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/util/DiscordAlert.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/discord/util/DiscordRanks.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/inventory/InvCallback.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/inventory/SWInventory.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/inventory/SWItem.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/inventory/SWListInv.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/inventory/SWStreamInv.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/BanListener.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/BasicListener.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/ChatListener.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/CheckListener.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/ConnectionListener.java (87%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/EventModeListener.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/IPSanitizer.java (88%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/PluginMessage.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/PollSystem.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/SessionManager.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/listeners/SettingsChangedListener.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/Badlion.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/Controlify.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/FML.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/FML2.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/FabricModSender.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/Feather.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/Hostname.java (90%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/LabyMod.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/Lunar.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/ModUtils.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/ReplayMod.java (88%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/Schematica.java (94%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/ServerListPing.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/mods/WorldDownloader.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/network/NetworkSender.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/network/ServerMetaInfo.java (95%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/EloPlayerHandler.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/EloSchemHandler.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/ExecuteCommandHandler.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/FightInfoHandler.java (89%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/ImALobbyHandler.java (91%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/InventoryCallbackHandler.java (90%) rename src/de/steamwar/{bungeecore => velocitycore}/network/handlers/PrepareSchemHandler.java (88%) rename src/de/steamwar/{bungeecore => velocitycore}/tablist/Tablist.java (99%) rename src/de/steamwar/{bungeecore => velocitycore}/tablist/TablistBuild.java (92%) rename src/de/steamwar/{bungeecore => velocitycore}/tablist/TablistGroup.java (97%) rename src/de/steamwar/{bungeecore => velocitycore}/tablist/TablistManager.java (93%) rename src/de/steamwar/{bungeecore => velocitycore}/tablist/TablistPart.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/tablist/TablistServer.java (96%) rename src/de/steamwar/{bungeecore => velocitycore}/util/BauLock.java (98%) rename src/de/steamwar/{bungeecore => velocitycore}/util/BauLockState.java (97%) diff --git a/Persistent/build.gradle b/Persistent/build.gradle index 87f4fe9..12f875c 100644 --- a/Persistent/build.gradle +++ b/Persistent/build.gradle @@ -44,15 +44,6 @@ sourceSets { } } -repositories { - maven { - url = 'https://repo.fvdh.dev/releases' - content { - includeGroup 'net.frankheijden.serverutils' - } - } -} - dependencies { compileOnly 'org.projectlombok:lombok:1.18.32' testCompileOnly 'org.projectlombok:lombok:1.18.32' @@ -61,6 +52,4 @@ dependencies { compileOnly 'de.steamwar:velocity:RELEASE' annotationProcessor 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT' - - compileOnly 'net.frankheijden.serverutils:ServerUtils:3.5.4' } diff --git a/Persistent/src/de/steamwar/bungeecore/Arenaserver.java b/Persistent/src/de/steamwar/bungeecore/Arenaserver.java deleted file mode 100644 index 37bd9db..0000000 --- a/Persistent/src/de/steamwar/bungeecore/Arenaserver.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.steamwar.bungeecore; - -import lombok.Getter; - -@Getter -public class Arenaserver extends Subserver { - - private final String mode; - private final String map; - private final boolean allowMerge; - - public Arenaserver(String serverName, String mode, String map, boolean allowMerge, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) { - super(Servertype.ARENA, serverName, port, processBuilder, shutdownCallback, null); - this.mode = mode; - this.map = map; - this.allowMerge = allowMerge; - } -} diff --git a/Persistent/src/de/steamwar/bungeecore/Persistent.java b/Persistent/src/de/steamwar/bungeecore/Persistent.java deleted file mode 100644 index 335e972..0000000 --- a/Persistent/src/de/steamwar/bungeecore/Persistent.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - This file is a part of the SteamWar software. - - Copyright (C) 2020 SteamWar.de-Serverteam - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package de.steamwar.bungeecore; - -import com.google.inject.Inject; -import com.velocitypowered.api.command.BrigadierCommand; -import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; -import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; -import com.velocitypowered.api.plugin.Dependency; -import com.velocitypowered.api.plugin.Plugin; -import com.velocitypowered.api.plugin.annotation.DataDirectory; -import com.velocitypowered.api.proxy.ProxyServer; -import lombok.Getter; -import net.frankheijden.serverutils.velocity.ServerUtils; - -import java.nio.file.Path; -import java.util.logging.Logger; - -@Plugin( - id = "persistentvelocitycore", - name = "PersistentVelocityCore", - dependencies = { @Dependency(id = "serverutils") } -) -public class Persistent { - - @Getter - private static Persistent instance; - - @Inject - public Persistent(ProxyServer proxyServer, Logger logger, @DataDirectory Path dataDirectory) { - instance = this; - this.proxyServer = proxyServer; - this.logger = logger; - } - - @Getter - private final ProxyServer proxyServer; - - @Getter - private final Logger logger; - - @Subscribe - public void onEnable(ProxyInitializeEvent event) { - proxyServer.getCommandManager().register( - new BrigadierCommand( - BrigadierCommand.literalArgumentBuilder("softreload") - .requires(commandSource -> commandSource.hasPermission("bungeecore.softreload")) - .executes(commandContext -> softreload()) - .build() - ) - ); - } - - @Subscribe - public void onDisable(ProxyShutdownEvent event) { - Subserver.shutdown(); - } - - public int softreload() { - ServerUtils.getInstance().getPlugin().getPluginManager().reloadPlugin("VelocityCore"); - return 1; - } -} diff --git a/Persistent/src/de/steamwar/bungeecore/Servertype.java b/Persistent/src/de/steamwar/bungeecore/Servertype.java deleted file mode 100644 index 06e6663..0000000 --- a/Persistent/src/de/steamwar/bungeecore/Servertype.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - This file is a part of the SteamWar software. - - Copyright (C) 2020 SteamWar.de-Serverteam - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package de.steamwar.bungeecore; - -public enum Servertype { - BAUSERVER, - ARENA, - BUILDER -} diff --git a/Persistent/src/de/steamwar/persistent/Arenaserver.java b/Persistent/src/de/steamwar/persistent/Arenaserver.java new file mode 100644 index 0000000..c283090 --- /dev/null +++ b/Persistent/src/de/steamwar/persistent/Arenaserver.java @@ -0,0 +1,37 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.persistent; + +import lombok.Getter; + +@Getter +public class Arenaserver extends Subserver { + + private final String mode; + private final String map; + private final boolean allowMerge; + + public Arenaserver(String serverName, String mode, String map, boolean allowMerge, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) { + super(Servertype.ARENA, serverName, port, processBuilder, shutdownCallback, null); + this.mode = mode; + this.map = map; + this.allowMerge = allowMerge; + } +} diff --git a/Persistent/src/de/steamwar/bungeecore/Bauserver.java b/Persistent/src/de/steamwar/persistent/Bauserver.java similarity index 58% rename from Persistent/src/de/steamwar/bungeecore/Bauserver.java rename to Persistent/src/de/steamwar/persistent/Bauserver.java index b861a1a..fecd1ae 100644 --- a/Persistent/src/de/steamwar/bungeecore/Bauserver.java +++ b/Persistent/src/de/steamwar/persistent/Bauserver.java @@ -1,23 +1,23 @@ -/* - This file is a part of the SteamWar software. - - Copyright (C) 2020 SteamWar.de-Serverteam +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package de.steamwar.bungeecore; +package de.steamwar.persistent; import lombok.Getter; diff --git a/Persistent/src/de/steamwar/bungeecore/Builderserver.java b/Persistent/src/de/steamwar/persistent/Builderserver.java similarity index 58% rename from Persistent/src/de/steamwar/bungeecore/Builderserver.java rename to Persistent/src/de/steamwar/persistent/Builderserver.java index abd5da6..ad90b8a 100644 --- a/Persistent/src/de/steamwar/bungeecore/Builderserver.java +++ b/Persistent/src/de/steamwar/persistent/Builderserver.java @@ -1,23 +1,23 @@ /* - This file is a part of the SteamWar software. + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ - Copyright (C) 2022 SteamWar.de-Serverteam - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package de.steamwar.bungeecore; +package de.steamwar.persistent; import lombok.Getter; diff --git a/Persistent/src/de/steamwar/persistent/Persistent.java b/Persistent/src/de/steamwar/persistent/Persistent.java new file mode 100644 index 0000000..a07b197 --- /dev/null +++ b/Persistent/src/de/steamwar/persistent/Persistent.java @@ -0,0 +1,203 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.persistent; + +import com.google.inject.AbstractModule; +import com.google.inject.Inject; +import com.google.inject.Module; +import com.google.inject.name.Names; +import com.mojang.brigadier.Command; +import com.velocitypowered.api.command.BrigadierCommand; +import com.velocitypowered.api.command.CommandManager; +import com.velocitypowered.api.command.CommandMeta; +import com.velocitypowered.api.event.EventManager; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; +import com.velocitypowered.api.plugin.Plugin; +import com.velocitypowered.api.plugin.PluginContainer; +import com.velocitypowered.api.plugin.PluginDescription; +import com.velocitypowered.api.plugin.PluginManager; +import com.velocitypowered.api.plugin.annotation.DataDirectory; +import com.velocitypowered.api.proxy.ProxyServer; +import com.velocitypowered.api.scheduler.ScheduledTask; +import com.velocitypowered.proxy.plugin.PluginClassLoader; +import com.velocitypowered.proxy.plugin.VelocityPluginManager; +import com.velocitypowered.proxy.plugin.loader.VelocityPluginContainer; +import com.velocitypowered.proxy.plugin.loader.java.JavaPluginLoader; +import lombok.Getter; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.NoSuchElementException; +import java.util.ResourceBundle; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; + +@Plugin( + id = "persistentvelocitycore", + name = "PersistentVelocityCore" +) +public class Persistent { + + private static final Reflection.Method registerPlugin = new Reflection.Method<>(VelocityPluginManager.class, "registerPlugin", PluginContainer.class); + + @Getter + private static Persistent instance; + + @Getter + private final ProxyServer proxy; + @Getter + private final Logger logger; + private final Path directory; + + @Inject + public Persistent(ProxyServer proxy, Logger logger, @DataDirectory Path dataDirectory) { + instance = this; + this.proxy = proxy; + this.logger = logger; + this.directory = dataDirectory; + } + + @Subscribe + public void onEnable(ProxyInitializeEvent event) { + proxy.getCommandManager().register( + new BrigadierCommand( + BrigadierCommand.literalArgumentBuilder("softreload") + .requires(commandSource -> commandSource.hasPermission("bungeecore.softreload")) + .executes(commandContext -> softreload()) + .build() + ) + ); + } + + @Subscribe + public void onDisable(ProxyShutdownEvent event) { + Subserver.shutdown(); + } + + public int softreload() { + PluginContainer container = null; + ReloadablePlugin plugin = null; + try { + container = proxy.getPluginManager().getPlugin("velocitycore").orElseThrow(); + plugin = (ReloadablePlugin) container.getInstance().orElseThrow(); + } catch (NoSuchElementException e) { + logger.log(Level.WARNING, "Could not find loaded VelocityCore, continuing without unloading."); + } + + PluginContainer newContainer; + try { + newContainer = prepareLoad(); + } catch (Exception e) { + logger.log(Level.SEVERE, "Could not instantiate new VelocityCore, aborting softreload.", e); + return Command.SINGLE_SUCCESS; + } + + broadcast("§eNetwork update is starting§8."); + try { + if(container != null && plugin != null) { + plugin.onProxyShutdown(new ProxyShutdownEvent()); + unload(container, plugin); + } + + registerPlugin.invoke((VelocityPluginManager) proxy.getPluginManager(), newContainer); + ((ReloadablePlugin) newContainer.getInstance().orElseThrow()).onProxyInitialization(new ProxyInitializeEvent()); + } catch (Throwable t) { + logger.log(Level.SEVERE, "Error during softreload", t); + broadcast("§cNetwork update failed§8, §cexpect network restart soon§8."); + return Command.SINGLE_SUCCESS; + } + + broadcast("§eNetwork update complete§8."); + return Command.SINGLE_SUCCESS; + } + + private void broadcast(String message) { + Component component = LegacyComponentSerializer.legacySection().deserialize("§eSteam§8War» " + message); + proxy.getAllPlayers().forEach(player -> player.sendMessage(component)); + proxy.getConsoleCommandSource().sendMessage(component); + } + + private PluginContainer prepareLoad() throws Exception { + Path plugins = directory.getParent(); + JavaPluginLoader loader = new JavaPluginLoader(proxy, plugins); + PluginDescription description = loader.createPluginFromCandidate(loader.loadCandidate(plugins.resolve("velocitycore.jar"))); + PluginContainer container = new VelocityPluginContainer(description); + + AbstractModule commonModule = new AbstractModule() { + @Override + protected void configure() { + this.bind(ProxyServer.class).toInstance(proxy); + this.bind(PluginManager.class).toInstance(proxy.getPluginManager()); + this.bind(EventManager.class).toInstance(proxy.getEventManager()); + this.bind(CommandManager.class).toInstance(proxy.getCommandManager()); + this.bind(PluginContainer.class).annotatedWith(Names.named(container.getDescription().getId())).toInstance(container); + } + }; + + Module module = loader.createModule(container); + loader.createPlugin(container, module, commonModule); + + return container; + } + + private void unload(PluginContainer container, Object plugin) throws InterruptedException, IOException { + PluginClassLoader classLoader = ((PluginClassLoader) plugin.getClass().getClassLoader()); + + CommandManager commandManager = proxy.getCommandManager(); + for(String alias : commandManager.getAliases()) { + CommandMeta meta = commandManager.getCommandMeta(alias); + if(meta != null && meta.getPlugin() == plugin) + commandManager.unregister(meta); + } + + proxy.getEventManager().unregisterListeners(plugin); + proxy.getScheduler().tasksByPlugin(plugin).forEach(ScheduledTask::cancel); + + container.getExecutorService().shutdown(); + if(!container.getExecutorService().awaitTermination(100, TimeUnit.MILLISECONDS)) + logger.log(Level.WARNING, "ExecutorService termination took longer than 100ms, continuing."); + + for(Thread thread : Thread.getAllStackTraces().keySet()) { + if(thread.getClass().getClassLoader() != classLoader) + continue; + + thread.interrupt(); + thread.join(100); + + if (thread.isAlive()) + logger.log(Level.WARNING, "Could not stop thread %s of plugin %s. Still running".formatted(thread.getName(), container.getDescription().getId())); + } + + //TODO close all log handlers + /*for (Handler handler : plugin.getLogger().getHandlers()) { + handler.close(); + }*/ + + + //Clear resource bundle cache + ResourceBundle.clearCache(classLoader); + classLoader.close(); + } +} diff --git a/Persistent/src/de/steamwar/persistent/Reflection.java b/Persistent/src/de/steamwar/persistent/Reflection.java new file mode 100644 index 0000000..416a369 --- /dev/null +++ b/Persistent/src/de/steamwar/persistent/Reflection.java @@ -0,0 +1,75 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.persistent; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class Reflection { + public static class Field { + private final java.lang.reflect.Field f; + + public Field(Class target, String name) { + try { + f = target.getDeclaredField(name); + f.setAccessible(true); + } catch (NoSuchFieldException e) { + throw new IllegalArgumentException("Cannot find field with name " + name, e); + } + } + + public T get(C target) { + try { + return (T) f.get(target); + } catch (IllegalAccessException e) { + throw new IllegalArgumentException("Cannot access reflection.", e); + } + } + + public void set(C target, T value) { + try { + f.set(target, value); + } catch (IllegalAccessException e) { + throw new IllegalArgumentException("Cannot access reflection.", e); + } + } + } + + public static class Method { + private final java.lang.reflect.Method m; + + public Method(Class clazz, String methodName, Class... params) { + try { + m = clazz.getDeclaredMethod(methodName, params); + m.setAccessible(true); + } catch (NoSuchMethodException e) { + throw new IllegalArgumentException("Cannot find method with name " + methodName, e); + } + } + + public Object invoke(C target, Object... arguments) { + try { + return m.invoke(target, arguments); + } catch (Exception e) { + throw new IllegalArgumentException("Cannot invoke method " + m, e); + } + } + } +} diff --git a/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java b/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java new file mode 100644 index 0000000..95bfc4b --- /dev/null +++ b/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java @@ -0,0 +1,28 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.persistent; + +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; + +public interface ReloadablePlugin { + void onProxyInitialization(ProxyInitializeEvent event); + default void onProxyShutdown(ProxyShutdownEvent event) {} +} diff --git a/Persistent/src/de/steamwar/persistent/Servertype.java b/Persistent/src/de/steamwar/persistent/Servertype.java new file mode 100644 index 0000000..4731a2e --- /dev/null +++ b/Persistent/src/de/steamwar/persistent/Servertype.java @@ -0,0 +1,26 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.persistent; + +public enum Servertype { + BAUSERVER, + ARENA, + BUILDER +} diff --git a/Persistent/src/de/steamwar/bungeecore/Storage.java b/Persistent/src/de/steamwar/persistent/Storage.java similarity index 60% rename from Persistent/src/de/steamwar/bungeecore/Storage.java rename to Persistent/src/de/steamwar/persistent/Storage.java index bd71641..a32a577 100644 --- a/Persistent/src/de/steamwar/bungeecore/Storage.java +++ b/Persistent/src/de/steamwar/persistent/Storage.java @@ -1,23 +1,23 @@ -/* - This file is a part of the SteamWar software. - - Copyright (C) 2020 SteamWar.de-Serverteam +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package de.steamwar.bungeecore; +package de.steamwar.persistent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.ServerInfo; diff --git a/Persistent/src/de/steamwar/bungeecore/Subserver.java b/Persistent/src/de/steamwar/persistent/Subserver.java similarity index 88% rename from Persistent/src/de/steamwar/bungeecore/Subserver.java rename to Persistent/src/de/steamwar/persistent/Subserver.java index 869a28d..5d262cc 100644 --- a/Persistent/src/de/steamwar/bungeecore/Subserver.java +++ b/Persistent/src/de/steamwar/persistent/Subserver.java @@ -1,23 +1,23 @@ -/* - This file is a part of the SteamWar software. - - Copyright (C) 2020 SteamWar.de-Serverteam +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package de.steamwar.bungeecore; +package de.steamwar.persistent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; @@ -181,7 +181,7 @@ public class Subserver { } protected void register() { - if (Persistent.getInstance().getProxyServer().getServer(serverName).isPresent()) { + if (Persistent.getInstance().getProxy().getServer(serverName).isPresent()) { SecurityException e = new SecurityException("Server already registered: " + serverName); stop(); failureCallback.accept(e); @@ -189,7 +189,7 @@ public class Subserver { } synchronized (serverList) { - registeredServer = Persistent.getInstance().getProxyServer().registerServer(server); + registeredServer = Persistent.getInstance().getProxy().registerServer(server); serverList.add(this); infoToServer.put(server, this); } @@ -199,7 +199,7 @@ public class Subserver { synchronized (serverList) { infoToServer.remove(server); serverList.remove(this); - Persistent.getInstance().getProxyServer().unregisterServer(server); + Persistent.getInstance().getProxy().unregisterServer(server); registeredServer = null; } } diff --git a/src/de/steamwar/bungeecore/Reflection.java b/src/de/steamwar/bungeecore/Reflection.java deleted file mode 100644 index 7a0a2a5..0000000 --- a/src/de/steamwar/bungeecore/Reflection.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2024 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package de.steamwar.bungeecore; - -import lombok.AllArgsConstructor; -import lombok.experimental.UtilityClass; - -import java.lang.reflect.*; -import java.util.Arrays; - -@UtilityClass -public class Reflection { - - public interface ConstructorInvoker { - Object invoke(Object... arguments); - } - - public interface MethodInvoker { - Object invoke(Object target, Object... arguments); - } - - @AllArgsConstructor - public static class Field { - private final java.lang.reflect.Field f; - - public T get(C target) { - try { - return (T) f.get(target); - } catch (IllegalAccessException e) { - throw new IllegalArgumentException("Cannot access reflection.", e); - } - } - - public void set(C target, T value) { - try { - f.set(target, value); - } catch (IllegalAccessException e) { - throw new IllegalArgumentException("Cannot access reflection.", e); - } - } - } - - public static Field getField(Class target, String name) { - try { - java.lang.reflect.Field field = target.getDeclaredField(name); - field.setAccessible(true); - return new Field<>(field); - } catch (NoSuchFieldException e) { - throw new IllegalArgumentException("Cannot find field with name " + name, e); - } - } - - public static MethodInvoker getMethod(Class clazz, String methodName, Class... params) { - return getTypedMethod(clazz, methodName, null, params); - } - - public static MethodInvoker getTypedMethod(Class clazz, String methodName, Class returnType, Class... params) { - for (final Method method : clazz.getDeclaredMethods()) { - if ((methodName == null || method.getName().equals(methodName)) - && (returnType == null || method.getReturnType().equals(returnType)) - && Arrays.equals(method.getParameterTypes(), params)) { - method.setAccessible(true); - - return (target, arguments) -> { - try { - return method.invoke(target, arguments); - } catch (Exception e) { - throw new IllegalArgumentException("Cannot invoke method " + method, e); - } - }; - } - } - - // Search in every superclass - if (clazz.getSuperclass() != null) - return getTypedMethod(clazz.getSuperclass(), methodName, returnType, params); - - throw new IllegalStateException(String.format("Unable to find method %s (%s).", methodName, Arrays.asList(params))); - } - - public static ConstructorInvoker getConstructor(Class clazz, Class... params) { - for (final Constructor constructor : clazz.getDeclaredConstructors()) { - if (Arrays.equals(constructor.getParameterTypes(), params)) { - constructor.setAccessible(true); - - return arguments -> { - try { - return constructor.newInstance(arguments); - } catch (Exception e) { - throw new IllegalArgumentException("Cannot invoke constructor " + constructor, e); - } - }; - } - } - - throw new IllegalStateException(String.format("Unable to find constructor for %s (%s).", clazz, Arrays.asList(params))); - } -} diff --git a/src/de/steamwar/bungeecore/util/Chat19.java b/src/de/steamwar/bungeecore/util/Chat19.java deleted file mode 100644 index da66c7e..0000000 --- a/src/de/steamwar/bungeecore/util/Chat19.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2022 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package de.steamwar.bungeecore.util; - -import com.velocitypowered.api.proxy.Player; -import lombok.experimental.UtilityClass; - -@UtilityClass -public class Chat19 { - - public static void chat(Player p, String message) { - p.spoofChatInput(message); - - /*if(p.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_18_2)) { - if(message.startsWith("/")) { - ((ServerConnection) p.getServer()).getCh().write(new ClientCommand(message.substring(1), System.currentTimeMillis(), 0, Collections.emptyMap(), false, new ChatChain(Collections.emptyList(), null), new SeenMessages(0, new BitSet(0)))); - } else { - ((ServerConnection) p.getServer()).getCh().write(new ClientChat(message, System.currentTimeMillis(), 0, version < ProtocolConstants.MINECRAFT_1_19_3 ? new byte[0] : null, false, new ChatChain(Collections.emptyList(), null), new SeenMessages(0, new BitSet(0)))); - } - } else { - p.spoofChatInput(message); - }*/ - } -} \ No newline at end of file diff --git a/src/de/steamwar/command/SWCommand.java b/src/de/steamwar/command/SWCommand.java index c9448ec..db9421b 100644 --- a/src/de/steamwar/command/SWCommand.java +++ b/src/de/steamwar/command/SWCommand.java @@ -20,8 +20,8 @@ package de.steamwar.command; import com.velocitypowered.api.command.SimpleCommand; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.DiscordBot; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.DiscordBot; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.sql.UserPerm; @@ -113,7 +113,7 @@ public class SWCommand extends AbstractSWCommand { if (command == null) return; - VelocityCore.getProxy().getCommandManager().register(name, command, aliases); + VelocityCore.getProxy().getCommandManager().register(VelocityCore.getProxy().getCommandManager().metaBuilder(name).aliases(aliases).plugin(VelocityCore.get()).build(), command); DiscordBot.getCommands().put(name, this); for(String alias : aliases) DiscordBot.getCommands().put(alias, this); diff --git a/src/de/steamwar/command/TypeUtils.java b/src/de/steamwar/command/TypeUtils.java index 5123b07..a273cda 100644 --- a/src/de/steamwar/command/TypeUtils.java +++ b/src/de/steamwar/command/TypeUtils.java @@ -21,9 +21,9 @@ package de.steamwar.command; import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.ServerVersion; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.commands.TypeMappers; +import de.steamwar.velocitycore.ServerVersion; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.commands.TypeMappers; import de.steamwar.messages.Chatter; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.Team; diff --git a/src/de/steamwar/messages/Chatter.java b/src/de/steamwar/messages/Chatter.java index c9961e6..d61a20d 100644 --- a/src/de/steamwar/messages/Chatter.java +++ b/src/de/steamwar/messages/Chatter.java @@ -23,9 +23,9 @@ import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.ResultedEvent; import com.velocitypowered.api.event.connection.LoginEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.UserPerm; import net.kyori.adventure.text.Component; diff --git a/src/de/steamwar/sql/SQLConfigImpl.java b/src/de/steamwar/sql/SQLConfigImpl.java index cf54dba..199afe9 100644 --- a/src/de/steamwar/sql/SQLConfigImpl.java +++ b/src/de/steamwar/sql/SQLConfigImpl.java @@ -19,7 +19,7 @@ package de.steamwar.sql; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.sql.internal.SQLConfig; import java.util.logging.Logger; diff --git a/src/de/steamwar/sql/SQLWrapperImpl.java b/src/de/steamwar/sql/SQLWrapperImpl.java index d6daa68..1ac26bd 100644 --- a/src/de/steamwar/sql/SQLWrapperImpl.java +++ b/src/de/steamwar/sql/SQLWrapperImpl.java @@ -21,9 +21,9 @@ package de.steamwar.sql; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.GameModeConfig; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.commands.CheckCommand; +import de.steamwar.velocitycore.GameModeConfig; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.commands.CheckCommand; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/de/steamwar/bungeecore/ArenaMode.java b/src/de/steamwar/velocitycore/ArenaMode.java similarity index 99% rename from src/de/steamwar/bungeecore/ArenaMode.java rename to src/de/steamwar/velocitycore/ArenaMode.java index 132e6b5..a185dcb 100644 --- a/src/de/steamwar/bungeecore/ArenaMode.java +++ b/src/de/steamwar/velocitycore/ArenaMode.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import de.steamwar.sql.SchematicType; import lombok.Getter; diff --git a/src/de/steamwar/bungeecore/Broadcaster.java b/src/de/steamwar/velocitycore/Broadcaster.java similarity index 97% rename from src/de/steamwar/bungeecore/Broadcaster.java rename to src/de/steamwar/velocitycore/Broadcaster.java index c2e1e64..f5df6d1 100644 --- a/src/de/steamwar/bungeecore/Broadcaster.java +++ b/src/de/steamwar/velocitycore/Broadcaster.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/Config.java b/src/de/steamwar/velocitycore/Config.java similarity index 99% rename from src/de/steamwar/bungeecore/Config.java rename to src/de/steamwar/velocitycore/Config.java index 107532d..c372950 100644 --- a/src/de/steamwar/bungeecore/Config.java +++ b/src/de/steamwar/velocitycore/Config.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import com.velocitypowered.api.proxy.server.RegisteredServer; import lombok.Getter; diff --git a/src/de/steamwar/bungeecore/ErrorLogger.java b/src/de/steamwar/velocitycore/ErrorLogger.java similarity index 80% rename from src/de/steamwar/bungeecore/ErrorLogger.java rename to src/de/steamwar/velocitycore/ErrorLogger.java index 4470a6c..ac1dcb7 100644 --- a/src/de/steamwar/bungeecore/ErrorLogger.java +++ b/src/de/steamwar/velocitycore/ErrorLogger.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import de.steamwar.sql.SWException; @@ -27,16 +27,17 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.logging.*; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; -public class ErrorLogger extends Handler { +public class ErrorLogger extends Handler /*AbstractAppender*/ { ErrorLogger(){ - Logger logger = VelocityCore.getLogger(); - while(logger.getParent() != null) - logger = logger.getParent(); - - logger.addHandler(this); + //super("SW ErrorLogger", filter, layout, false, null); + //((LoggerContext) org.apache.logging.log4j.LogManager.getContext(false)).getConfiguration().addAppender(this); + VelocityCore.getLogger().addHandler(this); } void unregister(){ @@ -81,4 +82,9 @@ public class ErrorLogger extends Handler { List contains = new ArrayList<>(); ignoreContains = Collections.unmodifiableList(contains); } + + /*@Override + public void append(LogEvent event) { + + }*/ } diff --git a/src/de/steamwar/bungeecore/EventStarter.java b/src/de/steamwar/velocitycore/EventStarter.java similarity index 95% rename from src/de/steamwar/bungeecore/EventStarter.java rename to src/de/steamwar/velocitycore/EventStarter.java index becb78b..1be170f 100644 --- a/src/de/steamwar/bungeecore/EventStarter.java +++ b/src/de/steamwar/velocitycore/EventStarter.java @@ -17,9 +17,10 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import de.steamwar.messages.Chatter; +import de.steamwar.persistent.Subserver; import de.steamwar.sql.EventFight; import de.steamwar.sql.Team; import net.kyori.adventure.text.event.ClickEvent; @@ -30,7 +31,7 @@ import java.util.Map; import java.util.Queue; import java.util.concurrent.TimeUnit; -import static de.steamwar.bungeecore.Storage.eventServer; +import static de.steamwar.persistent.Storage.eventServer; public class EventStarter { diff --git a/src/de/steamwar/bungeecore/GameModeConfig.java b/src/de/steamwar/velocitycore/GameModeConfig.java similarity index 98% rename from src/de/steamwar/bungeecore/GameModeConfig.java rename to src/de/steamwar/velocitycore/GameModeConfig.java index 7f2045f..ff192f3 100644 --- a/src/de/steamwar/bungeecore/GameModeConfig.java +++ b/src/de/steamwar/velocitycore/GameModeConfig.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import lombok.Getter; import lombok.Setter; diff --git a/src/de/steamwar/bungeecore/Node.java b/src/de/steamwar/velocitycore/Node.java similarity index 99% rename from src/de/steamwar/bungeecore/Node.java rename to src/de/steamwar/velocitycore/Node.java index f840446..b97ef0b 100644 --- a/src/de/steamwar/bungeecore/Node.java +++ b/src/de/steamwar/velocitycore/Node.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import java.io.BufferedReader; import java.io.File; diff --git a/src/de/steamwar/bungeecore/ServerStarter.java b/src/de/steamwar/velocitycore/ServerStarter.java similarity index 98% rename from src/de/steamwar/bungeecore/ServerStarter.java rename to src/de/steamwar/velocitycore/ServerStarter.java index 1d088ed..43ae472 100644 --- a/src/de/steamwar/bungeecore/ServerStarter.java +++ b/src/de/steamwar/velocitycore/ServerStarter.java @@ -17,10 +17,14 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import com.velocitypowered.api.proxy.Player; import de.steamwar.messages.Chatter; +import de.steamwar.persistent.Arenaserver; +import de.steamwar.persistent.Bauserver; +import de.steamwar.persistent.Builderserver; +import de.steamwar.persistent.Subserver; import de.steamwar.sql.*; import java.io.DataOutputStream; diff --git a/src/de/steamwar/bungeecore/ServerVersion.java b/src/de/steamwar/velocitycore/ServerVersion.java similarity index 98% rename from src/de/steamwar/bungeecore/ServerVersion.java rename to src/de/steamwar/velocitycore/ServerVersion.java index 1625071..5da9350 100644 --- a/src/de/steamwar/bungeecore/ServerVersion.java +++ b/src/de/steamwar/velocitycore/ServerVersion.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import lombok.Getter; diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/velocitycore/SubserverSystem.java similarity index 91% rename from src/de/steamwar/bungeecore/SubserverSystem.java rename to src/de/steamwar/velocitycore/SubserverSystem.java index 719c38a..bd2c7f7 100644 --- a/src/de/steamwar/bungeecore/SubserverSystem.java +++ b/src/de/steamwar/velocitycore/SubserverSystem.java @@ -17,14 +17,15 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.network.NetworkSender; -import de.steamwar.bungeecore.network.handlers.FightInfoHandler; +import de.steamwar.velocitycore.network.NetworkSender; +import de.steamwar.velocitycore.network.handlers.FightInfoHandler; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.network.packets.server.StartingServerPacket; +import de.steamwar.persistent.Subserver; import de.steamwar.sql.IgnoreSystem; import de.steamwar.sql.SteamwarUser; import net.kyori.adventure.text.event.ClickEvent; diff --git a/src/de/steamwar/bungeecore/VelocityCore.java b/src/de/steamwar/velocitycore/VelocityCore.java similarity index 90% rename from src/de/steamwar/bungeecore/VelocityCore.java rename to src/de/steamwar/velocitycore/VelocityCore.java index e664ffb..a4a236a 100644 --- a/src/de/steamwar/bungeecore/VelocityCore.java +++ b/src/de/steamwar/velocitycore/VelocityCore.java @@ -17,9 +17,10 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore; +package de.steamwar.velocitycore; import com.google.inject.Inject; +import com.mysql.cj.jdbc.Driver; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; @@ -28,21 +29,22 @@ import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.scheduler.Scheduler; -import de.steamwar.bungeecore.commands.*; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.DiscordConfig; -import de.steamwar.bungeecore.listeners.*; -import de.steamwar.bungeecore.mods.*; -import de.steamwar.bungeecore.network.handlers.*; -import de.steamwar.bungeecore.tablist.TablistManager; import de.steamwar.command.*; import de.steamwar.messages.Chatter; import de.steamwar.network.packets.PacketHandler; +import de.steamwar.persistent.ReloadablePlugin; import de.steamwar.sql.Punishment; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.Team; import de.steamwar.sql.UserElo; import de.steamwar.sql.internal.Statement; +import de.steamwar.velocitycore.commands.*; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.DiscordConfig; +import de.steamwar.velocitycore.listeners.*; +import de.steamwar.velocitycore.mods.*; +import de.steamwar.velocitycore.network.handlers.*; +import de.steamwar.velocitycore.tablist.TablistManager; import lombok.Getter; import java.nio.file.Path; @@ -60,7 +62,7 @@ import java.util.logging.Logger; name = "VelocityCore", dependencies = { @Dependency(id = "persistentvelocitycore") } ) -public class VelocityCore { +public class VelocityCore implements ReloadablePlugin { public static boolean MAIN_SERVER; @@ -87,9 +89,10 @@ public class VelocityCore { private final Logger logger; @Getter private final Path dataDirectory; - @Getter - Config config; + private Driver mysqlDriver; + @Getter + private Config config; private ErrorLogger errorLogger; private TablistManager tablistManager; @@ -102,17 +105,20 @@ public class VelocityCore { this.logger = logger; this.dataDirectory = dataDirectory; - instance = this; - - try { - DriverManager.registerDriver(new com.mysql.cj.jdbc.Driver()); - } catch (SQLException e) { - throw new RuntimeException(e); - } } @Subscribe + @Override public void onProxyInitialization(ProxyInitializeEvent event) { + instance = this; + + try { + mysqlDriver = new com.mysql.cj.jdbc.Driver(); + DriverManager.registerDriver(mysqlDriver); + } catch (SQLException e) { + throw new SecurityException(e); + } + config = Config.load(); MAIN_SERVER = proxyServer.getBoundAddress().getPort() == 25565; @@ -243,6 +249,7 @@ public class VelocityCore { } @Subscribe + @Override public void onProxyShutdown(ProxyShutdownEvent event) { try { DiscordBot.withBot(bot -> bot.getJda().shutdown()); @@ -254,6 +261,12 @@ public class VelocityCore { tablistManager.disable(); errorLogger.unregister(); Statement.closeAll(); + + try { + DriverManager.deregisterDriver(mysqlDriver); + } catch (SQLException e) { + throw new SecurityException(e); + } } private void initStaticServers() { diff --git a/src/de/steamwar/bungeecore/commands/AlertCommand.java b/src/de/steamwar/velocitycore/commands/AlertCommand.java similarity index 94% rename from src/de/steamwar/bungeecore/commands/AlertCommand.java rename to src/de/steamwar/velocitycore/commands/AlertCommand.java index 533d60c..b95bbd6 100644 --- a/src/de/steamwar/bungeecore/commands/AlertCommand.java +++ b/src/de/steamwar/velocitycore/commands/AlertCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.DiscordBot; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.sql.UserPerm; diff --git a/src/de/steamwar/bungeecore/commands/ArenaCommand.java b/src/de/steamwar/velocitycore/commands/ArenaCommand.java similarity index 92% rename from src/de/steamwar/bungeecore/commands/ArenaCommand.java rename to src/de/steamwar/velocitycore/commands/ArenaCommand.java index a4bee96..1fa04e0 100644 --- a/src/de/steamwar/bungeecore/commands/ArenaCommand.java +++ b/src/de/steamwar/velocitycore/commands/ArenaCommand.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; @@ -31,7 +31,6 @@ import de.steamwar.messages.PlayerChatter; import java.util.Collection; import java.util.List; -import java.util.stream.Collectors; public class ArenaCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/velocitycore/commands/BauCommand.java similarity index 95% rename from src/de/steamwar/bungeecore/commands/BauCommand.java rename to src/de/steamwar/velocitycore/commands/BauCommand.java index 0693abc..0ec2a92 100644 --- a/src/de/steamwar/bungeecore/commands/BauCommand.java +++ b/src/de/steamwar/velocitycore/commands/BauCommand.java @@ -17,15 +17,14 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.*; -import de.steamwar.bungeecore.inventory.SWInventory; -import de.steamwar.bungeecore.inventory.SWItem; -import de.steamwar.bungeecore.network.NetworkSender; -import de.steamwar.bungeecore.util.BauLock; -import de.steamwar.bungeecore.util.BauLockState; -import de.steamwar.bungeecore.util.Chat19; +import de.steamwar.velocitycore.*; +import de.steamwar.velocitycore.inventory.SWInventory; +import de.steamwar.velocitycore.inventory.SWItem; +import de.steamwar.velocitycore.network.NetworkSender; +import de.steamwar.velocitycore.util.BauLock; +import de.steamwar.velocitycore.util.BauLockState; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; @@ -34,12 +33,12 @@ import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.messages.PlayerChatter; import de.steamwar.network.packets.server.BaumemberUpdatePacket; +import de.steamwar.persistent.Bauserver; import de.steamwar.sql.BauweltMember; import de.steamwar.sql.SteamwarUser; import java.util.Collection; import java.util.function.Consumer; -import java.util.stream.Collectors; public class BauCommand extends SWCommand { @@ -110,7 +109,7 @@ public class BauCommand extends SWCommand { @Register("info") public void info(PlayerChatter sender) { - Chat19.chat(sender.getPlayer(), "/bauinfo"); + sender.getPlayer().spoofChatInput("/bauinfo"); } @Register("setspectator") diff --git a/src/de/steamwar/bungeecore/commands/BugCommand.java b/src/de/steamwar/velocitycore/commands/BugCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/BugCommand.java rename to src/de/steamwar/velocitycore/commands/BugCommand.java index d63542c..58172a0 100644 --- a/src/de/steamwar/bungeecore/commands/BugCommand.java +++ b/src/de/steamwar/velocitycore/commands/BugCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.sql.SWException; import de.steamwar.command.SWCommand; diff --git a/src/de/steamwar/bungeecore/commands/BuilderCloudCommand.java b/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java similarity index 96% rename from src/de/steamwar/bungeecore/commands/BuilderCloudCommand.java rename to src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java index 042e136..4c5c115 100644 --- a/src/de/steamwar/bungeecore/commands/BuilderCloudCommand.java +++ b/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.ServerStarter; -import de.steamwar.bungeecore.ServerVersion; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.velocitycore.ServerStarter; +import de.steamwar.velocitycore.ServerVersion; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; @@ -36,7 +36,6 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.stream.Collectors; public class BuilderCloudCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/ChallengeCommand.java b/src/de/steamwar/velocitycore/commands/ChallengeCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/ChallengeCommand.java rename to src/de/steamwar/velocitycore/commands/ChallengeCommand.java index 0ad54b0..83795e2 100644 --- a/src/de/steamwar/bungeecore/commands/ChallengeCommand.java +++ b/src/de/steamwar/velocitycore/commands/ChallengeCommand.java @@ -17,13 +17,13 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.ServerStarter; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.velocitycore.ServerStarter; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeValidator; import de.steamwar.messages.Chatter; @@ -34,7 +34,7 @@ import net.kyori.adventure.text.event.ClickEvent; import java.util.LinkedList; -import static de.steamwar.bungeecore.Storage.challenges; +import static de.steamwar.persistent.Storage.challenges; public class ChallengeCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/CheckCommand.java b/src/de/steamwar/velocitycore/commands/CheckCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/CheckCommand.java rename to src/de/steamwar/velocitycore/commands/CheckCommand.java index b5e4fba..5945239 100644 --- a/src/de/steamwar/bungeecore/commands/CheckCommand.java +++ b/src/de/steamwar/velocitycore/commands/CheckCommand.java @@ -17,14 +17,14 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.Bauserver; -import de.steamwar.bungeecore.ServerStarter; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.util.DiscordAlert; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.persistent.Bauserver; +import de.steamwar.velocitycore.ServerStarter; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.util.DiscordAlert; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; diff --git a/src/de/steamwar/bungeecore/commands/DevCommand.java b/src/de/steamwar/velocitycore/commands/DevCommand.java similarity index 98% rename from src/de/steamwar/bungeecore/commands/DevCommand.java rename to src/de/steamwar/velocitycore/commands/DevCommand.java index e5cfcfe..fc9b519 100644 --- a/src/de/steamwar/bungeecore/commands/DevCommand.java +++ b/src/de/steamwar/velocitycore/commands/DevCommand.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.server.ServerInfo; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommandUtils; import de.steamwar.command.TypeMapper; diff --git a/src/de/steamwar/bungeecore/commands/EventCommand.java b/src/de/steamwar/velocitycore/commands/EventCommand.java similarity index 96% rename from src/de/steamwar/bungeecore/commands/EventCommand.java rename to src/de/steamwar/velocitycore/commands/EventCommand.java index 926dd32..df90c02 100644 --- a/src/de/steamwar/bungeecore/commands/EventCommand.java +++ b/src/de/steamwar/velocitycore/commands/EventCommand.java @@ -17,11 +17,11 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.EventStarter; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.SubserverSystem; +import de.steamwar.velocitycore.EventStarter; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.SubserverSystem; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeValidator; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/EventRescheduleCommand.java b/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java similarity index 98% rename from src/de/steamwar/bungeecore/commands/EventRescheduleCommand.java rename to src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java index 3ff1cc2..d639abd 100644 --- a/src/de/steamwar/bungeecore/commands/EventRescheduleCommand.java +++ b/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/EventreloadCommand.java b/src/de/steamwar/velocitycore/commands/EventreloadCommand.java similarity index 96% rename from src/de/steamwar/bungeecore/commands/EventreloadCommand.java rename to src/de/steamwar/velocitycore/commands/EventreloadCommand.java index bf59fe0..45aa61b 100644 --- a/src/de/steamwar/bungeecore/commands/EventreloadCommand.java +++ b/src/de/steamwar/velocitycore/commands/EventreloadCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/FightCommand.java b/src/de/steamwar/velocitycore/commands/FightCommand.java similarity index 94% rename from src/de/steamwar/bungeecore/commands/FightCommand.java rename to src/de/steamwar/velocitycore/commands/FightCommand.java index b131666..9b6ffd2 100644 --- a/src/de/steamwar/bungeecore/commands/FightCommand.java +++ b/src/de/steamwar/velocitycore/commands/FightCommand.java @@ -17,16 +17,19 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.*; -import de.steamwar.bungeecore.inventory.SWInventory; -import de.steamwar.bungeecore.inventory.SWItem; +import de.steamwar.velocitycore.*; +import de.steamwar.velocitycore.inventory.SWInventory; +import de.steamwar.velocitycore.inventory.SWItem; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.messages.PlayerChatter; +import de.steamwar.persistent.Arenaserver; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; diff --git a/src/de/steamwar/bungeecore/commands/GDPRQuery.java b/src/de/steamwar/velocitycore/commands/GDPRQuery.java similarity index 99% rename from src/de/steamwar/bungeecore/commands/GDPRQuery.java rename to src/de/steamwar/velocitycore/commands/GDPRQuery.java index a9a5aa9..e54a7ff 100644 --- a/src/de/steamwar/bungeecore/commands/GDPRQuery.java +++ b/src/de/steamwar/velocitycore/commands/GDPRQuery.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/commands/HelpCommand.java b/src/de/steamwar/velocitycore/commands/HelpCommand.java similarity index 99% rename from src/de/steamwar/bungeecore/commands/HelpCommand.java rename to src/de/steamwar/velocitycore/commands/HelpCommand.java index 613c228..4a22749 100644 --- a/src/de/steamwar/bungeecore/commands/HelpCommand.java +++ b/src/de/steamwar/velocitycore/commands/HelpCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/HistoricCommand.java b/src/de/steamwar/velocitycore/commands/HistoricCommand.java similarity index 92% rename from src/de/steamwar/bungeecore/commands/HistoricCommand.java rename to src/de/steamwar/velocitycore/commands/HistoricCommand.java index fb170f5..74972e7 100644 --- a/src/de/steamwar/bungeecore/commands/HistoricCommand.java +++ b/src/de/steamwar/velocitycore/commands/HistoricCommand.java @@ -17,10 +17,10 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.ServerStarter; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.velocitycore.ServerStarter; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/commands/IgnoreCommand.java b/src/de/steamwar/velocitycore/commands/IgnoreCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/IgnoreCommand.java rename to src/de/steamwar/velocitycore/commands/IgnoreCommand.java index c340875..684ab5a 100644 --- a/src/de/steamwar/bungeecore/commands/IgnoreCommand.java +++ b/src/de/steamwar/velocitycore/commands/IgnoreCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java b/src/de/steamwar/velocitycore/commands/JoinmeCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/JoinmeCommand.java rename to src/de/steamwar/velocitycore/commands/JoinmeCommand.java index a5e9af1..f6b4262 100644 --- a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java +++ b/src/de/steamwar/velocitycore/commands/JoinmeCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/KickCommand.java b/src/de/steamwar/velocitycore/commands/KickCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/KickCommand.java rename to src/de/steamwar/velocitycore/commands/KickCommand.java index a0f935c..4bbd8be 100644 --- a/src/de/steamwar/bungeecore/commands/KickCommand.java +++ b/src/de/steamwar/velocitycore/commands/KickCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; import de.steamwar.command.SWCommand; diff --git a/src/de/steamwar/bungeecore/commands/ListCommand.java b/src/de/steamwar/velocitycore/commands/ListCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/ListCommand.java rename to src/de/steamwar/velocitycore/commands/ListCommand.java index 9f5ed06..d265983 100644 --- a/src/de/steamwar/bungeecore/commands/ListCommand.java +++ b/src/de/steamwar/velocitycore/commands/ListCommand.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/LocalCommand.java b/src/de/steamwar/velocitycore/commands/LocalCommand.java similarity index 92% rename from src/de/steamwar/bungeecore/commands/LocalCommand.java rename to src/de/steamwar/velocitycore/commands/LocalCommand.java index 0672f15..d53afdb 100644 --- a/src/de/steamwar/bungeecore/commands/LocalCommand.java +++ b/src/de/steamwar/velocitycore/commands/LocalCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.listeners.ChatListener; +import de.steamwar.velocitycore.listeners.ChatListener; import de.steamwar.command.SWCommand; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/commands/ModCommand.java b/src/de/steamwar/velocitycore/commands/ModCommand.java similarity index 94% rename from src/de/steamwar/bungeecore/commands/ModCommand.java rename to src/de/steamwar/velocitycore/commands/ModCommand.java index dd9fd57..c37a3e7 100644 --- a/src/de/steamwar/bungeecore/commands/ModCommand.java +++ b/src/de/steamwar/velocitycore/commands/ModCommand.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.inventory.SWInventory; -import de.steamwar.bungeecore.inventory.SWItem; -import de.steamwar.bungeecore.inventory.SWListInv; -import de.steamwar.bungeecore.inventory.SWStreamInv; +import de.steamwar.velocitycore.inventory.SWInventory; +import de.steamwar.velocitycore.inventory.SWItem; +import de.steamwar.velocitycore.inventory.SWListInv; +import de.steamwar.velocitycore.inventory.SWStreamInv; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; @@ -34,7 +34,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.function.Consumer; -import java.util.stream.Collectors; public class ModCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/MsgCommand.java b/src/de/steamwar/velocitycore/commands/MsgCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/MsgCommand.java rename to src/de/steamwar/velocitycore/commands/MsgCommand.java index f2a3781..8341318 100644 --- a/src/de/steamwar/bungeecore/commands/MsgCommand.java +++ b/src/de/steamwar/velocitycore/commands/MsgCommand.java @@ -17,17 +17,17 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.listeners.ChatListener; +import de.steamwar.velocitycore.listeners.ChatListener; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.ChatterGroup; import de.steamwar.messages.PlayerChatter; import de.steamwar.sql.IgnoreSystem; -import static de.steamwar.bungeecore.Storage.lastChats; +import static de.steamwar.persistent.Storage.lastChats; public class MsgCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/PingCommand.java b/src/de/steamwar/velocitycore/commands/PingCommand.java similarity index 96% rename from src/de/steamwar/bungeecore/commands/PingCommand.java rename to src/de/steamwar/velocitycore/commands/PingCommand.java index c6342f9..583f263 100644 --- a/src/de/steamwar/bungeecore/commands/PingCommand.java +++ b/src/de/steamwar/velocitycore/commands/PingCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/commands/PlaytimeCommand.java b/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/PlaytimeCommand.java rename to src/de/steamwar/velocitycore/commands/PlaytimeCommand.java index b3460e0..bf04c28 100644 --- a/src/de/steamwar/bungeecore/commands/PlaytimeCommand.java +++ b/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/PollCommand.java b/src/de/steamwar/velocitycore/commands/PollCommand.java similarity index 95% rename from src/de/steamwar/bungeecore/commands/PollCommand.java rename to src/de/steamwar/velocitycore/commands/PollCommand.java index cb944d9..a594c43 100644 --- a/src/de/steamwar/bungeecore/commands/PollCommand.java +++ b/src/de/steamwar/velocitycore/commands/PollCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.listeners.PollSystem; +import de.steamwar.velocitycore.listeners.PollSystem; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeValidator; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/PollresultCommand.java b/src/de/steamwar/velocitycore/commands/PollresultCommand.java similarity index 94% rename from src/de/steamwar/bungeecore/commands/PollresultCommand.java rename to src/de/steamwar/velocitycore/commands/PollresultCommand.java index a14b51b..611fd7e 100644 --- a/src/de/steamwar/bungeecore/commands/PollresultCommand.java +++ b/src/de/steamwar/velocitycore/commands/PollresultCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.listeners.PollSystem; +import de.steamwar.velocitycore.listeners.PollSystem; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeValidator; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/PunishmentCommand.java b/src/de/steamwar/velocitycore/commands/PunishmentCommand.java similarity index 98% rename from src/de/steamwar/bungeecore/commands/PunishmentCommand.java rename to src/de/steamwar/velocitycore/commands/PunishmentCommand.java index 00f04b5..da84701 100644 --- a/src/de/steamwar/bungeecore/commands/PunishmentCommand.java +++ b/src/de/steamwar/velocitycore/commands/PunishmentCommand.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.google.gson.JsonParser; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.IPSanitizer; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.IPSanitizer; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; diff --git a/src/de/steamwar/bungeecore/commands/RCommand.java b/src/de/steamwar/velocitycore/commands/RCommand.java similarity index 92% rename from src/de/steamwar/bungeecore/commands/RCommand.java rename to src/de/steamwar/velocitycore/commands/RCommand.java index 8b8941c..8ed4a38 100644 --- a/src/de/steamwar/bungeecore/commands/RCommand.java +++ b/src/de/steamwar/velocitycore/commands/RCommand.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.PlayerChatter; -import static de.steamwar.bungeecore.Storage.lastChats; +import static de.steamwar.persistent.Storage.lastChats; public class RCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/RankCommand.java b/src/de/steamwar/velocitycore/commands/RankCommand.java similarity index 96% rename from src/de/steamwar/bungeecore/commands/RankCommand.java rename to src/de/steamwar/velocitycore/commands/RankCommand.java index 7dc50f6..5254d52 100644 --- a/src/de/steamwar/bungeecore/commands/RankCommand.java +++ b/src/de/steamwar/velocitycore/commands/RankCommand.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.ArenaMode; +import de.steamwar.velocitycore.ArenaMode; import de.steamwar.messages.Message; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/ReplayCommand.java b/src/de/steamwar/velocitycore/commands/ReplayCommand.java similarity index 91% rename from src/de/steamwar/bungeecore/commands/ReplayCommand.java rename to src/de/steamwar/velocitycore/commands/ReplayCommand.java index 083c763..985bf3c 100644 --- a/src/de/steamwar/bungeecore/commands/ReplayCommand.java +++ b/src/de/steamwar/velocitycore/commands/ReplayCommand.java @@ -17,21 +17,20 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.ArenaMode; +import de.steamwar.velocitycore.ArenaMode; import de.steamwar.messages.Message; -import de.steamwar.bungeecore.ServerStarter; -import de.steamwar.bungeecore.inventory.SWItem; -import de.steamwar.bungeecore.inventory.SWListInv; -import de.steamwar.bungeecore.inventory.SWStreamInv; +import de.steamwar.velocitycore.ServerStarter; +import de.steamwar.velocitycore.inventory.SWItem; +import de.steamwar.velocitycore.inventory.SWListInv; +import de.steamwar.velocitycore.inventory.SWStreamInv; import de.steamwar.command.SWCommand; import de.steamwar.messages.PlayerChatter; import de.steamwar.sql.*; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; public class ReplayCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/RulesCommand.java b/src/de/steamwar/velocitycore/commands/RulesCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/RulesCommand.java rename to src/de/steamwar/velocitycore/commands/RulesCommand.java index f98080f..cf403c4 100644 --- a/src/de/steamwar/bungeecore/commands/RulesCommand.java +++ b/src/de/steamwar/velocitycore/commands/RulesCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/ServerSwitchCommand.java b/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/ServerSwitchCommand.java rename to src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java index dd174b5..142c5f5 100644 --- a/src/de/steamwar/bungeecore/commands/ServerSwitchCommand.java +++ b/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java @@ -17,10 +17,10 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.SWCommand; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java b/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java rename to src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java index 30d94c2..927644a 100644 --- a/src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java +++ b/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.listeners.ChatListener; +import de.steamwar.velocitycore.listeners.ChatListener; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.sql.UserPerm; diff --git a/src/de/steamwar/bungeecore/commands/SetLocaleCommand.java b/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/SetLocaleCommand.java rename to src/de/steamwar/velocitycore/commands/SetLocaleCommand.java index 6a7fcbf..689485c 100644 --- a/src/de/steamwar/bungeecore/commands/SetLocaleCommand.java +++ b/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.network.NetworkSender; +import de.steamwar.velocitycore.network.NetworkSender; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.network.packets.server.LocaleInvalidationPacket; diff --git a/src/de/steamwar/bungeecore/commands/StatCommand.java b/src/de/steamwar/velocitycore/commands/StatCommand.java similarity index 96% rename from src/de/steamwar/bungeecore/commands/StatCommand.java rename to src/de/steamwar/velocitycore/commands/StatCommand.java index fcde6fe..d9694d6 100644 --- a/src/de/steamwar/bungeecore/commands/StatCommand.java +++ b/src/de/steamwar/velocitycore/commands/StatCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.Node; +import de.steamwar.velocitycore.Node; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.sql.UserPerm; diff --git a/src/de/steamwar/bungeecore/commands/TeamCommand.java b/src/de/steamwar/velocitycore/commands/TeamCommand.java similarity index 98% rename from src/de/steamwar/bungeecore/commands/TeamCommand.java rename to src/de/steamwar/velocitycore/commands/TeamCommand.java index c0ff9fe..a6fa700 100644 --- a/src/de/steamwar/bungeecore/commands/TeamCommand.java +++ b/src/de/steamwar/velocitycore/commands/TeamCommand.java @@ -17,15 +17,15 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.ConnectionRequestBuilder; import com.velocitypowered.api.proxy.server.ServerInfo; -import de.steamwar.bungeecore.Storage; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.inventory.SWItem; -import de.steamwar.bungeecore.inventory.SWListInv; +import de.steamwar.persistent.Storage; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.inventory.SWItem; +import de.steamwar.velocitycore.inventory.SWListInv; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; @@ -46,7 +46,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static de.steamwar.bungeecore.Storage.teamInvitations; +import static de.steamwar.persistent.Storage.teamInvitations; public class TeamCommand extends SWCommand { diff --git a/src/de/steamwar/bungeecore/commands/TeamchatCommand.java b/src/de/steamwar/velocitycore/commands/TeamchatCommand.java similarity index 93% rename from src/de/steamwar/bungeecore/commands/TeamchatCommand.java rename to src/de/steamwar/velocitycore/commands/TeamchatCommand.java index aa93620..6e9eb8e 100644 --- a/src/de/steamwar/bungeecore/commands/TeamchatCommand.java +++ b/src/de/steamwar/velocitycore/commands/TeamchatCommand.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.listeners.ChatListener; +import de.steamwar.velocitycore.listeners.ChatListener; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.ChatterGroup; diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/velocitycore/commands/TpCommand.java similarity index 94% rename from src/de/steamwar/bungeecore/commands/TpCommand.java rename to src/de/steamwar/velocitycore/commands/TpCommand.java index 2b29012..8bd203c 100644 --- a/src/de/steamwar/bungeecore/commands/TpCommand.java +++ b/src/de/steamwar/velocitycore/commands/TpCommand.java @@ -17,19 +17,21 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.*; -import de.steamwar.bungeecore.util.BauLock; -import de.steamwar.bungeecore.util.Chat19; +import de.steamwar.velocitycore.*; +import de.steamwar.velocitycore.util.BauLock; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; import de.steamwar.messages.Chatter; import de.steamwar.messages.PlayerChatter; +import de.steamwar.persistent.Bauserver; +import de.steamwar.persistent.Storage; +import de.steamwar.persistent.Subserver; import de.steamwar.sql.*; import java.util.ArrayList; @@ -56,9 +58,9 @@ public class TpCommand extends SWCommand { Player p = sender.getPlayer(); if (server == null || server.getPlayersConnected().contains(p)) { if (rest.length == 0) { - Chat19.chat(p, "/tp " + to); + p.spoofChatInput("/tp " + to); } else { - Chat19.chat(p, "/tp " + to + " " + String.join(" ", rest)); + p.spoofChatInput("/tp " + to + " " + String.join(" ", rest)); } return; } diff --git a/src/de/steamwar/bungeecore/commands/TutorialCommand.java b/src/de/steamwar/velocitycore/commands/TutorialCommand.java similarity index 91% rename from src/de/steamwar/bungeecore/commands/TutorialCommand.java rename to src/de/steamwar/velocitycore/commands/TutorialCommand.java index 217e80f..5b4e01f 100644 --- a/src/de/steamwar/bungeecore/commands/TutorialCommand.java +++ b/src/de/steamwar/velocitycore/commands/TutorialCommand.java @@ -17,19 +17,20 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.*; -import de.steamwar.bungeecore.inventory.SWInventory; -import de.steamwar.bungeecore.inventory.SWItem; -import de.steamwar.bungeecore.inventory.SWListInv; -import de.steamwar.bungeecore.inventory.SWStreamInv; -import de.steamwar.bungeecore.util.Chat19; +import de.steamwar.velocitycore.*; +import de.steamwar.velocitycore.inventory.SWInventory; +import de.steamwar.velocitycore.inventory.SWItem; +import de.steamwar.velocitycore.inventory.SWListInv; +import de.steamwar.velocitycore.inventory.SWStreamInv; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeValidator; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.messages.PlayerChatter; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.Tutorial; import de.steamwar.sql.UserPerm; @@ -37,7 +38,6 @@ import de.steamwar.sql.UserPerm; import java.io.File; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; public class TutorialCommand extends SWCommand { @@ -52,14 +52,14 @@ public class TutorialCommand extends SWCommand { @Register("rate") public void rate(PlayerChatter sender) { - Chat19.chat(sender.getPlayer(), "/tutorial rate"); + sender.getPlayer().spoofChatInput("/tutorial rate"); } @Register("rate") public void rate(PlayerChatter sender, int id) { Tutorial tutorial = Tutorial.get(id); if(tutorial == null) { - Chat19.chat(sender.getPlayer(), "/tutorial rate"); // Catch players manually entering numbers + sender.getPlayer().spoofChatInput("/tutorial rate"); // Catch players manually entering numbers return; } diff --git a/src/de/steamwar/bungeecore/commands/TypeMappers.java b/src/de/steamwar/velocitycore/commands/TypeMappers.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/TypeMappers.java rename to src/de/steamwar/velocitycore/commands/TypeMappers.java index 03ab43f..8036272 100644 --- a/src/de/steamwar/bungeecore/commands/TypeMappers.java +++ b/src/de/steamwar/velocitycore/commands/TypeMappers.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.ArenaMode; +import de.steamwar.velocitycore.ArenaMode; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommandUtils; import de.steamwar.command.TypeMapper; diff --git a/src/de/steamwar/bungeecore/commands/UnIgnoreCommand.java b/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/UnIgnoreCommand.java rename to src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java index 05e5a16..7f1a5de 100644 --- a/src/de/steamwar/bungeecore/commands/UnIgnoreCommand.java +++ b/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/VerifyCommand.java b/src/de/steamwar/velocitycore/commands/VerifyCommand.java similarity index 92% rename from src/de/steamwar/bungeecore/commands/VerifyCommand.java rename to src/de/steamwar/velocitycore/commands/VerifyCommand.java index efb061d..96324de 100644 --- a/src/de/steamwar/bungeecore/commands/VerifyCommand.java +++ b/src/de/steamwar/velocitycore/commands/VerifyCommand.java @@ -17,10 +17,10 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.util.AuthManager; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.util.AuthManager; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import net.dv8tion.jda.api.entities.User; diff --git a/src/de/steamwar/bungeecore/commands/WebpasswordCommand.java b/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java similarity index 98% rename from src/de/steamwar/bungeecore/commands/WebpasswordCommand.java rename to src/de/steamwar/velocitycore/commands/WebpasswordCommand.java index aca9126..ff3370c 100644 --- a/src/de/steamwar/bungeecore/commands/WebpasswordCommand.java +++ b/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/commands/WhoisCommand.java b/src/de/steamwar/velocitycore/commands/WhoisCommand.java similarity index 97% rename from src/de/steamwar/bungeecore/commands/WhoisCommand.java rename to src/de/steamwar/velocitycore/commands/WhoisCommand.java index 23527fd..6512c9c 100644 --- a/src/de/steamwar/bungeecore/commands/WhoisCommand.java +++ b/src/de/steamwar/velocitycore/commands/WhoisCommand.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.commands; +package de.steamwar.velocitycore.commands; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.Storage; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.mods.ModUtils; +import de.steamwar.persistent.Storage; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.mods.ModUtils; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; diff --git a/src/de/steamwar/bungeecore/discord/DiscordBot.java b/src/de/steamwar/velocitycore/discord/DiscordBot.java similarity index 94% rename from src/de/steamwar/bungeecore/discord/DiscordBot.java rename to src/de/steamwar/velocitycore/discord/DiscordBot.java index 57a6b3c..d816cc2 100644 --- a/src/de/steamwar/bungeecore/discord/DiscordBot.java +++ b/src/de/steamwar/velocitycore/discord/DiscordBot.java @@ -17,15 +17,15 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.discord; +package de.steamwar.velocitycore.discord; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.channels.*; -import de.steamwar.bungeecore.discord.listeners.ChannelListener; -import de.steamwar.bungeecore.discord.listeners.DiscordSchemUpload; -import de.steamwar.bungeecore.discord.listeners.DiscordTeamEvent; -import de.steamwar.bungeecore.discord.listeners.DiscordTicketHandler; -import de.steamwar.bungeecore.discord.util.AuthManager; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.channels.*; +import de.steamwar.velocitycore.discord.listeners.ChannelListener; +import de.steamwar.velocitycore.discord.listeners.DiscordSchemUpload; +import de.steamwar.velocitycore.discord.listeners.DiscordTeamEvent; +import de.steamwar.velocitycore.discord.listeners.DiscordTicketHandler; +import de.steamwar.velocitycore.discord.util.AuthManager; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; import de.steamwar.sql.Event; diff --git a/src/de/steamwar/bungeecore/discord/DiscordConfig.java b/src/de/steamwar/velocitycore/discord/DiscordConfig.java similarity index 95% rename from src/de/steamwar/bungeecore/discord/DiscordConfig.java rename to src/de/steamwar/velocitycore/discord/DiscordConfig.java index 112ac2d..be73aa5 100644 --- a/src/de/steamwar/bungeecore/discord/DiscordConfig.java +++ b/src/de/steamwar/velocitycore/discord/DiscordConfig.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord; +package de.steamwar.velocitycore.discord; -import de.steamwar.bungeecore.Config; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.Config; +import de.steamwar.velocitycore.VelocityCore; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; diff --git a/src/de/steamwar/bungeecore/discord/DiscordTicketType.java b/src/de/steamwar/velocitycore/discord/DiscordTicketType.java similarity index 97% rename from src/de/steamwar/bungeecore/discord/DiscordTicketType.java rename to src/de/steamwar/velocitycore/discord/DiscordTicketType.java index 93a50ba..5c6a218 100644 --- a/src/de/steamwar/bungeecore/discord/DiscordTicketType.java +++ b/src/de/steamwar/velocitycore/discord/DiscordTicketType.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord; +package de.steamwar.velocitycore.discord; import lombok.AllArgsConstructor; import net.dv8tion.jda.api.entities.Emoji; diff --git a/src/de/steamwar/bungeecore/discord/channels/ChecklistChannel.java b/src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java similarity index 94% rename from src/de/steamwar/bungeecore/discord/channels/ChecklistChannel.java rename to src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java index 25ba74c..af30ad0 100644 --- a/src/de/steamwar/bungeecore/discord/channels/ChecklistChannel.java +++ b/src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.channels; +package de.steamwar.velocitycore.discord.channels; -import de.steamwar.bungeecore.commands.CheckCommand; +import de.steamwar.velocitycore.commands.CheckCommand; import de.steamwar.sql.SteamwarUser; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/de/steamwar/bungeecore/discord/channels/DiscordChannel.java b/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java similarity index 95% rename from src/de/steamwar/bungeecore/discord/channels/DiscordChannel.java rename to src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java index 98663f2..aac9206 100644 --- a/src/de/steamwar/bungeecore/discord/channels/DiscordChannel.java +++ b/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.channels; +package de.steamwar.velocitycore.discord.channels; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.listeners.ChannelListener; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.listeners.ChannelListener; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.sql.SteamwarUser; diff --git a/src/de/steamwar/bungeecore/discord/channels/DiscordChatRoom.java b/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java similarity index 94% rename from src/de/steamwar/bungeecore/discord/channels/DiscordChatRoom.java rename to src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java index d291a0a..e09f76d 100644 --- a/src/de/steamwar/bungeecore/discord/channels/DiscordChatRoom.java +++ b/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.channels; +package de.steamwar.velocitycore.discord.channels; -import de.steamwar.bungeecore.listeners.ChatListener; +import de.steamwar.velocitycore.listeners.ChatListener; import de.steamwar.messages.Chatter; import de.steamwar.messages.ChatterGroup; import de.steamwar.sql.Punishment; diff --git a/src/de/steamwar/bungeecore/discord/channels/EventChannel.java b/src/de/steamwar/velocitycore/discord/channels/EventChannel.java similarity index 98% rename from src/de/steamwar/bungeecore/discord/channels/EventChannel.java rename to src/de/steamwar/velocitycore/discord/channels/EventChannel.java index adda3b2..b8d8b1b 100644 --- a/src/de/steamwar/bungeecore/discord/channels/EventChannel.java +++ b/src/de/steamwar/velocitycore/discord/channels/EventChannel.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.channels; +package de.steamwar.velocitycore.discord.channels; import de.steamwar.sql.Event; import de.steamwar.sql.EventFight; diff --git a/src/de/steamwar/bungeecore/discord/channels/InteractionReply.java b/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java similarity index 97% rename from src/de/steamwar/bungeecore/discord/channels/InteractionReply.java rename to src/de/steamwar/velocitycore/discord/channels/InteractionReply.java index fafcbda..cbacf53 100644 --- a/src/de/steamwar/bungeecore/discord/channels/InteractionReply.java +++ b/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.channels; +package de.steamwar.velocitycore.discord.channels; import net.dv8tion.jda.api.interactions.Interaction; import net.kyori.adventure.text.Component; diff --git a/src/de/steamwar/bungeecore/discord/channels/StaticMessageChannel.java b/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java similarity index 98% rename from src/de/steamwar/bungeecore/discord/channels/StaticMessageChannel.java rename to src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java index 7566ced..2041583 100644 --- a/src/de/steamwar/bungeecore/discord/channels/StaticMessageChannel.java +++ b/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.channels; +package de.steamwar.velocitycore.discord.channels; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.MessageBuilder; diff --git a/src/de/steamwar/bungeecore/discord/listeners/ChannelListener.java b/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java similarity index 92% rename from src/de/steamwar/bungeecore/discord/listeners/ChannelListener.java rename to src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java index 57a34ef..9bcc286 100644 --- a/src/de/steamwar/bungeecore/discord/listeners/ChannelListener.java +++ b/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.listeners; +package de.steamwar.velocitycore.discord.listeners; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.channels.DiscordChannel; -import de.steamwar.bungeecore.discord.channels.InteractionReply; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.channels.DiscordChannel; +import de.steamwar.velocitycore.discord.channels.InteractionReply; import de.steamwar.command.SWCommand; import de.steamwar.sql.UserPerm; import lombok.Getter; diff --git a/src/de/steamwar/bungeecore/discord/listeners/DiscordSchemUpload.java b/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java similarity index 95% rename from src/de/steamwar/bungeecore/discord/listeners/DiscordSchemUpload.java rename to src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java index 7d3a4a2..e8969a7 100644 --- a/src/de/steamwar/bungeecore/discord/listeners/DiscordSchemUpload.java +++ b/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.listeners; +package de.steamwar.velocitycore.discord.listeners; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.channels.DiscordChannel; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.channels.DiscordChannel; import de.steamwar.sql.NodeData; import de.steamwar.sql.Punishment; import de.steamwar.sql.SchematicNode; diff --git a/src/de/steamwar/bungeecore/discord/listeners/DiscordTeamEvent.java b/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java similarity index 90% rename from src/de/steamwar/bungeecore/discord/listeners/DiscordTeamEvent.java rename to src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java index c6aef17..d18de22 100644 --- a/src/de/steamwar/bungeecore/discord/listeners/DiscordTeamEvent.java +++ b/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java @@ -17,11 +17,11 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.listeners; +package de.steamwar.velocitycore.discord.listeners; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.channels.InteractionReply; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.channels.InteractionReply; import de.steamwar.sql.Event; import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/de/steamwar/bungeecore/discord/listeners/DiscordTicketHandler.java b/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java similarity index 96% rename from src/de/steamwar/bungeecore/discord/listeners/DiscordTicketHandler.java rename to src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java index be8a970..056fe6f 100644 --- a/src/de/steamwar/bungeecore/discord/listeners/DiscordTicketHandler.java +++ b/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.listeners; +package de.steamwar.velocitycore.discord.listeners; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.DiscordTicketType; -import de.steamwar.bungeecore.discord.channels.DiscordChannel; -import de.steamwar.bungeecore.discord.channels.InteractionReply; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.DiscordTicketType; +import de.steamwar.velocitycore.discord.channels.DiscordChannel; +import de.steamwar.velocitycore.discord.channels.InteractionReply; import de.steamwar.messages.Chatter; import de.steamwar.messages.ChatterGroup; import de.steamwar.messages.Message; diff --git a/src/de/steamwar/bungeecore/discord/util/AuthManager.java b/src/de/steamwar/velocitycore/discord/util/AuthManager.java similarity index 94% rename from src/de/steamwar/bungeecore/discord/util/AuthManager.java rename to src/de/steamwar/velocitycore/discord/util/AuthManager.java index b05412a..972f77f 100644 --- a/src/de/steamwar/bungeecore/discord/util/AuthManager.java +++ b/src/de/steamwar/velocitycore/discord/util/AuthManager.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.util; +package de.steamwar.velocitycore.discord.util; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.discord.channels.DiscordChannel; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.discord.channels.DiscordChannel; import de.steamwar.sql.SteamwarUser; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.MessageBuilder; diff --git a/src/de/steamwar/bungeecore/discord/util/DiscordAlert.java b/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java similarity index 93% rename from src/de/steamwar/bungeecore/discord/util/DiscordAlert.java rename to src/de/steamwar/velocitycore/discord/util/DiscordAlert.java index 2d132d3..5f65f99 100644 --- a/src/de/steamwar/bungeecore/discord/util/DiscordAlert.java +++ b/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java @@ -17,11 +17,11 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.util; +package de.steamwar.velocitycore.discord.util; import de.steamwar.messages.Message; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.channels.DiscordChannel; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.channels.DiscordChannel; import de.steamwar.messages.Chatter; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/de/steamwar/bungeecore/discord/util/DiscordRanks.java b/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java similarity index 95% rename from src/de/steamwar/bungeecore/discord/util/DiscordRanks.java rename to src/de/steamwar/velocitycore/discord/util/DiscordRanks.java index a4eb43a..0a9c769 100644 --- a/src/de/steamwar/bungeecore/discord/util/DiscordRanks.java +++ b/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.discord.util; +package de.steamwar.velocitycore.discord.util; -import de.steamwar.bungeecore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.DiscordBot; import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.UserPerm; import lombok.experimental.UtilityClass; diff --git a/src/de/steamwar/bungeecore/inventory/InvCallback.java b/src/de/steamwar/velocitycore/inventory/InvCallback.java similarity index 97% rename from src/de/steamwar/bungeecore/inventory/InvCallback.java rename to src/de/steamwar/velocitycore/inventory/InvCallback.java index b1fb2f8..1e03431 100644 --- a/src/de/steamwar/bungeecore/inventory/InvCallback.java +++ b/src/de/steamwar/velocitycore/inventory/InvCallback.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.inventory; +package de.steamwar.velocitycore.inventory; public interface InvCallback { diff --git a/src/de/steamwar/bungeecore/inventory/SWInventory.java b/src/de/steamwar/velocitycore/inventory/SWInventory.java similarity index 95% rename from src/de/steamwar/bungeecore/inventory/SWInventory.java rename to src/de/steamwar/velocitycore/inventory/SWInventory.java index 5a835c5..3603401 100644 --- a/src/de/steamwar/bungeecore/inventory/SWInventory.java +++ b/src/de/steamwar/velocitycore/inventory/SWInventory.java @@ -17,11 +17,11 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.inventory; +package de.steamwar.velocitycore.inventory; import de.steamwar.messages.Message; -import de.steamwar.bungeecore.network.NetworkSender; -import de.steamwar.bungeecore.network.handlers.InventoryCallbackHandler; +import de.steamwar.velocitycore.network.NetworkSender; +import de.steamwar.velocitycore.network.handlers.InventoryCallbackHandler; import de.steamwar.messages.Chatter; import de.steamwar.messages.PlayerChatter; import de.steamwar.network.packets.server.CloseInventoryPacket; diff --git a/src/de/steamwar/bungeecore/inventory/SWItem.java b/src/de/steamwar/velocitycore/inventory/SWItem.java similarity index 98% rename from src/de/steamwar/bungeecore/inventory/SWItem.java rename to src/de/steamwar/velocitycore/inventory/SWItem.java index 19bca43..c2db126 100644 --- a/src/de/steamwar/bungeecore/inventory/SWItem.java +++ b/src/de/steamwar/velocitycore/inventory/SWItem.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.inventory; +package de.steamwar.velocitycore.inventory; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/de/steamwar/bungeecore/inventory/SWListInv.java b/src/de/steamwar/velocitycore/inventory/SWListInv.java similarity index 98% rename from src/de/steamwar/bungeecore/inventory/SWListInv.java rename to src/de/steamwar/velocitycore/inventory/SWListInv.java index da840ab..44f3deb 100644 --- a/src/de/steamwar/bungeecore/inventory/SWListInv.java +++ b/src/de/steamwar/velocitycore/inventory/SWListInv.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.inventory; +package de.steamwar.velocitycore.inventory; import de.steamwar.messages.Message; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/inventory/SWStreamInv.java b/src/de/steamwar/velocitycore/inventory/SWStreamInv.java similarity index 98% rename from src/de/steamwar/bungeecore/inventory/SWStreamInv.java rename to src/de/steamwar/velocitycore/inventory/SWStreamInv.java index b4c2ff6..2d82e35 100644 --- a/src/de/steamwar/bungeecore/inventory/SWStreamInv.java +++ b/src/de/steamwar/velocitycore/inventory/SWStreamInv.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.inventory; +package de.steamwar.velocitycore.inventory; import de.steamwar.messages.Message; import de.steamwar.messages.PlayerChatter; diff --git a/src/de/steamwar/bungeecore/listeners/BanListener.java b/src/de/steamwar/velocitycore/listeners/BanListener.java similarity index 95% rename from src/de/steamwar/bungeecore/listeners/BanListener.java rename to src/de/steamwar/velocitycore/listeners/BanListener.java index 2abb61d..f49323b 100644 --- a/src/de/steamwar/bungeecore/listeners/BanListener.java +++ b/src/de/steamwar/velocitycore/listeners/BanListener.java @@ -17,13 +17,13 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.LoginEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.commands.PunishmentCommand; -import de.steamwar.bungeecore.commands.WebpasswordCommand; +import de.steamwar.velocitycore.commands.PunishmentCommand; +import de.steamwar.velocitycore.commands.WebpasswordCommand; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.sql.BannedUserIPs; diff --git a/src/de/steamwar/bungeecore/listeners/BasicListener.java b/src/de/steamwar/velocitycore/listeners/BasicListener.java similarity index 91% rename from src/de/steamwar/bungeecore/listeners/BasicListener.java rename to src/de/steamwar/velocitycore/listeners/BasicListener.java index 319e05b..34e2c76 100644 --- a/src/de/steamwar/bungeecore/listeners/BasicListener.java +++ b/src/de/steamwar/velocitycore/listeners/BasicListener.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; public abstract class BasicListener { diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/velocitycore/listeners/ChatListener.java similarity index 93% rename from src/de/steamwar/bungeecore/listeners/ChatListener.java rename to src/de/steamwar/velocitycore/listeners/ChatListener.java index 8d30c9d..2c871bc 100644 --- a/src/de/steamwar/bungeecore/listeners/ChatListener.java +++ b/src/de/steamwar/velocitycore/listeners/ChatListener.java @@ -17,20 +17,19 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.player.PlayerChatEvent; import com.velocitypowered.api.event.player.TabCompleteEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.commands.PunishmentCommand; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.network.NetworkSender; -import de.steamwar.bungeecore.util.Chat19; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.commands.PunishmentCommand; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.network.NetworkSender; import de.steamwar.messages.Chatter; import de.steamwar.messages.ChatterGroup; import de.steamwar.messages.Message; @@ -86,7 +85,7 @@ public class ChatListener extends BasicListener { if(filteredCommand(Chatter.of(player), message)) return true; - Chat19.chat(player, message); + player.spoofChatInput(message); } return isCommand; @@ -108,8 +107,6 @@ public class ChatListener extends BasicListener { } - chatToReciever(Chatter.console(), msgReceiver, user, format, coloredMessage); - if(format.equals("CHAT_GLOBAL")) { DiscordBot.withBot(bot -> chatToReciever(bot.getIngameChat(), msgReceiver, user, format, coloredMessage)); } else if (format.equals("CHAT_SERVERTEAM")) { @@ -131,7 +128,7 @@ public class ChatListener extends BasicListener { if(!message.startsWith("/") && chatFilter(sender, message)) return; - Chat19.chat(sender.getPlayer(), message); + sender.getPlayer().spoofChatInput(message); } private static boolean chatFilter(Chatter sender, String message) { diff --git a/src/de/steamwar/bungeecore/listeners/CheckListener.java b/src/de/steamwar/velocitycore/listeners/CheckListener.java similarity index 91% rename from src/de/steamwar/bungeecore/listeners/CheckListener.java rename to src/de/steamwar/velocitycore/listeners/CheckListener.java index 440f0f1..4666816 100644 --- a/src/de/steamwar/bungeecore/listeners/CheckListener.java +++ b/src/de/steamwar/velocitycore/listeners/CheckListener.java @@ -17,17 +17,17 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.event.player.ServerConnectedEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.Bauserver; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.commands.CheckCommand; +import de.steamwar.persistent.Bauserver; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.commands.CheckCommand; import de.steamwar.messages.Chatter; import de.steamwar.sql.SchematicNode; import de.steamwar.sql.SchematicType; diff --git a/src/de/steamwar/bungeecore/listeners/ConnectionListener.java b/src/de/steamwar/velocitycore/listeners/ConnectionListener.java similarity index 87% rename from src/de/steamwar/bungeecore/listeners/ConnectionListener.java rename to src/de/steamwar/velocitycore/listeners/ConnectionListener.java index 5555d05..35a4967 100644 --- a/src/de/steamwar/bungeecore/listeners/ConnectionListener.java +++ b/src/de/steamwar/velocitycore/listeners/ConnectionListener.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; @@ -26,16 +26,16 @@ import com.velocitypowered.api.event.permission.PermissionsSetupEvent; import com.velocitypowered.api.event.player.KickedFromServerEvent; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.commands.ChallengeCommand; -import de.steamwar.bungeecore.commands.CheckCommand; -import de.steamwar.bungeecore.commands.ModCommand; -import de.steamwar.bungeecore.commands.MsgCommand; -import de.steamwar.bungeecore.discord.DiscordBot; -import de.steamwar.bungeecore.discord.util.DiscordRanks; -import de.steamwar.bungeecore.mods.ModUtils; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.commands.ChallengeCommand; +import de.steamwar.velocitycore.commands.CheckCommand; +import de.steamwar.velocitycore.commands.ModCommand; +import de.steamwar.velocitycore.commands.MsgCommand; +import de.steamwar.velocitycore.discord.DiscordBot; +import de.steamwar.velocitycore.discord.util.DiscordRanks; +import de.steamwar.velocitycore.mods.ModUtils; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; import de.steamwar.sql.SteamwarUser; diff --git a/src/de/steamwar/bungeecore/listeners/EventModeListener.java b/src/de/steamwar/velocitycore/listeners/EventModeListener.java similarity index 97% rename from src/de/steamwar/bungeecore/listeners/EventModeListener.java rename to src/de/steamwar/velocitycore/listeners/EventModeListener.java index 4cce83f..5cc5575 100644 --- a/src/de/steamwar/bungeecore/listeners/EventModeListener.java +++ b/src/de/steamwar/velocitycore/listeners/EventModeListener.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PostLoginEvent; diff --git a/src/de/steamwar/bungeecore/listeners/IPSanitizer.java b/src/de/steamwar/velocitycore/listeners/IPSanitizer.java similarity index 88% rename from src/de/steamwar/bungeecore/listeners/IPSanitizer.java rename to src/de/steamwar/velocitycore/listeners/IPSanitizer.java index 359497f..7b0876a 100644 --- a/src/de/steamwar/bungeecore/listeners/IPSanitizer.java +++ b/src/de/steamwar/velocitycore/listeners/IPSanitizer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PreLoginEvent; @@ -25,9 +25,9 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.proxy.connection.MinecraftConnection; import com.velocitypowered.proxy.connection.client.ConnectedPlayer; import com.velocitypowered.proxy.connection.client.LoginInboundConnection; -import de.steamwar.bungeecore.Reflection; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.mods.Hostname; +import de.steamwar.persistent.Reflection; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.mods.Hostname; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -36,7 +36,7 @@ import java.util.logging.Level; public class IPSanitizer extends BasicListener { - private static final Reflection.Field remoteAddress = Reflection.getField(MinecraftConnection.class, "remoteAddress"); + private static final Reflection.Field remoteAddress = new Reflection.Field<>(MinecraftConnection.class, "remoteAddress"); public static InetAddress getTrueAddress(Player player) { return ((InetSocketAddress) ((ConnectedPlayer)player).getConnection().getChannel().remoteAddress()).getAddress(); diff --git a/src/de/steamwar/bungeecore/listeners/PluginMessage.java b/src/de/steamwar/velocitycore/listeners/PluginMessage.java similarity index 98% rename from src/de/steamwar/bungeecore/listeners/PluginMessage.java rename to src/de/steamwar/velocitycore/listeners/PluginMessage.java index 63224f5..ae0c59f 100644 --- a/src/de/steamwar/bungeecore/listeners/PluginMessage.java +++ b/src/de/steamwar/velocitycore/listeners/PluginMessage.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.lunarclient.apollo.ApolloManager; import com.velocitypowered.api.event.Subscribe; @@ -29,10 +29,10 @@ import com.velocitypowered.api.proxy.messages.ChannelMessageSource; import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.commands.TeamCommand; -import de.steamwar.bungeecore.mods.*; -import de.steamwar.bungeecore.network.ServerMetaInfo; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.commands.TeamCommand; +import de.steamwar.velocitycore.mods.*; +import de.steamwar.velocitycore.network.ServerMetaInfo; import de.steamwar.messages.Chatter; import de.steamwar.network.packets.NetworkPacket; import io.netty.buffer.ByteBuf; diff --git a/src/de/steamwar/bungeecore/listeners/PollSystem.java b/src/de/steamwar/velocitycore/listeners/PollSystem.java similarity index 95% rename from src/de/steamwar/bungeecore/listeners/PollSystem.java rename to src/de/steamwar/velocitycore/listeners/PollSystem.java index 443795e..2b5a31a 100644 --- a/src/de/steamwar/bungeecore/listeners/PollSystem.java +++ b/src/de/steamwar/velocitycore/listeners/PollSystem.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PostLoginEvent; -import de.steamwar.bungeecore.Config; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.Config; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.command.TypeValidator; import de.steamwar.messages.Chatter; import de.steamwar.messages.Message; diff --git a/src/de/steamwar/bungeecore/listeners/SessionManager.java b/src/de/steamwar/velocitycore/listeners/SessionManager.java similarity index 91% rename from src/de/steamwar/bungeecore/listeners/SessionManager.java rename to src/de/steamwar/velocitycore/listeners/SessionManager.java index 0d3260e..7caeac1 100644 --- a/src/de/steamwar/bungeecore/listeners/SessionManager.java +++ b/src/de/steamwar/velocitycore/listeners/SessionManager.java @@ -17,19 +17,19 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; import com.velocitypowered.api.event.connection.PostLoginEvent; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.sql.Session; import de.steamwar.sql.SteamwarUser; import java.sql.Timestamp; import java.time.Instant; -import static de.steamwar.bungeecore.Storage.sessions; +import static de.steamwar.persistent.Storage.sessions; public class SessionManager extends BasicListener { diff --git a/src/de/steamwar/bungeecore/listeners/SettingsChangedListener.java b/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java similarity index 91% rename from src/de/steamwar/bungeecore/listeners/SettingsChangedListener.java rename to src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java index 67b243e..59693af 100644 --- a/src/de/steamwar/bungeecore/listeners/SettingsChangedListener.java +++ b/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.listeners; +package de.steamwar.velocitycore.listeners; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.player.PlayerSettingsChangedEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.network.NetworkSender; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.network.NetworkSender; import de.steamwar.sql.SteamwarUser; import de.steamwar.network.packets.server.LocaleInvalidationPacket; diff --git a/src/de/steamwar/bungeecore/mods/Badlion.java b/src/de/steamwar/velocitycore/mods/Badlion.java similarity index 98% rename from src/de/steamwar/bungeecore/mods/Badlion.java rename to src/de/steamwar/velocitycore/mods/Badlion.java index 287badd..74c18eb 100644 --- a/src/de/steamwar/bungeecore/mods/Badlion.java +++ b/src/de/steamwar/velocitycore/mods/Badlion.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.google.gson.JsonObject; import com.velocitypowered.api.proxy.Player; diff --git a/src/de/steamwar/bungeecore/mods/Controlify.java b/src/de/steamwar/velocitycore/mods/Controlify.java similarity index 95% rename from src/de/steamwar/bungeecore/mods/Controlify.java rename to src/de/steamwar/velocitycore/mods/Controlify.java index 2cf70e9..56b7f22 100644 --- a/src/de/steamwar/bungeecore/mods/Controlify.java +++ b/src/de/steamwar/velocitycore/mods/Controlify.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import de.steamwar.bungeecore.listeners.PluginMessage; +import de.steamwar.velocitycore.listeners.PluginMessage; public class Controlify { //https://modrinth.com/mod/controlify diff --git a/src/de/steamwar/bungeecore/mods/FML.java b/src/de/steamwar/velocitycore/mods/FML.java similarity index 96% rename from src/de/steamwar/bungeecore/mods/FML.java rename to src/de/steamwar/velocitycore/mods/FML.java index 684cab7..13d3497 100644 --- a/src/de/steamwar/bungeecore/mods/FML.java +++ b/src/de/steamwar/velocitycore/mods/FML.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PluginMessageEvent; @@ -26,8 +26,8 @@ import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.BasicListener; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.BasicListener; import de.steamwar.messages.Chatter; import de.steamwar.sql.Mod; import io.netty.buffer.ByteBuf; diff --git a/src/de/steamwar/bungeecore/mods/FML2.java b/src/de/steamwar/velocitycore/mods/FML2.java similarity index 97% rename from src/de/steamwar/bungeecore/mods/FML2.java rename to src/de/steamwar/velocitycore/mods/FML2.java index af1a2e2..fa0917d 100644 --- a/src/de/steamwar/bungeecore/mods/FML2.java +++ b/src/de/steamwar/velocitycore/mods/FML2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PreLoginEvent; @@ -25,9 +25,9 @@ import com.velocitypowered.api.proxy.LoginPhaseConnection; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.proxy.connection.client.LoginInboundConnection; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.BasicListener; -import de.steamwar.bungeecore.listeners.PluginMessage; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.BasicListener; +import de.steamwar.velocitycore.listeners.PluginMessage; import de.steamwar.sql.Mod; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/de/steamwar/bungeecore/mods/FabricModSender.java b/src/de/steamwar/velocitycore/mods/FabricModSender.java similarity index 96% rename from src/de/steamwar/bungeecore/mods/FabricModSender.java rename to src/de/steamwar/velocitycore/mods/FabricModSender.java index 728b6c3..2f492a8 100644 --- a/src/de/steamwar/bungeecore/mods/FabricModSender.java +++ b/src/de/steamwar/velocitycore/mods/FabricModSender.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -28,9 +28,9 @@ import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.event.player.ServerConnectedEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import de.steamwar.bungeecore.Storage; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.BasicListener; +import de.steamwar.persistent.Storage; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.BasicListener; import de.steamwar.sql.Mod; import de.steamwar.sql.SWException; import de.steamwar.sql.SteamwarUser; diff --git a/src/de/steamwar/bungeecore/mods/Feather.java b/src/de/steamwar/velocitycore/mods/Feather.java similarity index 98% rename from src/de/steamwar/bungeecore/mods/Feather.java rename to src/de/steamwar/velocitycore/mods/Feather.java index 71f2ed9..34fb7f9 100644 --- a/src/de/steamwar/bungeecore/mods/Feather.java +++ b/src/de/steamwar/velocitycore/mods/Feather.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/de/steamwar/bungeecore/mods/Hostname.java b/src/de/steamwar/velocitycore/mods/Hostname.java similarity index 90% rename from src/de/steamwar/bungeecore/mods/Hostname.java rename to src/de/steamwar/velocitycore/mods/Hostname.java index bff0526..dfba361 100644 --- a/src/de/steamwar/bungeecore/mods/Hostname.java +++ b/src/de/steamwar/velocitycore/mods/Hostname.java @@ -17,16 +17,16 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.ConnectionHandshakeEvent; import com.velocitypowered.proxy.connection.client.InitialInboundConnection; import com.velocitypowered.proxy.connection.client.LoginInboundConnection; import com.velocitypowered.proxy.protocol.packet.HandshakePacket; -import de.steamwar.bungeecore.Reflection; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.BasicListener; +import de.steamwar.persistent.Reflection; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.BasicListener; import java.util.HashSet; import java.util.Set; @@ -34,12 +34,12 @@ import java.util.logging.Level; public class Hostname extends BasicListener { - private static final Reflection.Field delegate = Reflection.getField(LoginInboundConnection.class, "delegate"); + private static final Reflection.Field delegate = new Reflection.Field<>(LoginInboundConnection.class, "delegate"); public static InitialInboundConnection getInitialInboundConnection(LoginInboundConnection loginInboundConnection) { return delegate.get(loginInboundConnection); } - private static final Reflection.Field handshake = Reflection.getField(InitialInboundConnection.class, "handshake"); + private static final Reflection.Field handshake = new Reflection.Field<>(InitialInboundConnection.class, "handshake"); public static String getExtraHandshakeData(LoginInboundConnection loginInboundConnection) { HandshakePacket handshakePacket = handshake.get(getInitialInboundConnection(loginInboundConnection)); int i = handshakePacket.getServerAddress().indexOf('\0'); diff --git a/src/de/steamwar/bungeecore/mods/LabyMod.java b/src/de/steamwar/velocitycore/mods/LabyMod.java similarity index 95% rename from src/de/steamwar/bungeecore/mods/LabyMod.java rename to src/de/steamwar/velocitycore/mods/LabyMod.java index 16cad5c..1db3c08 100644 --- a/src/de/steamwar/bungeecore/mods/LabyMod.java +++ b/src/de/steamwar/velocitycore/mods/LabyMod.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -25,8 +25,8 @@ import com.google.gson.JsonParser; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.PluginMessage; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.PluginMessage; import de.steamwar.sql.Mod; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/de/steamwar/bungeecore/mods/Lunar.java b/src/de/steamwar/velocitycore/mods/Lunar.java similarity index 98% rename from src/de/steamwar/bungeecore/mods/Lunar.java rename to src/de/steamwar/velocitycore/mods/Lunar.java index eba88c8..de39b37 100644 --- a/src/de/steamwar/bungeecore/mods/Lunar.java +++ b/src/de/steamwar/velocitycore/mods/Lunar.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.lunarclient.apollo.ApolloManager; import com.lunarclient.apollo.libs.protobuf.Any; @@ -35,7 +35,7 @@ import com.lunarclient.apollo.player.v1.PlayerHandshakeMessage; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.sql.Mod; import lombok.AllArgsConstructor; diff --git a/src/de/steamwar/bungeecore/mods/ModUtils.java b/src/de/steamwar/velocitycore/mods/ModUtils.java similarity index 96% rename from src/de/steamwar/bungeecore/mods/ModUtils.java rename to src/de/steamwar/velocitycore/mods/ModUtils.java index d08471a..4342103 100644 --- a/src/de/steamwar/bungeecore/mods/ModUtils.java +++ b/src/de/steamwar/velocitycore/mods/ModUtils.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.commands.PunishmentCommand; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.commands.PunishmentCommand; import de.steamwar.messages.Chatter; import de.steamwar.sql.Mod; import de.steamwar.sql.Mod.ModType; diff --git a/src/de/steamwar/bungeecore/mods/ReplayMod.java b/src/de/steamwar/velocitycore/mods/ReplayMod.java similarity index 88% rename from src/de/steamwar/bungeecore/mods/ReplayMod.java rename to src/de/steamwar/velocitycore/mods/ReplayMod.java index 3270908..45ba219 100644 --- a/src/de/steamwar/bungeecore/mods/ReplayMod.java +++ b/src/de/steamwar/velocitycore/mods/ReplayMod.java @@ -17,17 +17,17 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.player.ServerPostConnectEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.Bauserver; -import de.steamwar.bungeecore.Builderserver; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.listeners.BasicListener; -import de.steamwar.bungeecore.listeners.PluginMessage; +import de.steamwar.persistent.Bauserver; +import de.steamwar.persistent.Builderserver; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.listeners.BasicListener; +import de.steamwar.velocitycore.listeners.PluginMessage; import java.util.Arrays; diff --git a/src/de/steamwar/bungeecore/mods/Schematica.java b/src/de/steamwar/velocitycore/mods/Schematica.java similarity index 94% rename from src/de/steamwar/bungeecore/mods/Schematica.java rename to src/de/steamwar/velocitycore/mods/Schematica.java index 20b33a7..9cf2c0c 100644 --- a/src/de/steamwar/bungeecore/mods/Schematica.java +++ b/src/de/steamwar/velocitycore/mods/Schematica.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier; -import de.steamwar.bungeecore.listeners.BasicListener; +import de.steamwar.velocitycore.listeners.BasicListener; public class Schematica extends BasicListener { // https://github.com/Lunatrius/SchematicaPlugin/blob/master/src/main/java/com/github/lunatrius/schematica/plugin/SchematicaPlugin.java diff --git a/src/de/steamwar/bungeecore/mods/ServerListPing.java b/src/de/steamwar/velocitycore/mods/ServerListPing.java similarity index 98% rename from src/de/steamwar/bungeecore/mods/ServerListPing.java rename to src/de/steamwar/velocitycore/mods/ServerListPing.java index 5edc9dc..2f04e9d 100644 --- a/src/de/steamwar/bungeecore/mods/ServerListPing.java +++ b/src/de/steamwar/velocitycore/mods/ServerListPing.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.google.gson.*; import com.velocitypowered.api.proxy.server.ServerPing; diff --git a/src/de/steamwar/bungeecore/mods/WorldDownloader.java b/src/de/steamwar/velocitycore/mods/WorldDownloader.java similarity index 95% rename from src/de/steamwar/bungeecore/mods/WorldDownloader.java rename to src/de/steamwar/velocitycore/mods/WorldDownloader.java index 45e2f04..32a90ea 100644 --- a/src/de/steamwar/bungeecore/mods/WorldDownloader.java +++ b/src/de/steamwar/velocitycore/mods/WorldDownloader.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.mods; +package de.steamwar.velocitycore.mods; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.listeners.PluginMessage; +import de.steamwar.velocitycore.listeners.PluginMessage; public class WorldDownloader { // https://wiki.vg/Plugin_channels/World_downloader diff --git a/src/de/steamwar/bungeecore/network/NetworkSender.java b/src/de/steamwar/velocitycore/network/NetworkSender.java similarity index 97% rename from src/de/steamwar/bungeecore/network/NetworkSender.java rename to src/de/steamwar/velocitycore/network/NetworkSender.java index 7895606..8f0fd58 100644 --- a/src/de/steamwar/bungeecore/network/NetworkSender.java +++ b/src/de/steamwar/velocitycore/network/NetworkSender.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.network; +package de.steamwar.velocitycore.network; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.messages.ChannelIdentifier; diff --git a/src/de/steamwar/bungeecore/network/ServerMetaInfo.java b/src/de/steamwar/velocitycore/network/ServerMetaInfo.java similarity index 95% rename from src/de/steamwar/bungeecore/network/ServerMetaInfo.java rename to src/de/steamwar/velocitycore/network/ServerMetaInfo.java index 38d70ee..9b4aeea 100644 --- a/src/de/steamwar/bungeecore/network/ServerMetaInfo.java +++ b/src/de/steamwar/velocitycore/network/ServerMetaInfo.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.network; +package de.steamwar.velocitycore.network; import com.velocitypowered.api.proxy.ServerConnection; import de.steamwar.network.packets.MetaInfos; diff --git a/src/de/steamwar/bungeecore/network/handlers/EloPlayerHandler.java b/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java similarity index 98% rename from src/de/steamwar/bungeecore/network/handlers/EloPlayerHandler.java rename to src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java index 74e1aa4..327adba 100644 --- a/src/de/steamwar/bungeecore/network/handlers/EloPlayerHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.common.FightEndsPacket; import de.steamwar.sql.SchematicType; diff --git a/src/de/steamwar/bungeecore/network/handlers/EloSchemHandler.java b/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java similarity index 96% rename from src/de/steamwar/bungeecore/network/handlers/EloSchemHandler.java rename to src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java index af98430..6814473 100644 --- a/src/de/steamwar/bungeecore/network/handlers/EloSchemHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; -import de.steamwar.bungeecore.ArenaMode; +import de.steamwar.velocitycore.ArenaMode; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.common.FightEndsPacket; import de.steamwar.sql.SchemElo; diff --git a/src/de/steamwar/bungeecore/network/handlers/ExecuteCommandHandler.java b/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java similarity index 93% rename from src/de/steamwar/bungeecore/network/handlers/ExecuteCommandHandler.java rename to src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java index 889dd41..e96f928 100644 --- a/src/de/steamwar/bungeecore/network/handlers/ExecuteCommandHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.client.ExecuteCommandPacket; import de.steamwar.sql.SteamwarUser; diff --git a/src/de/steamwar/bungeecore/network/handlers/FightInfoHandler.java b/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java similarity index 89% rename from src/de/steamwar/bungeecore/network/handlers/FightInfoHandler.java rename to src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java index faabcc0..6565f1d 100644 --- a/src/de/steamwar/bungeecore/network/handlers/FightInfoHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java @@ -17,13 +17,13 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.network.NetworkSender; -import de.steamwar.bungeecore.network.ServerMetaInfo; -import de.steamwar.bungeecore.tablist.TablistManager; +import de.steamwar.velocitycore.network.NetworkSender; +import de.steamwar.velocitycore.network.ServerMetaInfo; +import de.steamwar.velocitycore.tablist.TablistManager; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.common.FightInfoPacket; diff --git a/src/de/steamwar/bungeecore/network/handlers/ImALobbyHandler.java b/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java similarity index 91% rename from src/de/steamwar/bungeecore/network/handlers/ImALobbyHandler.java rename to src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java index 23a1e39..391ee1b 100644 --- a/src/de/steamwar/bungeecore/network/handlers/ImALobbyHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java @@ -17,9 +17,9 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; -import de.steamwar.bungeecore.network.ServerMetaInfo; +import de.steamwar.velocitycore.network.ServerMetaInfo; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.client.ImALobbyPacket; diff --git a/src/de/steamwar/bungeecore/network/handlers/InventoryCallbackHandler.java b/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java similarity index 90% rename from src/de/steamwar/bungeecore/network/handlers/InventoryCallbackHandler.java rename to src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java index ae1a789..54668d9 100644 --- a/src/de/steamwar/bungeecore/network/handlers/InventoryCallbackHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java @@ -17,13 +17,13 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.inventory.InvCallback; -import de.steamwar.bungeecore.inventory.SWInventory; -import de.steamwar.bungeecore.network.NetworkSender; -import de.steamwar.bungeecore.network.ServerMetaInfo; +import de.steamwar.velocitycore.inventory.InvCallback; +import de.steamwar.velocitycore.inventory.SWInventory; +import de.steamwar.velocitycore.network.NetworkSender; +import de.steamwar.velocitycore.network.ServerMetaInfo; import de.steamwar.messages.Chatter; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.client.InventoryCallbackPacket; diff --git a/src/de/steamwar/bungeecore/network/handlers/PrepareSchemHandler.java b/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java similarity index 88% rename from src/de/steamwar/bungeecore/network/handlers/PrepareSchemHandler.java rename to src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java index 8b6cf99..eec027c 100644 --- a/src/de/steamwar/bungeecore/network/handlers/PrepareSchemHandler.java +++ b/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java @@ -17,12 +17,12 @@ along with this program. If not, see . */ -package de.steamwar.bungeecore.network.handlers; +package de.steamwar.velocitycore.network.handlers; import com.velocitypowered.api.proxy.Player; -import de.steamwar.bungeecore.ArenaMode; -import de.steamwar.bungeecore.ServerStarter; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.velocitycore.ArenaMode; +import de.steamwar.velocitycore.ServerStarter; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.network.packets.PacketHandler; import de.steamwar.network.packets.client.PrepareSchemPacket; import de.steamwar.sql.SchematicType; diff --git a/src/de/steamwar/bungeecore/tablist/Tablist.java b/src/de/steamwar/velocitycore/tablist/Tablist.java similarity index 99% rename from src/de/steamwar/bungeecore/tablist/Tablist.java rename to src/de/steamwar/velocitycore/tablist/Tablist.java index 76e48d9..8438f11 100644 --- a/src/de/steamwar/bungeecore/tablist/Tablist.java +++ b/src/de/steamwar/velocitycore/tablist/Tablist.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.tablist; +package de.steamwar.velocitycore.tablist; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.util.GameProfile; @@ -29,8 +29,8 @@ import com.velocitypowered.proxy.protocol.packet.RemovePlayerInfoPacket; import com.velocitypowered.proxy.protocol.packet.UpdateTeamsPacket; import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket; import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder; -import de.steamwar.bungeecore.Storage; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.persistent.Storage; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.messages.Chatter; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/src/de/steamwar/bungeecore/tablist/TablistBuild.java b/src/de/steamwar/velocitycore/tablist/TablistBuild.java similarity index 92% rename from src/de/steamwar/bungeecore/tablist/TablistBuild.java rename to src/de/steamwar/velocitycore/tablist/TablistBuild.java index 31aaf69..7a233cb 100644 --- a/src/de/steamwar/bungeecore/tablist/TablistBuild.java +++ b/src/de/steamwar/velocitycore/tablist/TablistBuild.java @@ -17,20 +17,19 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.tablist; +package de.steamwar.velocitycore.tablist; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.messages.Chatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; public class TablistBuild implements TablistPart { diff --git a/src/de/steamwar/bungeecore/tablist/TablistGroup.java b/src/de/steamwar/velocitycore/tablist/TablistGroup.java similarity index 97% rename from src/de/steamwar/bungeecore/tablist/TablistGroup.java rename to src/de/steamwar/velocitycore/tablist/TablistGroup.java index 0331a7b..2f39f02 100644 --- a/src/de/steamwar/bungeecore/tablist/TablistGroup.java +++ b/src/de/steamwar/velocitycore/tablist/TablistGroup.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.tablist; +package de.steamwar.velocitycore.tablist; import com.velocitypowered.api.proxy.Player; import de.steamwar.messages.Chatter; diff --git a/src/de/steamwar/bungeecore/tablist/TablistManager.java b/src/de/steamwar/velocitycore/tablist/TablistManager.java similarity index 93% rename from src/de/steamwar/bungeecore/tablist/TablistManager.java rename to src/de/steamwar/velocitycore/tablist/TablistManager.java index dc477c3..df0c590 100644 --- a/src/de/steamwar/bungeecore/tablist/TablistManager.java +++ b/src/de/steamwar/velocitycore/tablist/TablistManager.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.tablist; +package de.steamwar.velocitycore.tablist; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; @@ -25,11 +25,11 @@ import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.event.player.ServerPostConnectEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Storage; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; -import de.steamwar.bungeecore.listeners.BasicListener; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Storage; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; +import de.steamwar.velocitycore.listeners.BasicListener; import de.steamwar.network.packets.common.FightInfoPacket; import java.util.ArrayList; diff --git a/src/de/steamwar/bungeecore/tablist/TablistPart.java b/src/de/steamwar/velocitycore/tablist/TablistPart.java similarity index 98% rename from src/de/steamwar/bungeecore/tablist/TablistPart.java rename to src/de/steamwar/velocitycore/tablist/TablistPart.java index 78baeb2..308c982 100644 --- a/src/de/steamwar/bungeecore/tablist/TablistPart.java +++ b/src/de/steamwar/velocitycore/tablist/TablistPart.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.tablist; +package de.steamwar.velocitycore.tablist; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.util.GameProfile; diff --git a/src/de/steamwar/bungeecore/tablist/TablistServer.java b/src/de/steamwar/velocitycore/tablist/TablistServer.java similarity index 96% rename from src/de/steamwar/bungeecore/tablist/TablistServer.java rename to src/de/steamwar/velocitycore/tablist/TablistServer.java index 9bb7456..b650400 100644 --- a/src/de/steamwar/bungeecore/tablist/TablistServer.java +++ b/src/de/steamwar/velocitycore/tablist/TablistServer.java @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.tablist; +package de.steamwar.velocitycore.tablist; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.util.GameProfile; -import de.steamwar.bungeecore.Servertype; -import de.steamwar.bungeecore.Subserver; -import de.steamwar.bungeecore.VelocityCore; +import de.steamwar.persistent.Servertype; +import de.steamwar.persistent.Subserver; +import de.steamwar.velocitycore.VelocityCore; import de.steamwar.messages.Chatter; import de.steamwar.network.packets.common.FightInfoPacket; import de.steamwar.sql.SteamwarUser; @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import java.util.stream.Stream; public class TablistServer implements TablistPart { diff --git a/src/de/steamwar/bungeecore/util/BauLock.java b/src/de/steamwar/velocitycore/util/BauLock.java similarity index 98% rename from src/de/steamwar/bungeecore/util/BauLock.java rename to src/de/steamwar/velocitycore/util/BauLock.java index 0007381..1352d95 100644 --- a/src/de/steamwar/bungeecore/util/BauLock.java +++ b/src/de/steamwar/velocitycore/util/BauLock.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.util; +package de.steamwar.velocitycore.util; import de.steamwar.messages.Chatter; import de.steamwar.sql.SteamwarUser; diff --git a/src/de/steamwar/bungeecore/util/BauLockState.java b/src/de/steamwar/velocitycore/util/BauLockState.java similarity index 97% rename from src/de/steamwar/bungeecore/util/BauLockState.java rename to src/de/steamwar/velocitycore/util/BauLockState.java index c3fa564..8fe89bf 100644 --- a/src/de/steamwar/bungeecore/util/BauLockState.java +++ b/src/de/steamwar/velocitycore/util/BauLockState.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bungeecore.util; +package de.steamwar.velocitycore.util; public enum BauLockState {