From 9293b13ed68e484d1eab9f78241011357fd5e753 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 13 Jul 2024 15:34:06 +0200 Subject: [PATCH] Repackage core module --- .../org/geysermc/floodgate/BungeePlugin.java | 9 ++--- .../floodgate/addon/data/BungeeDataAddon.java | 7 ++-- .../addon/data/BungeeProxyDataHandler.java | 8 +++-- .../addon/data/BungeeServerDataHandler.java | 6 ++-- .../inject/bungee/BungeeInjector.java | 4 +-- .../floodgate/listener/BungeeListener.java | 12 +++---- .../listener/BungeeListenerRegistration.java | 2 +- .../floodgate/module/BungeeAddonModule.java | 8 ++--- .../module/BungeeListenerModule.java | 4 +-- .../module/BungeePlatformModule.java | 26 +++++++------- .../BungeePluginMessageRegistration.java | 2 ++ .../BungeePluginMessageUtils.java | 8 +++-- .../pluginmessage/BungeeSkinApplier.java | 12 +++---- .../floodgate/util/BungeeCommandUtil.java | 10 +++--- .../floodgate/util/BungeePlatformUtils.java | 3 +- .../floodgate/util/BungeeReflectionUtils.java | 2 +- .../{ => core}/FloodgatePlatform.java | 14 ++++---- .../{ => core}/addon/AddonManagerAddon.java | 6 ++-- .../{ => core}/addon/DebugAddon.java | 12 +++---- .../{ => core}/addon/PacketHandlerAddon.java | 12 +++---- .../addon/data/CommonDataHandler.java | 12 +++---- .../addon/data/HandshakeDataImpl.java | 8 ++--- .../addon/data/HandshakeHandlersImpl.java | 4 +-- .../{ => core}/addon/data/PacketBlocker.java | 4 +-- .../addon/debug/ChannelInDebugHandler.java | 6 ++-- .../addon/debug/ChannelOutDebugHandler.java | 6 ++-- .../{ => core}/addon/debug/State.java | 4 +-- .../packethandler/ChannelInPacketHandler.java | 6 ++-- .../ChannelOutPacketHandler.java | 6 ++-- .../{ => core}/api/ProxyFloodgateApi.java | 4 +-- .../{ => core}/api/SimpleFloodgateApi.java | 17 +++++----- .../{ => core}/api/UnsafeFloodgateApi.java | 8 ++--- .../command/CommonCommandMessage.java | 6 ++-- .../command/LinkAccountCommand.java | 24 ++++++------- .../{ => core}/command/TestCommand.java | 10 +++--- .../command/UnlinkAccountCommand.java | 20 +++++------ .../{ => core}/command/WhitelistCommand.java | 27 +++++++-------- .../command/main/FirewallCheckSubcommand.java | 16 ++++----- .../{ => core}/command/main/MainCommand.java | 14 ++++---- .../command/main/VersionSubcommand.java | 14 ++++---- .../{ => core}/command/util/Permission.java | 8 ++--- .../command/util/PermissionDefault.java | 4 +-- .../{ => core}/config/ConfigLoader.java | 4 +-- .../{ => core}/config/FloodgateConfig.java | 4 +-- .../config/ProxyFloodgateConfig.java | 4 +-- .../database/config/DatabaseConfig.java | 4 +-- .../database/config/DatabaseConfigLoader.java | 4 +-- .../floodgate/{ => core}/event/EventBus.java | 4 +-- .../{ => core}/event/EventSubscriber.java | 4 +-- .../event/lifecycle/PostEnableEvent.java | 4 +-- .../event/lifecycle/ShutdownEvent.java | 4 +-- .../event/skin/SkinApplyEventImpl.java | 4 +-- .../event/util/ListenerAnnotationMatcher.java | 4 +-- .../inject/CommonPlatformInjector.java | 4 +-- .../{ => core}/link/CommonPlayerLink.java | 14 ++++---- .../{ => core}/link/DisabledPlayerLink.java | 6 ++-- .../{ => core}/link/GlobalPlayerLinking.java | 10 +++--- .../{ => core}/link/LinkRequestImpl.java | 4 +-- .../{ => core}/link/PlayerLinkHolder.java | 14 ++++---- .../logger/JavaUtilFloodgateLogger.java | 10 +++--- .../{ => core}/module/AutoBindModule.java | 8 ++--- .../{ => core}/module/CommandModule.java | 18 +++++----- .../{ => core}/module/CommonModule.java | 34 +++++++++---------- .../{ => core}/module/ConfigLoadedModule.java | 8 ++--- .../module/PluginMessageModule.java | 16 ++++----- .../module/PostInitializeModule.java | 4 +-- .../{ => core}/module/ProxyCommonModule.java | 12 +++---- .../{ => core}/module/ServerCommonModule.java | 8 ++--- .../{ => core}/news/NewsChecker.java | 16 +++++---- .../{ => core}/packet/PacketHandlersImpl.java | 4 +-- .../platform/command/CommandUtil.java | 21 +++++------- .../platform/command/FloodgateCommand.java | 8 ++--- .../platform/command/FloodgateSubCommand.java | 8 ++--- .../platform/command/SubCommands.java | 4 +-- .../platform/command/TranslatableMessage.java | 6 ++-- .../listener/ListenerRegistration.java | 4 +-- .../pluginmessage/PluginMessageUtils.java | 4 +-- .../platform/util/PlatformUtils.java | 4 +-- .../{ => core}/platform/util/PlayerType.java | 4 +-- .../player/FloodgateCommandPreprocessor.java | 6 ++-- .../player/FloodgateHandshakeHandler.java | 22 ++++++------ .../player/FloodgatePlayerImpl.java | 8 ++--- .../player/HostnameSeparationResult.java | 4 +-- .../{ => core}/player/UserAudience.java | 8 ++--- .../audience/FloodgateSenderMapper.java | 6 ++-- .../InvalidPlayerIdentifierException.java | 2 +- .../audience/PlayerAudienceArgument.java | 10 +++--- .../player/audience/ProfileAudience.java | 4 +-- .../pluginmessage/PluginMessageChannel.java | 4 +-- .../pluginmessage/PluginMessageManager.java | 4 +-- .../PluginMessageRegistration.java | 4 +-- .../pluginmessage/channel/FormChannel.java | 10 +++--- .../pluginmessage/channel/PacketChannel.java | 10 +++--- .../pluginmessage/channel/SkinChannel.java | 14 ++++---- .../channel/TransferChannel.java | 8 ++--- .../{ => core}/register/AddonRegister.java | 4 +-- .../{ => core}/register/CommandRegister.java | 10 +++--- .../{ => core}/register/ListenerRegister.java | 6 ++-- .../register/PluginMessageRegister.java | 10 +++--- .../{ => core}/skin/SkinApplier.java | 4 +-- .../{ => core}/skin/SkinDataImpl.java | 4 +-- .../{ => core}/skin/SkinUploadManager.java | 6 ++-- .../{ => core}/skin/SkinUploadSocket.java | 6 ++-- .../floodgate/{ => core}/util/AutoBind.java | 4 +-- .../{ => core}/util/BrigadierUtils.java | 2 +- .../floodgate/{ => core}/util/HttpClient.java | 4 +-- .../{ => core}/util/InjectorHolder.java | 4 +-- .../{ => core}/util/LanguageManager.java | 6 ++-- .../{ => core}/util/MessageFormatter.java | 4 +-- .../floodgate/{ => core}/util/Metrics.java | 13 +++---- .../{ => core}/util/MojangUtils.java | 7 ++-- .../{ => core}/util/PostEnableMessages.java | 8 ++--- .../{ => core}/util/ReflectionUtils.java | 5 +-- .../floodgate/{ => core}/util/Utils.java | 5 +-- .../floodgate/{ => core}/util/Constants.java | 0 .../floodgate/database/MongoDbDatabase.java | 4 +-- .../database/config/MongoConfig.java | 1 + .../floodgate/database/MysqlDatabase.java | 4 +-- .../database/config/MysqlConfig.java | 1 + .../floodgate/database/SqliteDatabase.java | 4 +-- .../org/geysermc/floodgate/SpigotPlugin.java | 8 ++--- .../floodgate/addon/data/SpigotDataAddon.java | 6 ++-- .../addon/data/SpigotDataHandler.java | 12 ++++--- .../inject/spigot/SpigotInjector.java | 4 +-- .../listener/PaperProfileListener.java | 2 +- .../floodgate/listener/SpigotListener.java | 4 +-- .../listener/SpigotListenerRegistration.java | 2 +- .../floodgate/module/PaperListenerModule.java | 2 +- .../floodgate/module/SpigotAddonModule.java | 8 ++--- .../floodgate/module/SpigotCommandModule.java | 11 +++--- .../module/SpigotListenerModule.java | 2 +- .../module/SpigotPlatformModule.java | 18 +++++----- .../SpigotPluginMessageRegistration.java | 2 ++ .../SpigotPluginMessageUtils.java | 2 +- .../pluginmessage/SpigotSkinApplier.java | 8 ++--- .../geysermc/floodgate/util/ClassNames.java | 23 +++++++------ .../geysermc/floodgate/util/ProxyUtils.java | 2 ++ .../floodgate/util/SpigotCommandUtil.java | 10 +++--- .../floodgate/util/SpigotPlatformUtils.java | 2 +- .../util/SpigotProtocolSupportHandler.java | 1 + .../util/SpigotProtocolSupportListener.java | 5 +-- .../util/SpigotVersionSpecificMethods.java | 3 +- .../floodgate/util/WhitelistUtils.java | 1 + .../geysermc/floodgate/VelocityPlugin.java | 9 ++--- .../addon/data/VelocityDataAddon.java | 7 ++-- .../addon/data/VelocityProxyDataHandler.java | 24 +++++++------ .../addon/data/VelocityServerDataHandler.java | 20 +++++------ .../inject/velocity/VelocityInjector.java | 10 +++--- .../floodgate/listener/VelocityListener.java | 22 ++++++------ .../VelocityListenerRegistration.java | 2 +- .../logger/Slf4jFloodgateLogger.java | 6 ++-- .../floodgate/module/VelocityAddonModule.java | 8 ++--- .../module/VelocityListenerModule.java | 4 +-- .../module/VelocityPlatformModule.java | 22 ++++++------ .../VelocityPluginMessageRegistration.java | 2 ++ .../VelocityPluginMessageUtils.java | 8 +++-- .../floodgate/util/VelocityCommandUtil.java | 10 +++--- .../floodgate/util/VelocityPlatformUtils.java | 2 +- .../floodgate/util/VelocitySkinApplier.java | 8 ++--- 159 files changed, 641 insertions(+), 603 deletions(-) rename core/src/main/java/org/geysermc/floodgate/{ => core}/FloodgatePlatform.java (89%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/AddonManagerAddon.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/DebugAddon.java (88%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/PacketHandlerAddon.java (87%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/data/CommonDataHandler.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/data/HandshakeDataImpl.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/data/HandshakeHandlersImpl.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/data/PacketBlocker.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/debug/ChannelInDebugHandler.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/debug/ChannelOutDebugHandler.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/debug/State.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/packethandler/ChannelInPacketHandler.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/addon/packethandler/ChannelOutPacketHandler.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/api/ProxyFloodgateApi.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/api/SimpleFloodgateApi.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/api/UnsafeFloodgateApi.java (89%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/CommonCommandMessage.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/LinkAccountCommand.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/TestCommand.java (87%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/UnlinkAccountCommand.java (87%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/WhitelistCommand.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/main/FirewallCheckSubcommand.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/main/MainCommand.java (88%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/main/VersionSubcommand.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/util/Permission.java (88%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/command/util/PermissionDefault.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/config/ConfigLoader.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/config/FloodgateConfig.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/config/ProxyFloodgateConfig.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/database/config/DatabaseConfig.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/database/config/DatabaseConfigLoader.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/event/EventBus.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/event/EventSubscriber.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/event/lifecycle/PostEnableEvent.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/event/lifecycle/ShutdownEvent.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/event/skin/SkinApplyEventImpl.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/event/util/ListenerAnnotationMatcher.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/inject/CommonPlatformInjector.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/link/CommonPlayerLink.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/link/DisabledPlayerLink.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/link/GlobalPlayerLinking.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/link/LinkRequestImpl.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/link/PlayerLinkHolder.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/logger/JavaUtilFloodgateLogger.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/AutoBindModule.java (87%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/CommandModule.java (79%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/CommonModule.java (87%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/ConfigLoadedModule.java (88%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/PluginMessageModule.java (79%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/PostInitializeModule.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/ProxyCommonModule.java (85%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/module/ServerCommonModule.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/news/NewsChecker.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/packet/PacketHandlersImpl.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/command/CommandUtil.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/command/FloodgateCommand.java (89%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/command/FloodgateSubCommand.java (86%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/command/SubCommands.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/command/TranslatableMessage.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/listener/ListenerRegistration.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/pluginmessage/PluginMessageUtils.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/util/PlatformUtils.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/platform/util/PlayerType.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/FloodgateCommandPreprocessor.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/FloodgateHandshakeHandler.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/FloodgatePlayerImpl.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/HostnameSeparationResult.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/UserAudience.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/audience/FloodgateSenderMapper.java (91%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/audience/InvalidPlayerIdentifierException.java (96%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/audience/PlayerAudienceArgument.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/player/audience/ProfileAudience.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/PluginMessageChannel.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/PluginMessageManager.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/PluginMessageRegistration.java (92%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/channel/FormChannel.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/channel/PacketChannel.java (88%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/channel/SkinChannel.java (89%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/pluginmessage/channel/TransferChannel.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/register/AddonRegister.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/register/CommandRegister.java (89%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/register/ListenerRegister.java (90%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/register/PluginMessageRegister.java (84%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/skin/SkinApplier.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/skin/SkinDataImpl.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/skin/SkinUploadManager.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/skin/SkinUploadSocket.java (98%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/AutoBind.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/BrigadierUtils.java (98%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/HttpClient.java (98%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/InjectorHolder.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/LanguageManager.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/MessageFormatter.java (97%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/Metrics.java (93%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/MojangUtils.java (94%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/PostEnableMessages.java (95%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/ReflectionUtils.java (99%) rename core/src/main/java/org/geysermc/floodgate/{ => core}/util/Utils.java (97%) rename core/src/main/templates/org/geysermc/floodgate/{ => core}/util/Constants.java (100%) diff --git a/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java b/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java index 7fcf0599..c7f9713f 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java +++ b/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java @@ -29,13 +29,14 @@ import com.google.inject.Injector; import net.md_5.bungee.api.plugin.Plugin; import org.geysermc.floodgate.api.logger.FloodgateLogger; +import org.geysermc.floodgate.core.FloodgatePlatform; import org.geysermc.floodgate.module.BungeeAddonModule; import org.geysermc.floodgate.module.BungeeListenerModule; import org.geysermc.floodgate.module.BungeePlatformModule; -import org.geysermc.floodgate.module.CommandModule; -import org.geysermc.floodgate.module.PluginMessageModule; -import org.geysermc.floodgate.module.ProxyCommonModule; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.module.CommandModule; +import org.geysermc.floodgate.core.module.PluginMessageModule; +import org.geysermc.floodgate.core.module.ProxyCommonModule; +import org.geysermc.floodgate.core.util.ReflectionUtils; public final class BungeePlugin extends Plugin { private FloodgatePlatform platform; diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeDataAddon.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeDataAddon.java index a8822f54..628f190b 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeDataAddon.java +++ b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeDataAddon.java @@ -29,12 +29,13 @@ import com.google.inject.name.Named; import io.netty.channel.Channel; import io.netty.util.AttributeKey; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.addon.data.PacketBlocker; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.inject.InjectorAddon; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; public class BungeeDataAddon implements InjectorAddon { @Inject private FloodgateHandshakeHandler handshakeHandler; diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java index 610b6023..42fd734b 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java +++ b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java @@ -37,9 +37,11 @@ import net.md_5.bungee.protocol.DefinedPacket; import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.protocol.packet.Handshake; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.addon.data.CommonDataHandler; +import org.geysermc.floodgate.core.addon.data.PacketBlocker; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.util.ReflectionUtils; @SuppressWarnings("ConstantConditions") public class BungeeProxyDataHandler extends CommonDataHandler { diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java index 2a0add8c..8e9c4dd1 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java +++ b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java @@ -39,11 +39,11 @@ import net.md_5.bungee.netty.HandlerBoss; import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.protocol.packet.Handshake; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.player.FloodgatePlayerImpl; +import org.geysermc.floodgate.core.player.FloodgatePlayerImpl; import org.geysermc.floodgate.util.BedrockData; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; @SuppressWarnings("ConstantConditions") @RequiredArgsConstructor diff --git a/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java b/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java index ac39d4d0..c1690f64 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java +++ b/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java @@ -38,9 +38,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldExtraBufPrepender; import net.md_5.bungee.protocol.Varint21LengthFieldPrepender; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; import org.geysermc.floodgate.util.BungeeReflectionUtils; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; @RequiredArgsConstructor public final class BungeeInjector extends CommonPlatformInjector { diff --git a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java index fd1befb6..e810e540 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java +++ b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java @@ -44,14 +44,14 @@ import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventPriority; import net.md_5.bungee.netty.ChannelWrapper; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.skin.SkinApplier; -import org.geysermc.floodgate.skin.SkinDataImpl; -import org.geysermc.floodgate.util.LanguageManager; -import org.geysermc.floodgate.util.MojangUtils; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.skin.SkinApplier; +import org.geysermc.floodgate.core.skin.SkinDataImpl; +import org.geysermc.floodgate.core.util.LanguageManager; +import org.geysermc.floodgate.core.util.MojangUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; @SuppressWarnings("ConstantConditions") public final class BungeeListener implements Listener { diff --git a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListenerRegistration.java b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListenerRegistration.java index 6a7f019c..aa279887 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListenerRegistration.java +++ b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListenerRegistration.java @@ -30,7 +30,7 @@ import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Listener; import org.geysermc.floodgate.BungeePlugin; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; @RequiredArgsConstructor(onConstructor = @__(@Inject)) public final class BungeeListenerRegistration implements ListenerRegistration { diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeAddonModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeAddonModule.java index e5945454..a1574960 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeAddonModule.java +++ b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeAddonModule.java @@ -28,12 +28,12 @@ import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.ProvidesIntoSet; -import org.geysermc.floodgate.addon.AddonManagerAddon; -import org.geysermc.floodgate.addon.DebugAddon; -import org.geysermc.floodgate.addon.PacketHandlerAddon; +import org.geysermc.floodgate.core.addon.AddonManagerAddon; +import org.geysermc.floodgate.core.addon.DebugAddon; +import org.geysermc.floodgate.core.addon.PacketHandlerAddon; import org.geysermc.floodgate.addon.data.BungeeDataAddon; import org.geysermc.floodgate.api.inject.InjectorAddon; -import org.geysermc.floodgate.register.AddonRegister; +import org.geysermc.floodgate.core.register.AddonRegister; public final class BungeeAddonModule extends AbstractModule { @Override diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java index a5a99d4f..7ba375f2 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java +++ b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java @@ -31,8 +31,8 @@ import com.google.inject.multibindings.ProvidesIntoSet; import net.md_5.bungee.api.plugin.Listener; import org.geysermc.floodgate.listener.BungeeListener; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.register.ListenerRegister; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.register.ListenerRegister; public final class BungeeListenerModule extends AbstractModule { @Override diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java index ec256d69..82745087 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java +++ b/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java @@ -37,26 +37,26 @@ import org.geysermc.floodgate.BungeePlugin; import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; import org.geysermc.floodgate.inject.bungee.BungeeInjector; import org.geysermc.floodgate.listener.BungeeListenerRegistration; -import org.geysermc.floodgate.logger.JavaUtilFloodgateLogger; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.platform.util.PlatformUtils; -import org.geysermc.floodgate.player.FloodgateCommandPreprocessor; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.audience.FloodgateSenderMapper; +import org.geysermc.floodgate.core.logger.JavaUtilFloodgateLogger; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.player.FloodgateCommandPreprocessor; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.audience.FloodgateSenderMapper; import org.geysermc.floodgate.pluginmessage.BungeePluginMessageRegistration; import org.geysermc.floodgate.pluginmessage.BungeePluginMessageUtils; import org.geysermc.floodgate.pluginmessage.BungeeSkinApplier; -import org.geysermc.floodgate.pluginmessage.PluginMessageManager; -import org.geysermc.floodgate.pluginmessage.PluginMessageRegistration; -import org.geysermc.floodgate.skin.SkinApplier; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; +import org.geysermc.floodgate.core.skin.SkinApplier; import org.geysermc.floodgate.util.BungeeCommandUtil; import org.geysermc.floodgate.util.BungeePlatformUtils; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.util.LanguageManager; import org.incendo.cloud.CommandManager; import org.incendo.cloud.bungee.BungeeCommandManager; import org.incendo.cloud.execution.ExecutionCoordinator; diff --git a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageRegistration.java b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageRegistration.java index dc7bdeab..60c72abd 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageRegistration.java +++ b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageRegistration.java @@ -26,6 +26,8 @@ package org.geysermc.floodgate.pluginmessage; import net.md_5.bungee.api.ProxyServer; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; public class BungeePluginMessageRegistration implements PluginMessageRegistration { @Override diff --git a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java index 178657b0..cd7a6fe3 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java +++ b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java @@ -37,9 +37,11 @@ import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventPriority; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel.Identity; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel.Result; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel.Identity; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel.Result; @RequiredArgsConstructor public final class BungeePluginMessageUtils extends PluginMessageUtils implements Listener { diff --git a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java index fa2aaad2..f75709df 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java +++ b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java @@ -26,7 +26,7 @@ package org.geysermc.floodgate.pluginmessage; import static com.google.common.base.Preconditions.checkNotNull; -import static org.geysermc.floodgate.util.ReflectionUtils.getFieldOfType; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getFieldOfType; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -43,11 +43,11 @@ import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.event.EventBus; -import org.geysermc.floodgate.event.skin.SkinApplyEventImpl; -import org.geysermc.floodgate.skin.SkinApplier; -import org.geysermc.floodgate.skin.SkinDataImpl; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.event.EventBus; +import org.geysermc.floodgate.core.event.skin.SkinApplyEventImpl; +import org.geysermc.floodgate.core.skin.SkinApplier; +import org.geysermc.floodgate.core.skin.SkinDataImpl; +import org.geysermc.floodgate.core.util.ReflectionUtils; @Singleton public final class BungeeSkinApplier implements SkinApplier { diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java index 322a0332..5c00d7cb 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java +++ b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java @@ -33,10 +33,12 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.UserAudience.ConsoleAudience; -import org.geysermc.floodgate.player.UserAudience.PlayerAudience; +import org.geysermc.floodgate.core.util.LanguageManager; +import org.geysermc.floodgate.core.util.Utils; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.UserAudience.ConsoleAudience; +import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience; public final class BungeeCommandUtil extends CommandUtil { private final ProxyServer server; diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeePlatformUtils.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeePlatformUtils.java index fae9a83c..974c459c 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/util/BungeePlatformUtils.java +++ b/bungee/src/main/java/org/geysermc/floodgate/util/BungeePlatformUtils.java @@ -29,7 +29,8 @@ import java.util.List; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.protocol.ProtocolConstants; -import org.geysermc.floodgate.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; @SuppressWarnings("ConstantConditions") public final class BungeePlatformUtils extends PlatformUtils { diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeReflectionUtils.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeReflectionUtils.java index 05b1876b..a67fd043 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeReflectionUtils.java +++ b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeReflectionUtils.java @@ -25,7 +25,7 @@ package org.geysermc.floodgate.util; -import static org.geysermc.floodgate.util.MessageFormatter.format; +import static org.geysermc.floodgate.core.util.MessageFormatter.format; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java b/core/src/main/java/org/geysermc/floodgate/core/FloodgatePlatform.java similarity index 89% rename from core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java rename to core/src/main/java/org/geysermc/floodgate/core/FloodgatePlatform.java index 70487093..79b86391 100644 --- a/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java +++ b/core/src/main/java/org/geysermc/floodgate/core/FloodgatePlatform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate; +package org.geysermc.floodgate.core; import com.google.inject.Inject; import com.google.inject.Injector; @@ -36,11 +36,11 @@ import org.geysermc.floodgate.api.inject.PlatformInjector; import org.geysermc.floodgate.api.link.PlayerLink; import org.geysermc.floodgate.api.packet.PacketHandlers; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.event.EventBus; -import org.geysermc.floodgate.event.lifecycle.PostEnableEvent; -import org.geysermc.floodgate.event.lifecycle.ShutdownEvent; -import org.geysermc.floodgate.module.PostInitializeModule; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.event.EventBus; +import org.geysermc.floodgate.core.event.lifecycle.PostEnableEvent; +import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent; +import org.geysermc.floodgate.core.module.PostInitializeModule; public class FloodgatePlatform { private static final UUID KEY = UUID.randomUUID(); diff --git a/core/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java b/core/src/main/java/org/geysermc/floodgate/core/addon/AddonManagerAddon.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/AddonManagerAddon.java index 9e494292..05b728dd 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/AddonManagerAddon.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/AddonManagerAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon; +package org.geysermc.floodgate.core.addon; import com.google.inject.Inject; import io.netty.channel.Channel; import org.geysermc.floodgate.api.inject.InjectorAddon; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; public final class AddonManagerAddon implements InjectorAddon { @Inject private CommonPlatformInjector injector; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java b/core/src/main/java/org/geysermc/floodgate/core/addon/DebugAddon.java similarity index 88% rename from core/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/DebugAddon.java index dcf9a7a6..e5b63c94 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/DebugAddon.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/DebugAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,19 +23,19 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon; +package org.geysermc.floodgate.core.addon; import com.google.inject.Inject; import com.google.inject.name.Named; import io.netty.channel.Channel; import io.netty.channel.ChannelPipeline; import java.util.concurrent.atomic.AtomicInteger; -import org.geysermc.floodgate.addon.debug.ChannelInDebugHandler; -import org.geysermc.floodgate.addon.debug.ChannelOutDebugHandler; +import org.geysermc.floodgate.core.addon.debug.ChannelInDebugHandler; +import org.geysermc.floodgate.core.addon.debug.ChannelOutDebugHandler; import org.geysermc.floodgate.api.inject.InjectorAddon; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.util.Utils; public final class DebugAddon implements InjectorAddon { @Inject private FloodgateConfig config; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java b/core/src/main/java/org/geysermc/floodgate/core/addon/PacketHandlerAddon.java similarity index 87% rename from core/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/PacketHandlerAddon.java index 0d8c6713..091660f9 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/PacketHandlerAddon.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/PacketHandlerAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon; +package org.geysermc.floodgate.core.addon; import com.google.inject.Inject; import com.google.inject.name.Named; import io.netty.channel.Channel; import io.netty.channel.ChannelPipeline; -import org.geysermc.floodgate.addon.packethandler.ChannelInPacketHandler; -import org.geysermc.floodgate.addon.packethandler.ChannelOutPacketHandler; +import org.geysermc.floodgate.core.addon.packethandler.ChannelInPacketHandler; +import org.geysermc.floodgate.core.addon.packethandler.ChannelOutPacketHandler; import org.geysermc.floodgate.api.inject.InjectorAddon; -import org.geysermc.floodgate.packet.PacketHandlersImpl; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.packet.PacketHandlersImpl; +import org.geysermc.floodgate.core.util.Utils; public class PacketHandlerAddon implements InjectorAddon { @Inject private PacketHandlersImpl packetHandlers; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java b/core/src/main/java/org/geysermc/floodgate/core/addon/data/CommonDataHandler.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/data/CommonDataHandler.java index 04517989..55d50adb 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/data/CommonDataHandler.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/data/CommonDataHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.data; +package org.geysermc.floodgate.core.addon.data; import com.google.common.collect.Queues; import io.netty.channel.Channel; @@ -34,11 +34,11 @@ import java.util.Queue; import lombok.RequiredArgsConstructor; import org.geysermc.floodgate.api.handshake.HandshakeData; -import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig; import org.geysermc.floodgate.crypto.FloodgateCipher; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult; -import org.geysermc.floodgate.player.HostnameSeparationResult; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.HandshakeResult; +import org.geysermc.floodgate.core.player.HostnameSeparationResult; import org.geysermc.floodgate.util.Constants; @RequiredArgsConstructor diff --git a/core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java b/core/src/main/java/org/geysermc/floodgate/core/addon/data/HandshakeDataImpl.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/data/HandshakeDataImpl.java index 480175e9..810beb7c 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/data/HandshakeDataImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.data; +package org.geysermc.floodgate.core.addon.data; import io.netty.channel.Channel; import java.util.UUID; import lombok.Getter; import lombok.Setter; import org.geysermc.floodgate.api.handshake.HandshakeData; -import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig; import org.geysermc.floodgate.util.BedrockData; import org.geysermc.floodgate.util.LinkedPlayer; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; @Getter public class HandshakeDataImpl implements HandshakeData { diff --git a/core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java b/core/src/main/java/org/geysermc/floodgate/core/addon/data/HandshakeHandlersImpl.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/data/HandshakeHandlersImpl.java index 1df44c5b..09628cb9 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/data/HandshakeHandlersImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/data/HandshakeHandlersImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.data; +package org.geysermc.floodgate.core.addon.data; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java b/core/src/main/java/org/geysermc/floodgate/core/addon/data/PacketBlocker.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/data/PacketBlocker.java index a20fe433..e46d8011 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/data/PacketBlocker.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/data/PacketBlocker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.data; +package org.geysermc.floodgate.core.addon.data; import com.google.common.collect.Queues; import io.netty.channel.ChannelHandlerContext; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java b/core/src/main/java/org/geysermc/floodgate/core/addon/debug/ChannelInDebugHandler.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/debug/ChannelInDebugHandler.java index bf1588e3..2e65d044 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelInDebugHandler.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/debug/ChannelInDebugHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.debug; +package org.geysermc.floodgate.core.addon.debug; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -32,7 +32,7 @@ import io.netty.channel.SimpleChannelInboundHandler; import java.util.concurrent.atomic.AtomicInteger; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; @Sharable public final class ChannelInDebugHandler extends SimpleChannelInboundHandler { diff --git a/core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java b/core/src/main/java/org/geysermc/floodgate/core/addon/debug/ChannelOutDebugHandler.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/debug/ChannelOutDebugHandler.java index f4ab7acf..e1b23ca0 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/debug/ChannelOutDebugHandler.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/debug/ChannelOutDebugHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.debug; +package org.geysermc.floodgate.core.addon.debug; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -32,7 +32,7 @@ import io.netty.handler.codec.MessageToByteEncoder; import java.util.concurrent.atomic.AtomicInteger; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; @Sharable public final class ChannelOutDebugHandler extends MessageToByteEncoder { diff --git a/core/src/main/java/org/geysermc/floodgate/addon/debug/State.java b/core/src/main/java/org/geysermc/floodgate/core/addon/debug/State.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/addon/debug/State.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/debug/State.java index 36a55cf5..3b48a90b 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/debug/State.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/debug/State.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.debug; +package org.geysermc.floodgate.core.addon.debug; public enum State { HANDSHAKE, STATUS, LOGIN, PLAY; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java b/core/src/main/java/org/geysermc/floodgate/core/addon/packethandler/ChannelInPacketHandler.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/packethandler/ChannelInPacketHandler.java index d2c5f50a..ff749bbe 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelInPacketHandler.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/packethandler/ChannelInPacketHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.packethandler; +package org.geysermc.floodgate.core.addon.packethandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import org.geysermc.floodgate.api.util.TriFunction; -import org.geysermc.floodgate.packet.PacketHandlersImpl; +import org.geysermc.floodgate.core.packet.PacketHandlersImpl; public class ChannelInPacketHandler extends SimpleChannelInboundHandler { private final PacketHandlersImpl packetHandlers; diff --git a/core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java b/core/src/main/java/org/geysermc/floodgate/core/addon/packethandler/ChannelOutPacketHandler.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java rename to core/src/main/java/org/geysermc/floodgate/core/addon/packethandler/ChannelOutPacketHandler.java index 2ad5555a..e61502a4 100644 --- a/core/src/main/java/org/geysermc/floodgate/addon/packethandler/ChannelOutPacketHandler.java +++ b/core/src/main/java/org/geysermc/floodgate/core/addon/packethandler/ChannelOutPacketHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.addon.packethandler; +package org.geysermc.floodgate.core.addon.packethandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; import java.util.List; import org.geysermc.floodgate.api.util.TriFunction; -import org.geysermc.floodgate.packet.PacketHandlersImpl; +import org.geysermc.floodgate.core.packet.PacketHandlersImpl; public class ChannelOutPacketHandler extends MessageToMessageEncoder { private final PacketHandlersImpl packetHandlers; diff --git a/core/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/core/api/ProxyFloodgateApi.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java rename to core/src/main/java/org/geysermc/floodgate/core/api/ProxyFloodgateApi.java index ede56730..03a7ae07 100644 --- a/core/src/main/java/org/geysermc/floodgate/api/ProxyFloodgateApi.java +++ b/core/src/main/java/org/geysermc/floodgate/core/api/ProxyFloodgateApi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.api; +package org.geysermc.floodgate.core.api; import com.google.inject.Inject; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/core/api/SimpleFloodgateApi.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java rename to core/src/main/java/org/geysermc/floodgate/core/api/SimpleFloodgateApi.java index 5ef49e46..0d3c32a1 100644 --- a/core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java +++ b/core/src/main/java/org/geysermc/floodgate/core/api/SimpleFloodgateApi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.api; +package org.geysermc.floodgate.core.api; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -39,16 +39,17 @@ import java.util.concurrent.TimeUnit; import org.geysermc.cumulus.form.Form; import org.geysermc.cumulus.form.util.FormBuilder; +import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.unsafe.Unsafe; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.pluginmessage.PluginMessageManager; -import org.geysermc.floodgate.pluginmessage.channel.FormChannel; -import org.geysermc.floodgate.pluginmessage.channel.TransferChannel; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.pluginmessage.channel.FormChannel; +import org.geysermc.floodgate.core.pluginmessage.channel.TransferChannel; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.HttpClient; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.HttpClient; +import org.geysermc.floodgate.core.util.Utils; public class SimpleFloodgateApi implements FloodgateApi { private final Map players = new ConcurrentHashMap<>(); diff --git a/core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/core/api/UnsafeFloodgateApi.java similarity index 89% rename from core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java rename to core/src/main/java/org/geysermc/floodgate/core/api/UnsafeFloodgateApi.java index 289eee5c..8a1b6d71 100644 --- a/core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java +++ b/core/src/main/java/org/geysermc/floodgate/core/api/UnsafeFloodgateApi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.api; +package org.geysermc.floodgate.core.api; import java.util.UUID; import org.geysermc.floodgate.api.unsafe.Unsafe; -import org.geysermc.floodgate.pluginmessage.PluginMessageManager; -import org.geysermc.floodgate.pluginmessage.channel.PacketChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.pluginmessage.channel.PacketChannel; public final class UnsafeFloodgateApi implements Unsafe { private final PacketChannel packetChannel; diff --git a/core/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java b/core/src/main/java/org/geysermc/floodgate/core/command/CommonCommandMessage.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java rename to core/src/main/java/org/geysermc/floodgate/core/command/CommonCommandMessage.java index 4b0ab180..760176b5 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/CommonCommandMessage.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/CommonCommandMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command; +package org.geysermc.floodgate.core.command; import lombok.Getter; -import org.geysermc.floodgate.platform.command.TranslatableMessage; +import org.geysermc.floodgate.core.platform.command.TranslatableMessage; /** * Messages (or part of messages) that are used in two or more commands and thus are 'commonly diff --git a/core/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java index 7c06429d..46b29149 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/LinkAccountCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,9 +23,9 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command; +package org.geysermc.floodgate.core.command; -import static org.geysermc.floodgate.command.CommonCommandMessage.CHECK_CONSOLE; +import static org.geysermc.floodgate.core.command.CommonCommandMessage.CHECK_CONSOLE; import static org.incendo.cloud.parser.standard.StringParser.stringParser; import com.google.inject.Inject; @@ -35,15 +35,15 @@ import org.geysermc.floodgate.api.link.LinkRequestResult; import org.geysermc.floodgate.api.link.PlayerLink; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.link.GlobalPlayerLinking; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.platform.command.TranslatableMessage; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.UserAudience.PlayerAudience; -import org.geysermc.floodgate.player.audience.PlayerAudienceArgument; -import org.geysermc.floodgate.player.audience.ProfileAudience; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.link.GlobalPlayerLinking; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; +import org.geysermc.floodgate.core.platform.command.TranslatableMessage; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience; +import org.geysermc.floodgate.core.player.audience.PlayerAudienceArgument; +import org.geysermc.floodgate.core.player.audience.ProfileAudience; import org.geysermc.floodgate.util.Constants; import org.incendo.cloud.Command; import org.incendo.cloud.CommandManager; diff --git a/core/src/main/java/org/geysermc/floodgate/command/TestCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/TestCommand.java similarity index 87% rename from core/src/main/java/org/geysermc/floodgate/command/TestCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/TestCommand.java index 10213c78..28df8a58 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/TestCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/TestCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command; +package org.geysermc.floodgate.core.command; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; +import org.geysermc.floodgate.core.player.UserAudience; import org.geysermc.floodgate.util.Constants; import org.incendo.cloud.Command; import org.incendo.cloud.CommandManager; diff --git a/core/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java similarity index 87% rename from core/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java index 3ba4682b..6e44cb4c 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/UnlinkAccountCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,23 +23,23 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command; +package org.geysermc.floodgate.core.command; -import static org.geysermc.floodgate.command.CommonCommandMessage.CHECK_CONSOLE; +import static org.geysermc.floodgate.core.command.CommonCommandMessage.CHECK_CONSOLE; import com.google.inject.Inject; import lombok.Getter; import lombok.NoArgsConstructor; import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.link.PlayerLink; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.link.GlobalPlayerLinking; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.platform.command.TranslatableMessage; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.UserAudience.PlayerAudience; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.link.GlobalPlayerLinking; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; +import org.geysermc.floodgate.core.platform.command.TranslatableMessage; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.command.util.Permission; import org.incendo.cloud.Command; import org.incendo.cloud.CommandManager; import org.incendo.cloud.context.CommandContext; diff --git a/core/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/WhitelistCommand.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/WhitelistCommand.java index 54c5efcb..0fc0b301 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/WhitelistCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,9 +23,9 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command; +package org.geysermc.floodgate.core.command; -import static org.geysermc.floodgate.command.CommonCommandMessage.CHECK_CONSOLE; +import static org.geysermc.floodgate.core.command.CommonCommandMessage.CHECK_CONSOLE; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -34,18 +34,17 @@ import lombok.Getter; import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.platform.command.TranslatableMessage; -import org.geysermc.floodgate.platform.util.PlayerType; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.audience.PlayerAudienceArgument; -import org.geysermc.floodgate.player.audience.ProfileAudience; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; +import org.geysermc.floodgate.core.platform.command.TranslatableMessage; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.audience.PlayerAudienceArgument; +import org.geysermc.floodgate.core.player.audience.ProfileAudience; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.HttpClient; +import org.geysermc.floodgate.core.util.HttpClient; import org.incendo.cloud.Command; import org.incendo.cloud.CommandManager; import org.incendo.cloud.context.CommandContext; diff --git a/core/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/main/FirewallCheckSubcommand.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/main/FirewallCheckSubcommand.java index be64d92a..a77dbeba 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/main/FirewallCheckSubcommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/main/FirewallCheckSubcommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command.main; +package org.geysermc.floodgate.core.command.main; import static org.geysermc.floodgate.util.Constants.COLOR_CHAR; @@ -33,13 +33,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BooleanSupplier; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.platform.command.FloodgateSubCommand; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.platform.command.FloodgateSubCommand; +import org.geysermc.floodgate.core.player.UserAudience; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.HttpClient; -import org.geysermc.floodgate.util.HttpClient.HttpResponse; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.HttpClient; +import org.geysermc.floodgate.core.util.HttpClient.HttpResponse; +import org.geysermc.floodgate.core.util.Utils; import org.incendo.cloud.context.CommandContext; final class FirewallCheckSubcommand extends FloodgateSubCommand { diff --git a/core/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/main/MainCommand.java similarity index 88% rename from core/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/main/MainCommand.java index 801676e4..a5605a9d 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/main/MainCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command.main; +package org.geysermc.floodgate.core.command.main; import static org.geysermc.floodgate.util.Constants.COLOR_CHAR; import java.util.Locale; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.platform.command.FloodgateSubCommand; -import org.geysermc.floodgate.platform.command.SubCommands; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; +import org.geysermc.floodgate.core.platform.command.FloodgateSubCommand; +import org.geysermc.floodgate.core.platform.command.SubCommands; +import org.geysermc.floodgate.core.player.UserAudience; import org.incendo.cloud.Command; import org.incendo.cloud.Command.Builder; import org.incendo.cloud.CommandManager; diff --git a/core/src/main/java/org/geysermc/floodgate/command/main/VersionSubcommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/main/VersionSubcommand.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/command/main/VersionSubcommand.java rename to core/src/main/java/org/geysermc/floodgate/core/command/main/VersionSubcommand.java index 961c1735..bc00087b 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/main/VersionSubcommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/main/VersionSubcommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command.main; +package org.geysermc.floodgate.core.command.main; import static org.geysermc.floodgate.util.Constants.COLOR_CHAR; @@ -31,12 +31,12 @@ import com.google.inject.Inject; import com.google.inject.name.Named; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.command.WhitelistCommand.Message; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.platform.command.FloodgateSubCommand; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.command.WhitelistCommand.Message; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.platform.command.FloodgateSubCommand; +import org.geysermc.floodgate.core.player.UserAudience; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.HttpClient; +import org.geysermc.floodgate.core.util.HttpClient; import org.incendo.cloud.context.CommandContext; public class VersionSubcommand extends FloodgateSubCommand { diff --git a/core/src/main/java/org/geysermc/floodgate/command/util/Permission.java b/core/src/main/java/org/geysermc/floodgate/core/command/util/Permission.java similarity index 88% rename from core/src/main/java/org/geysermc/floodgate/command/util/Permission.java rename to core/src/main/java/org/geysermc/floodgate/core/command/util/Permission.java index 87c2ec52..ec66d898 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/util/Permission.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/util/Permission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command.util; +package org.geysermc.floodgate.core.command.util; -import static org.geysermc.floodgate.command.util.PermissionDefault.OP; -import static org.geysermc.floodgate.command.util.PermissionDefault.TRUE; +import static org.geysermc.floodgate.core.command.util.PermissionDefault.OP; +import static org.geysermc.floodgate.core.command.util.PermissionDefault.TRUE; public enum Permission { COMMAND_MAIN("floodgate.command.floodgate", TRUE), diff --git a/core/src/main/java/org/geysermc/floodgate/command/util/PermissionDefault.java b/core/src/main/java/org/geysermc/floodgate/core/command/util/PermissionDefault.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/command/util/PermissionDefault.java rename to core/src/main/java/org/geysermc/floodgate/core/command/util/PermissionDefault.java index a98e1e89..8550dcbb 100644 --- a/core/src/main/java/org/geysermc/floodgate/command/util/PermissionDefault.java +++ b/core/src/main/java/org/geysermc/floodgate/core/command/util/PermissionDefault.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.command.util; +package org.geysermc.floodgate.core.command.util; public enum PermissionDefault { TRUE, FALSE, OP, NOT_OP diff --git a/core/src/main/java/org/geysermc/floodgate/config/ConfigLoader.java b/core/src/main/java/org/geysermc/floodgate/core/config/ConfigLoader.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/config/ConfigLoader.java rename to core/src/main/java/org/geysermc/floodgate/core/config/ConfigLoader.java index 739e1767..4a946490 100644 --- a/core/src/main/java/org/geysermc/floodgate/config/ConfigLoader.java +++ b/core/src/main/java/org/geysermc/floodgate/core/config/ConfigLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.config; +package org.geysermc.floodgate.core.config; import java.nio.file.Files; import java.nio.file.Path; diff --git a/core/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java b/core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java rename to core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java index 4a87b0d4..3a376ab4 100644 --- a/core/src/main/java/org/geysermc/floodgate/config/FloodgateConfig.java +++ b/core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.config; +package org.geysermc.floodgate.core.config; import java.io.IOException; import java.nio.file.Files; diff --git a/core/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java b/core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java rename to core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java index 7874af87..c17678f3 100644 --- a/core/src/main/java/org/geysermc/floodgate/config/ProxyFloodgateConfig.java +++ b/core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.config; +package org.geysermc.floodgate.core.config; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java b/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfig.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java rename to core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfig.java index b382760e..708eec2a 100644 --- a/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java +++ b/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.database.config; +package org.geysermc.floodgate.core.database.config; /** * Base class for every database related configuration. diff --git a/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java b/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfigLoader.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java rename to core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfigLoader.java index ca71d7f6..c575c3fc 100644 --- a/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java +++ b/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfigLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.database.config; +package org.geysermc.floodgate.core.database.config; import com.google.gson.JsonObject; import com.google.inject.Inject; diff --git a/core/src/main/java/org/geysermc/floodgate/event/EventBus.java b/core/src/main/java/org/geysermc/floodgate/core/event/EventBus.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/event/EventBus.java rename to core/src/main/java/org/geysermc/floodgate/core/event/EventBus.java index c8e6f9bc..06d311bf 100644 --- a/core/src/main/java/org/geysermc/floodgate/event/EventBus.java +++ b/core/src/main/java/org/geysermc/floodgate/core/event/EventBus.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.event; +package org.geysermc.floodgate.core.event; import com.google.inject.Singleton; import java.util.function.BiConsumer; diff --git a/core/src/main/java/org/geysermc/floodgate/event/EventSubscriber.java b/core/src/main/java/org/geysermc/floodgate/core/event/EventSubscriber.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/event/EventSubscriber.java rename to core/src/main/java/org/geysermc/floodgate/core/event/EventSubscriber.java index f01c209b..232ade5d 100644 --- a/core/src/main/java/org/geysermc/floodgate/event/EventSubscriber.java +++ b/core/src/main/java/org/geysermc/floodgate/core/event/EventSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.event; +package org.geysermc.floodgate.core.event; import java.util.function.BiConsumer; import java.util.function.Consumer; diff --git a/core/src/main/java/org/geysermc/floodgate/event/lifecycle/PostEnableEvent.java b/core/src/main/java/org/geysermc/floodgate/core/event/lifecycle/PostEnableEvent.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/event/lifecycle/PostEnableEvent.java rename to core/src/main/java/org/geysermc/floodgate/core/event/lifecycle/PostEnableEvent.java index f274ff16..cc44aeae 100644 --- a/core/src/main/java/org/geysermc/floodgate/event/lifecycle/PostEnableEvent.java +++ b/core/src/main/java/org/geysermc/floodgate/core/event/lifecycle/PostEnableEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.event.lifecycle; +package org.geysermc.floodgate.core.event.lifecycle; public class PostEnableEvent { } diff --git a/core/src/main/java/org/geysermc/floodgate/event/lifecycle/ShutdownEvent.java b/core/src/main/java/org/geysermc/floodgate/core/event/lifecycle/ShutdownEvent.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/event/lifecycle/ShutdownEvent.java rename to core/src/main/java/org/geysermc/floodgate/core/event/lifecycle/ShutdownEvent.java index 30e782c5..9563ce90 100644 --- a/core/src/main/java/org/geysermc/floodgate/event/lifecycle/ShutdownEvent.java +++ b/core/src/main/java/org/geysermc/floodgate/core/event/lifecycle/ShutdownEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.event.lifecycle; +package org.geysermc.floodgate.core.event.lifecycle; public class ShutdownEvent { } diff --git a/core/src/main/java/org/geysermc/floodgate/event/skin/SkinApplyEventImpl.java b/core/src/main/java/org/geysermc/floodgate/core/event/skin/SkinApplyEventImpl.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/event/skin/SkinApplyEventImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/event/skin/SkinApplyEventImpl.java index 52148986..f229da28 100644 --- a/core/src/main/java/org/geysermc/floodgate/event/skin/SkinApplyEventImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/event/skin/SkinApplyEventImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.event.skin; +package org.geysermc.floodgate.core.event.skin; import java.util.Objects; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/core/src/main/java/org/geysermc/floodgate/event/util/ListenerAnnotationMatcher.java b/core/src/main/java/org/geysermc/floodgate/core/event/util/ListenerAnnotationMatcher.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/event/util/ListenerAnnotationMatcher.java rename to core/src/main/java/org/geysermc/floodgate/core/event/util/ListenerAnnotationMatcher.java index e0881e23..71262e56 100644 --- a/core/src/main/java/org/geysermc/floodgate/event/util/ListenerAnnotationMatcher.java +++ b/core/src/main/java/org/geysermc/floodgate/core/event/util/ListenerAnnotationMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.event.util; +package org.geysermc.floodgate.core.event.util; import com.google.inject.TypeLiteral; import com.google.inject.matcher.AbstractMatcher; diff --git a/core/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java b/core/src/main/java/org/geysermc/floodgate/core/inject/CommonPlatformInjector.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java rename to core/src/main/java/org/geysermc/floodgate/core/inject/CommonPlatformInjector.java index 1547a2be..fdcfd0c1 100644 --- a/core/src/main/java/org/geysermc/floodgate/inject/CommonPlatformInjector.java +++ b/core/src/main/java/org/geysermc/floodgate/core/inject/CommonPlatformInjector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.inject; +package org.geysermc.floodgate.core.inject; import io.netty.channel.Channel; import java.util.Collections; diff --git a/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java rename to core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java index 9324a097..b50915ed 100644 --- a/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java +++ b/core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.link; +package org.geysermc.floodgate.core.link; import com.google.inject.Inject; import com.google.inject.Key; @@ -40,11 +40,11 @@ import org.geysermc.floodgate.api.link.LinkRequest; import org.geysermc.floodgate.api.link.PlayerLink; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.database.config.DatabaseConfig; -import org.geysermc.floodgate.database.config.DatabaseConfigLoader; -import org.geysermc.floodgate.event.lifecycle.ShutdownEvent; -import org.geysermc.floodgate.util.InjectorHolder; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.database.config.DatabaseConfig; +import org.geysermc.floodgate.core.database.config.DatabaseConfigLoader; +import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent; +import org.geysermc.floodgate.core.util.InjectorHolder; @Listener public abstract class CommonPlayerLink implements PlayerLink { diff --git a/core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java rename to core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java index eab39818..94a83fa3 100644 --- a/core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java +++ b/core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.link; +package org.geysermc.floodgate.core.link; import java.util.UUID; import java.util.concurrent.CompletableFuture; @@ -32,7 +32,7 @@ import org.geysermc.floodgate.api.link.LinkRequestResult; import org.geysermc.floodgate.api.link.PlayerLink; import org.geysermc.floodgate.util.LinkedPlayer; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; /** * Simple class used when PlayerLinking is disabled. This class has been made because Floodgate diff --git a/core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java b/core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java rename to core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java index bc57c61b..1376f629 100644 --- a/core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java +++ b/core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.link; +package org.geysermc.floodgate.core.link; import static org.geysermc.floodgate.util.Constants.GET_BEDROCK_LINK; @@ -36,10 +36,10 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.floodgate.api.link.LinkRequestResult; import org.geysermc.floodgate.api.link.PlayerLink; -import org.geysermc.floodgate.util.HttpClient; -import org.geysermc.floodgate.util.HttpClient.DefaultHttpResponse; +import org.geysermc.floodgate.core.util.HttpClient; +import org.geysermc.floodgate.core.util.HttpClient.DefaultHttpResponse; import org.geysermc.floodgate.util.LinkedPlayer; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; @Getter public class GlobalPlayerLinking extends CommonPlayerLink { diff --git a/core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java b/core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java index a18ac564..326dfbda 100644 --- a/core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.link; +package org.geysermc.floodgate.core.link; import java.time.Instant; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java b/core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java rename to core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java index 4b140c2f..f0624966 100644 --- a/core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java +++ b/core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.link; +package org.geysermc.floodgate.core.link; import static java.util.Objects.requireNonNull; @@ -49,12 +49,12 @@ import org.geysermc.event.subscribe.Subscribe; import org.geysermc.floodgate.api.link.PlayerLink; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.config.FloodgateConfig.PlayerLinkConfig; -import org.geysermc.floodgate.event.lifecycle.ShutdownEvent; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig.PlayerLinkConfig; +import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.InjectorHolder; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.InjectorHolder; +import org.geysermc.floodgate.core.util.Utils; @Listener @Singleton diff --git a/core/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java b/core/src/main/java/org/geysermc/floodgate/core/logger/JavaUtilFloodgateLogger.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java rename to core/src/main/java/org/geysermc/floodgate/core/logger/JavaUtilFloodgateLogger.java index 97f1af3f..8dfc7f4a 100644 --- a/core/src/main/java/org/geysermc/floodgate/logger/JavaUtilFloodgateLogger.java +++ b/core/src/main/java/org/geysermc/floodgate/core/logger/JavaUtilFloodgateLogger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,9 +23,9 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.logger; +package org.geysermc.floodgate.core.logger; -import static org.geysermc.floodgate.util.MessageFormatter.format; +import static org.geysermc.floodgate.core.util.MessageFormatter.format; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -33,8 +33,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.util.LanguageManager; @Singleton public final class JavaUtilFloodgateLogger implements FloodgateLogger { diff --git a/core/src/main/java/org/geysermc/floodgate/module/AutoBindModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/AutoBindModule.java similarity index 87% rename from core/src/main/java/org/geysermc/floodgate/module/AutoBindModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/AutoBindModule.java index 1c2933de..08c935b8 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/AutoBindModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/AutoBindModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.AbstractModule; -import org.geysermc.floodgate.util.AutoBind; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.AutoBind; +import org.geysermc.floodgate.core.util.Utils; public class AutoBindModule extends AbstractModule { @Override diff --git a/core/src/main/java/org/geysermc/floodgate/module/CommandModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/CommandModule.java similarity index 79% rename from core/src/main/java/org/geysermc/floodgate/module/CommandModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/CommandModule.java index f741c868..d50d514d 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/CommandModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/CommandModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,18 +23,18 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.ProvidesIntoSet; -import org.geysermc.floodgate.command.LinkAccountCommand; -import org.geysermc.floodgate.command.TestCommand; -import org.geysermc.floodgate.command.UnlinkAccountCommand; -import org.geysermc.floodgate.command.WhitelistCommand; -import org.geysermc.floodgate.command.main.MainCommand; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.register.CommandRegister; +import org.geysermc.floodgate.core.command.LinkAccountCommand; +import org.geysermc.floodgate.core.command.TestCommand; +import org.geysermc.floodgate.core.command.UnlinkAccountCommand; +import org.geysermc.floodgate.core.command.WhitelistCommand; +import org.geysermc.floodgate.core.command.main.MainCommand; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; +import org.geysermc.floodgate.core.register.CommandRegister; public class CommandModule extends AbstractModule { @Override diff --git a/core/src/main/java/org/geysermc/floodgate/module/CommonModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java similarity index 87% rename from core/src/main/java/org/geysermc/floodgate/module/CommonModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java index cddb93f7..ca115347 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/CommonModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.AbstractModule; import com.google.inject.Provides; @@ -43,9 +43,9 @@ import org.geysermc.configutils.file.template.ResourceTemplateReader; import org.geysermc.configutils.file.template.TemplateReader; import org.geysermc.event.PostOrder; -import org.geysermc.floodgate.addon.data.HandshakeHandlersImpl; +import org.geysermc.floodgate.core.addon.data.HandshakeHandlersImpl; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.event.FloodgateEventBus; import org.geysermc.floodgate.api.handshake.HandshakeHandlers; import org.geysermc.floodgate.api.inject.PlatformInjector; @@ -53,25 +53,25 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.packet.PacketHandlers; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.ConfigLoader; -import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.ConfigLoader; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.packet.PacketHandlersImpl; import org.geysermc.floodgate.crypto.AesCipher; import org.geysermc.floodgate.crypto.AesKeyProducer; import org.geysermc.floodgate.crypto.Base64Topping; import org.geysermc.floodgate.crypto.FloodgateCipher; import org.geysermc.floodgate.crypto.KeyProducer; -import org.geysermc.floodgate.event.EventBus; -import org.geysermc.floodgate.event.lifecycle.ShutdownEvent; -import org.geysermc.floodgate.event.util.ListenerAnnotationMatcher; -import org.geysermc.floodgate.inject.CommonPlatformInjector; -import org.geysermc.floodgate.link.PlayerLinkHolder; -import org.geysermc.floodgate.packet.PacketHandlersImpl; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; -import org.geysermc.floodgate.pluginmessage.PluginMessageManager; -import org.geysermc.floodgate.skin.SkinUploadManager; +import org.geysermc.floodgate.core.event.EventBus; +import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent; +import org.geysermc.floodgate.core.event.util.ListenerAnnotationMatcher; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.link.PlayerLinkHolder; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.skin.SkinUploadManager; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.HttpClient; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.util.HttpClient; +import org.geysermc.floodgate.core.util.LanguageManager; @RequiredArgsConstructor public class CommonModule extends AbstractModule { diff --git a/core/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/ConfigLoadedModule.java similarity index 88% rename from core/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/ConfigLoadedModule.java index 0c76ec4f..3dcfc9ca 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/ConfigLoadedModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/ConfigLoadedModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.google.inject.Singleton; import lombok.RequiredArgsConstructor; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; @RequiredArgsConstructor public final class ConfigLoadedModule extends AbstractModule { diff --git a/core/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/PluginMessageModule.java similarity index 79% rename from core/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/PluginMessageModule.java index 6fa6d928..4170d3a2 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/PluginMessageModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/PluginMessageModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,17 +23,17 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.ProvidesIntoSet; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel; -import org.geysermc.floodgate.pluginmessage.channel.FormChannel; -import org.geysermc.floodgate.pluginmessage.channel.PacketChannel; -import org.geysermc.floodgate.pluginmessage.channel.SkinChannel; -import org.geysermc.floodgate.pluginmessage.channel.TransferChannel; -import org.geysermc.floodgate.register.PluginMessageRegister; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.channel.FormChannel; +import org.geysermc.floodgate.core.pluginmessage.channel.PacketChannel; +import org.geysermc.floodgate.core.pluginmessage.channel.SkinChannel; +import org.geysermc.floodgate.core.pluginmessage.channel.TransferChannel; +import org.geysermc.floodgate.core.register.PluginMessageRegister; public final class PluginMessageModule extends AbstractModule { @Override diff --git a/core/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/PostInitializeModule.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/PostInitializeModule.java index 73692783..efa13a7e 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/PostInitializeModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/PostInitializeModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.AbstractModule; import com.google.inject.Module; diff --git a/core/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/ProxyCommonModule.java similarity index 85% rename from core/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/ProxyCommonModule.java index 77d52d2c..7d405187 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/ProxyCommonModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/ProxyCommonModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,16 +23,16 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; import java.nio.file.Path; -import org.geysermc.floodgate.api.ProxyFloodgateApi; -import org.geysermc.floodgate.api.SimpleFloodgateApi; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; public final class ProxyCommonModule extends CommonModule { public ProxyCommonModule(Path dataDirectory) { diff --git a/core/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/ServerCommonModule.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java rename to core/src/main/java/org/geysermc/floodgate/core/module/ServerCommonModule.java index 9afb2253..ef3b080a 100644 --- a/core/src/main/java/org/geysermc/floodgate/module/ServerCommonModule.java +++ b/core/src/main/java/org/geysermc/floodgate/core/module/ServerCommonModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.module; +package org.geysermc.floodgate.core.module; import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.name.Named; import java.nio.file.Path; import org.geysermc.configutils.file.template.TemplateReader; -import org.geysermc.floodgate.api.SimpleFloodgateApi; -import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.config.FloodgateConfig; public final class ServerCommonModule extends CommonModule { public ServerCommonModule(Path dataDirectory) { diff --git a/core/src/main/java/org/geysermc/floodgate/news/NewsChecker.java b/core/src/main/java/org/geysermc/floodgate/core/news/NewsChecker.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/news/NewsChecker.java rename to core/src/main/java/org/geysermc/floodgate/core/news/NewsChecker.java index 71f9d667..ab0f4911 100644 --- a/core/src/main/java/org/geysermc/floodgate/news/NewsChecker.java +++ b/core/src/main/java/org/geysermc/floodgate/core/news/NewsChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.news; +package org.geysermc.floodgate.core.news; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -37,15 +37,17 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.command.util.Permission; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.news.NewsItem; +import org.geysermc.floodgate.news.NewsItemAction; import org.geysermc.floodgate.news.data.AnnouncementData; import org.geysermc.floodgate.news.data.BuildSpecificData; import org.geysermc.floodgate.news.data.CheckAfterData; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.util.AutoBind; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.util.AutoBind; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.HttpClient; -import org.geysermc.floodgate.util.HttpClient.HttpResponse; +import org.geysermc.floodgate.core.util.HttpClient; +import org.geysermc.floodgate.core.util.HttpClient.HttpResponse; @AutoBind public class NewsChecker { diff --git a/core/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java b/core/src/main/java/org/geysermc/floodgate/core/packet/PacketHandlersImpl.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/packet/PacketHandlersImpl.java index bca49e8e..157a0f52 100644 --- a/core/src/main/java/org/geysermc/floodgate/packet/PacketHandlersImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/packet/PacketHandlersImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.packet; +package org.geysermc.floodgate.core.packet; import io.netty.channel.ChannelHandlerContext; import java.util.ArrayList; diff --git a/core/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java b/core/src/main/java/org/geysermc/floodgate/core/platform/command/CommandUtil.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/command/CommandUtil.java index 17bf555b..59274126 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/command/CommandUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,10 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.command; - -import static org.geysermc.floodgate.platform.util.PlayerType.ALL_PLAYERS; -import static org.geysermc.floodgate.platform.util.PlayerType.ONLY_BEDROCK; +package org.geysermc.floodgate.core.platform.command; import java.util.ArrayList; import java.util.Collection; @@ -38,11 +35,11 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.platform.util.PlayerType; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.audience.ProfileAudience; -import org.geysermc.floodgate.util.LanguageManager; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.platform.util.PlayerType; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.audience.ProfileAudience; +import org.geysermc.floodgate.core.util.LanguageManager; +import org.geysermc.floodgate.core.util.Utils; /** * An interface used across all Floodgate platforms to simple stuff in commands like kicking players @@ -125,10 +122,10 @@ public Object getPlayerByUsername(@NonNull String username, PlayerType filter) { } protected Object applyPlayerTypeFilter(Object player, PlayerType filter, Object fallback) { - if (filter == ALL_PLAYERS || player instanceof String || player instanceof UUID) { + if (filter == PlayerType.ALL_PLAYERS || player instanceof String || player instanceof UUID) { return player; } - return (filter == ONLY_BEDROCK) == api.isFloodgateId(getUuidFromSource(player)) + return (filter == PlayerType.ONLY_BEDROCK) == api.isFloodgateId(getUuidFromSource(player)) ? player : fallback; } diff --git a/core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java b/core/src/main/java/org/geysermc/floodgate/core/platform/command/FloodgateCommand.java similarity index 89% rename from core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/command/FloodgateCommand.java index 80a115da..892aba5e 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/command/FloodgateCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.command; +package org.geysermc.floodgate.core.platform.command; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.player.UserAudience; import org.incendo.cloud.Command; import org.incendo.cloud.CommandManager; diff --git a/core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateSubCommand.java b/core/src/main/java/org/geysermc/floodgate/core/platform/command/FloodgateSubCommand.java similarity index 86% rename from core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateSubCommand.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/command/FloodgateSubCommand.java index fcf4b905..40ab55ff 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/command/FloodgateSubCommand.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/command/FloodgateSubCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.command; +package org.geysermc.floodgate.core.platform.command; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.player.UserAudience; import org.incendo.cloud.context.CommandContext; public abstract class FloodgateSubCommand { diff --git a/core/src/main/java/org/geysermc/floodgate/platform/command/SubCommands.java b/core/src/main/java/org/geysermc/floodgate/core/platform/command/SubCommands.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/platform/command/SubCommands.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/command/SubCommands.java index 75ece406..a18f1d30 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/command/SubCommands.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/command/SubCommands.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.command; +package org.geysermc.floodgate.core.platform.command; import com.google.inject.Inject; import com.google.inject.Injector; diff --git a/core/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java b/core/src/main/java/org/geysermc/floodgate/core/platform/command/TranslatableMessage.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/command/TranslatableMessage.java index ee51f498..f40a7bfd 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/command/TranslatableMessage.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/command/TranslatableMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,9 +23,9 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.command; +package org.geysermc.floodgate.core.platform.command; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.util.LanguageManager; /** * TranslatableMessage is the interface for a message that can be translated. Messages are generally diff --git a/core/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java b/core/src/main/java/org/geysermc/floodgate/core/platform/listener/ListenerRegistration.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/listener/ListenerRegistration.java index e1895022..aec3e668 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/listener/ListenerRegistration.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/listener/ListenerRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.listener; +package org.geysermc.floodgate.core.platform.listener; /** * This class is responsible for registering listeners to the listener manager of the platform that diff --git a/core/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java b/core/src/main/java/org/geysermc/floodgate/core/platform/pluginmessage/PluginMessageUtils.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/pluginmessage/PluginMessageUtils.java index faa7bbd8..03ca93d2 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/pluginmessage/PluginMessageUtils.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/pluginmessage/PluginMessageUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.pluginmessage; +package org.geysermc.floodgate.core.platform.pluginmessage; import java.util.UUID; diff --git a/core/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java b/core/src/main/java/org/geysermc/floodgate/core/platform/util/PlatformUtils.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/util/PlatformUtils.java index d9901848..b3ebcce8 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/util/PlatformUtils.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/util/PlatformUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.util; +package org.geysermc.floodgate.core.platform.util; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/org/geysermc/floodgate/platform/util/PlayerType.java b/core/src/main/java/org/geysermc/floodgate/core/platform/util/PlayerType.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/platform/util/PlayerType.java rename to core/src/main/java/org/geysermc/floodgate/core/platform/util/PlayerType.java index f8c0c97c..00756609 100644 --- a/core/src/main/java/org/geysermc/floodgate/platform/util/PlayerType.java +++ b/core/src/main/java/org/geysermc/floodgate/core/platform/util/PlayerType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.platform.util; +package org.geysermc.floodgate.core.platform.util; public enum PlayerType { ALL_PLAYERS, diff --git a/core/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgateCommandPreprocessor.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java rename to core/src/main/java/org/geysermc/floodgate/core/player/FloodgateCommandPreprocessor.java index 54e68079..e4ccbfad 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/FloodgateCommandPreprocessor.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgateCommandPreprocessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,11 +23,11 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player; +package org.geysermc.floodgate.core.player; import lombok.RequiredArgsConstructor; import org.checkerframework.checker.nullness.qual.NonNull; -import org.geysermc.floodgate.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.command.CommandUtil; import org.incendo.cloud.execution.preprocessor.CommandPreprocessingContext; import org.incendo.cloud.execution.preprocessor.CommandPreprocessor; diff --git a/core/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgateHandshakeHandler.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java rename to core/src/main/java/org/geysermc/floodgate/core/player/FloodgateHandshakeHandler.java index b84ff1ba..3ccafca1 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgateHandshakeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player; +package org.geysermc.floodgate.core.player; -import static org.geysermc.floodgate.player.FloodgateHandshakeHandler.ResultType.INVALID_DATA_LENGTH; -import static org.geysermc.floodgate.player.FloodgateHandshakeHandler.ResultType.NOT_FLOODGATE_DATA; +import static org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.ResultType.INVALID_DATA_LENGTH; +import static org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.ResultType.NOT_FLOODGATE_DATA; import static org.geysermc.floodgate.util.BedrockData.EXPECTED_LENGTH; import com.google.common.base.Charsets; @@ -41,22 +41,22 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NonNull; -import org.geysermc.floodgate.addon.data.HandshakeDataImpl; -import org.geysermc.floodgate.addon.data.HandshakeHandlersImpl; -import org.geysermc.floodgate.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.addon.data.HandshakeDataImpl; +import org.geysermc.floodgate.core.addon.data.HandshakeHandlersImpl; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.handshake.HandshakeData; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.PropertyKey; -import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig; import org.geysermc.floodgate.crypto.FloodgateCipher; -import org.geysermc.floodgate.skin.SkinUploadManager; +import org.geysermc.floodgate.core.skin.SkinUploadManager; import org.geysermc.floodgate.util.BedrockData; import org.geysermc.floodgate.util.Constants; import org.geysermc.floodgate.util.InvalidFormatException; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.util.LanguageManager; import org.geysermc.floodgate.util.LinkedPlayer; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; public final class FloodgateHandshakeHandler { private final HandshakeHandlersImpl handshakeHandlers; diff --git a/core/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgatePlayerImpl.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/player/FloodgatePlayerImpl.java index 5945f66e..1bb13b60 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/FloodgatePlayerImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgatePlayerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player; +package org.geysermc.floodgate.core.player; import java.util.HashMap; import java.util.Map; @@ -32,7 +32,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.handshake.HandshakeData; import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.PropertyKey; @@ -42,7 +42,7 @@ import org.geysermc.floodgate.util.InputMode; import org.geysermc.floodgate.util.LinkedPlayer; import org.geysermc.floodgate.util.UiProfile; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; @Getter @RequiredArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/core/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java b/core/src/main/java/org/geysermc/floodgate/core/player/HostnameSeparationResult.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java rename to core/src/main/java/org/geysermc/floodgate/core/player/HostnameSeparationResult.java index 9c2f0eb6..b05e8b06 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/HostnameSeparationResult.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/HostnameSeparationResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player; +package org.geysermc.floodgate.core.player; public class HostnameSeparationResult { private final String floodgateData; diff --git a/core/src/main/java/org/geysermc/floodgate/player/UserAudience.java b/core/src/main/java/org/geysermc/floodgate/core/player/UserAudience.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/player/UserAudience.java rename to core/src/main/java/org/geysermc/floodgate/core/player/UserAudience.java index 9ed5e20d..c17c2a91 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/UserAudience.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/UserAudience.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player; +package org.geysermc.floodgate.core.player; import java.util.Objects; import java.util.UUID; import lombok.Getter; import lombok.experimental.Accessors; import org.checkerframework.checker.nullness.qual.NonNull; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.platform.command.TranslatableMessage; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.command.TranslatableMessage; @Getter @Accessors(fluent = true) public class UserAudience { diff --git a/core/src/main/java/org/geysermc/floodgate/player/audience/FloodgateSenderMapper.java b/core/src/main/java/org/geysermc/floodgate/core/player/audience/FloodgateSenderMapper.java similarity index 91% rename from core/src/main/java/org/geysermc/floodgate/player/audience/FloodgateSenderMapper.java rename to core/src/main/java/org/geysermc/floodgate/core/player/audience/FloodgateSenderMapper.java index 632ae5aa..0e519518 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/audience/FloodgateSenderMapper.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/audience/FloodgateSenderMapper.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player.audience; +package org.geysermc.floodgate.core.player.audience; import org.checkerframework.checker.nullness.qual.NonNull; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.platform.command.CommandUtil; import org.incendo.cloud.SenderMapper; public class FloodgateSenderMapper implements SenderMapper { diff --git a/core/src/main/java/org/geysermc/floodgate/player/audience/InvalidPlayerIdentifierException.java b/core/src/main/java/org/geysermc/floodgate/core/player/audience/InvalidPlayerIdentifierException.java similarity index 96% rename from core/src/main/java/org/geysermc/floodgate/player/audience/InvalidPlayerIdentifierException.java rename to core/src/main/java/org/geysermc/floodgate/core/player/audience/InvalidPlayerIdentifierException.java index d6692680..fc428fbe 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/audience/InvalidPlayerIdentifierException.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/audience/InvalidPlayerIdentifierException.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player.audience; +package org.geysermc.floodgate.core.player.audience; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/core/src/main/java/org/geysermc/floodgate/player/audience/PlayerAudienceArgument.java b/core/src/main/java/org/geysermc/floodgate/core/player/audience/PlayerAudienceArgument.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/player/audience/PlayerAudienceArgument.java rename to core/src/main/java/org/geysermc/floodgate/core/player/audience/PlayerAudienceArgument.java index 765fa75f..01d3b3d9 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/audience/PlayerAudienceArgument.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/audience/PlayerAudienceArgument.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player.audience; +package org.geysermc.floodgate.core.player.audience; import static org.incendo.cloud.parser.standard.StringParser.quotedStringParser; @@ -31,10 +31,10 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.platform.util.PlayerType; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.util.BrigadierUtils; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.util.PlayerType; +import org.geysermc.floodgate.core.util.BrigadierUtils; import org.incendo.cloud.component.CommandComponent; import org.incendo.cloud.parser.ArgumentParseResult; import org.incendo.cloud.suggestion.Suggestion; diff --git a/core/src/main/java/org/geysermc/floodgate/player/audience/ProfileAudience.java b/core/src/main/java/org/geysermc/floodgate/core/player/audience/ProfileAudience.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/player/audience/ProfileAudience.java rename to core/src/main/java/org/geysermc/floodgate/core/player/audience/ProfileAudience.java index 299f8152..9746fcf2 100644 --- a/core/src/main/java/org/geysermc/floodgate/player/audience/ProfileAudience.java +++ b/core/src/main/java/org/geysermc/floodgate/core/player/audience/ProfileAudience.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.player.audience; +package org.geysermc.floodgate.core.player.audience; import java.util.UUID; import lombok.Getter; diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageChannel.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageChannel.java index 067edd31..d31b3187 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageChannel.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage; +package org.geysermc.floodgate.core.pluginmessage; import java.util.UUID; import lombok.AccessLevel; diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageManager.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageManager.java index ee162412..2474db89 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageManager.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage; +package org.geysermc.floodgate.core.pluginmessage; import com.google.inject.Inject; import java.util.HashMap; diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageRegistration.java similarity index 92% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageRegistration.java index 6e28cd40..b4ae192c 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/PluginMessageRegistration.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/PluginMessageRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage; +package org.geysermc.floodgate.core.pluginmessage; public interface PluginMessageRegistration { void register(PluginMessageChannel channel); diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/FormChannel.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/FormChannel.java index 1da89bc1..36e6a14d 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/FormChannel.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/FormChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage.channel; +package org.geysermc.floodgate.core.pluginmessage.channel; import com.google.common.base.Charsets; import com.google.inject.Inject; @@ -36,9 +36,9 @@ import org.geysermc.cumulus.form.impl.FormDefinition; import org.geysermc.cumulus.form.impl.FormDefinitions; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; public class FormChannel implements PluginMessageChannel { private final FormDefinitions formDefinitions = FormDefinitions.instance(); diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/PacketChannel.java similarity index 88% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/PacketChannel.java index 2296f35e..fa28e055 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/PacketChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage.channel; +package org.geysermc.floodgate.core.pluginmessage.channel; import com.google.inject.Inject; import java.util.UUID; -import org.geysermc.floodgate.api.UnsafeFloodgateApi; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.api.UnsafeFloodgateApi; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; public final class PacketChannel implements PluginMessageChannel { @Inject private PluginMessageUtils pluginMessageUtils; diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/SkinChannel.java similarity index 89% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/SkinChannel.java index 8e9e64b0..880f1031 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/SkinChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage.channel; +package org.geysermc.floodgate.core.pluginmessage.channel; import com.google.inject.Inject; import java.nio.charset.StandardCharsets; @@ -31,11 +31,11 @@ import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.PropertyKey; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel; -import org.geysermc.floodgate.skin.SkinApplier; -import org.geysermc.floodgate.skin.SkinDataImpl; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.skin.SkinApplier; +import org.geysermc.floodgate.core.skin.SkinDataImpl; public class SkinChannel implements PluginMessageChannel { @Inject private FloodgateApi api; diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/TransferChannel.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java rename to core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/TransferChannel.java index 7ca754ed..0ef9a324 100644 --- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/TransferChannel.java +++ b/core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/TransferChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.pluginmessage.channel; +package org.geysermc.floodgate.core.pluginmessage.channel; import com.google.inject.Inject; import java.nio.charset.StandardCharsets; import java.util.UUID; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; public class TransferChannel implements PluginMessageChannel { @Inject private PluginMessageUtils pluginMessageUtils; diff --git a/core/src/main/java/org/geysermc/floodgate/register/AddonRegister.java b/core/src/main/java/org/geysermc/floodgate/core/register/AddonRegister.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/register/AddonRegister.java rename to core/src/main/java/org/geysermc/floodgate/core/register/AddonRegister.java index 094b99a7..4ef56b77 100644 --- a/core/src/main/java/org/geysermc/floodgate/register/AddonRegister.java +++ b/core/src/main/java/org/geysermc/floodgate/core/register/AddonRegister.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.register; +package org.geysermc.floodgate.core.register; import com.google.inject.Inject; import com.google.inject.Injector; diff --git a/core/src/main/java/org/geysermc/floodgate/register/CommandRegister.java b/core/src/main/java/org/geysermc/floodgate/core/register/CommandRegister.java similarity index 89% rename from core/src/main/java/org/geysermc/floodgate/register/CommandRegister.java rename to core/src/main/java/org/geysermc/floodgate/core/register/CommandRegister.java index 11ebd0fe..22c7d11c 100644 --- a/core/src/main/java/org/geysermc/floodgate/register/CommandRegister.java +++ b/core/src/main/java/org/geysermc/floodgate/core/register/CommandRegister.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,15 +23,15 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.register; +package org.geysermc.floodgate.core.register; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import java.util.Set; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.platform.command.FloodgateCommand; -import org.geysermc.floodgate.player.UserAudience; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.platform.command.FloodgateCommand; import org.incendo.cloud.CommandManager; /** diff --git a/core/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java b/core/src/main/java/org/geysermc/floodgate/core/register/ListenerRegister.java similarity index 90% rename from core/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java rename to core/src/main/java/org/geysermc/floodgate/core/register/ListenerRegister.java index 62785b27..17be371e 100644 --- a/core/src/main/java/org/geysermc/floodgate/register/ListenerRegister.java +++ b/core/src/main/java/org/geysermc/floodgate/core/register/ListenerRegister.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,13 +23,13 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.register; +package org.geysermc.floodgate.core.register; import com.google.inject.Inject; import com.google.inject.Injector; import java.util.Set; import lombok.RequiredArgsConstructor; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; @RequiredArgsConstructor(onConstructor = @__(@Inject)) public final class ListenerRegister { diff --git a/core/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java b/core/src/main/java/org/geysermc/floodgate/core/register/PluginMessageRegister.java similarity index 84% rename from core/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java rename to core/src/main/java/org/geysermc/floodgate/core/register/PluginMessageRegister.java index 1a71f6fb..3ff7a1a1 100644 --- a/core/src/main/java/org/geysermc/floodgate/register/PluginMessageRegister.java +++ b/core/src/main/java/org/geysermc/floodgate/core/register/PluginMessageRegister.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,14 +23,14 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.register; +package org.geysermc.floodgate.core.register; import com.google.inject.Inject; import com.google.inject.Injector; import java.util.Set; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel; -import org.geysermc.floodgate.pluginmessage.PluginMessageManager; -import org.geysermc.floodgate.pluginmessage.PluginMessageRegistration; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; public class PluginMessageRegister { @Inject private Injector guice; diff --git a/core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinApplier.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java rename to core/src/main/java/org/geysermc/floodgate/core/skin/SkinApplier.java index c8e7684c..9b4008bd 100644 --- a/core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java +++ b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinApplier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.skin; +package org.geysermc.floodgate.core.skin; import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData; diff --git a/core/src/main/java/org/geysermc/floodgate/skin/SkinDataImpl.java b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinDataImpl.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/skin/SkinDataImpl.java rename to core/src/main/java/org/geysermc/floodgate/core/skin/SkinDataImpl.java index 1e2247e2..e61c5d3d 100644 --- a/core/src/main/java/org/geysermc/floodgate/skin/SkinDataImpl.java +++ b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinDataImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.skin; +package org.geysermc.floodgate.core.skin; import com.google.gson.JsonObject; import java.util.Objects; diff --git a/core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadManager.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java rename to core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadManager.java index 61db1ab6..f8519a32 100644 --- a/core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java +++ b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.skin; +package org.geysermc.floodgate.core.skin; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ import org.geysermc.event.subscribe.Subscribe; import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.event.lifecycle.ShutdownEvent; +import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent; @Listener @Singleton diff --git a/core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadSocket.java similarity index 98% rename from core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java rename to core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadSocket.java index 5018f8fa..6d2dc492 100644 --- a/core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java +++ b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.skin; +package org.geysermc.floodgate.core.skin; import static org.geysermc.floodgate.util.Constants.WEBSOCKET_URL; @@ -39,7 +39,7 @@ import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.PropertyKey; -import org.geysermc.floodgate.util.Utils; +import org.geysermc.floodgate.core.util.Utils; import org.geysermc.floodgate.util.WebsocketEventType; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; diff --git a/core/src/main/java/org/geysermc/floodgate/util/AutoBind.java b/core/src/main/java/org/geysermc/floodgate/core/util/AutoBind.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/util/AutoBind.java rename to core/src/main/java/org/geysermc/floodgate/core/util/AutoBind.java index 6c1eec2e..ef66461c 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/AutoBind.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/AutoBind.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/main/java/org/geysermc/floodgate/util/BrigadierUtils.java b/core/src/main/java/org/geysermc/floodgate/core/util/BrigadierUtils.java similarity index 98% rename from core/src/main/java/org/geysermc/floodgate/util/BrigadierUtils.java rename to core/src/main/java/org/geysermc/floodgate/core/util/BrigadierUtils.java index 50c1eb5d..1dcf4203 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/BrigadierUtils.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/BrigadierUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; /* Code taken from Brigadier's StringArgumentType and StringReader diff --git a/core/src/main/java/org/geysermc/floodgate/util/HttpClient.java b/core/src/main/java/org/geysermc/floodgate/core/util/HttpClient.java similarity index 98% rename from core/src/main/java/org/geysermc/floodgate/util/HttpClient.java rename to core/src/main/java/org/geysermc/floodgate/core/util/HttpClient.java index 960dc1b1..38776666 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/HttpClient.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/HttpClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import com.google.gson.Gson; import com.google.gson.JsonObject; diff --git a/core/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java b/core/src/main/java/org/geysermc/floodgate/core/util/InjectorHolder.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java rename to core/src/main/java/org/geysermc/floodgate/core/util/InjectorHolder.java index c4865da9..3908d5ef 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/InjectorHolder.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/InjectorHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import com.google.inject.Injector; diff --git a/core/src/main/java/org/geysermc/floodgate/util/LanguageManager.java b/core/src/main/java/org/geysermc/floodgate/core/util/LanguageManager.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/util/LanguageManager.java rename to core/src/main/java/org/geysermc/floodgate/core/util/LanguageManager.java index a3d659bf..87df9c04 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/LanguageManager.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/LanguageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import com.google.common.base.Joiner; import com.google.inject.Inject; @@ -36,7 +36,7 @@ import java.util.Properties; import lombok.Getter; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig; /** * Manages translations for strings in Floodgate diff --git a/core/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java b/core/src/main/java/org/geysermc/floodgate/core/util/MessageFormatter.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java rename to core/src/main/java/org/geysermc/floodgate/core/util/MessageFormatter.java index c3bad6a4..bd266233 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/MessageFormatter.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/MessageFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; public final class MessageFormatter { private static final String DELIM_STR = "{}"; diff --git a/core/src/main/java/org/geysermc/floodgate/util/Metrics.java b/core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java similarity index 93% rename from core/src/main/java/org/geysermc/floodgate/util/Metrics.java rename to core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java index 7e388940..1816fe69 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/Metrics.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import com.google.inject.Inject; import com.google.inject.name.Named; @@ -42,10 +42,11 @@ import org.geysermc.event.subscribe.Subscribe; import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.config.FloodgateConfig.MetricsConfig; -import org.geysermc.floodgate.event.lifecycle.ShutdownEvent; -import org.geysermc.floodgate.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.config.FloodgateConfig.MetricsConfig; +import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; +import org.geysermc.floodgate.util.Constants; @Listener @AutoBind diff --git a/core/src/main/java/org/geysermc/floodgate/util/MojangUtils.java b/core/src/main/java/org/geysermc/floodgate/core/util/MojangUtils.java similarity index 94% rename from core/src/main/java/org/geysermc/floodgate/util/MojangUtils.java rename to core/src/main/java/org/geysermc/floodgate/core/util/MojangUtils.java index 423ff44b..f219da63 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/MojangUtils.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/MojangUtils.java @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -40,8 +40,9 @@ import java.util.concurrent.TimeUnit; import lombok.NonNull; import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData; -import org.geysermc.floodgate.skin.SkinDataImpl; -import org.geysermc.floodgate.util.HttpClient.HttpResponse; +import org.geysermc.floodgate.core.skin.SkinDataImpl; +import org.geysermc.floodgate.core.util.HttpClient.HttpResponse; +import org.geysermc.floodgate.util.Constants; @Singleton public class MojangUtils { diff --git a/core/src/main/java/org/geysermc/floodgate/util/PostEnableMessages.java b/core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java similarity index 95% rename from core/src/main/java/org/geysermc/floodgate/util/PostEnableMessages.java rename to core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java index e526c470..da9b5a56 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/PostEnableMessages.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import com.google.inject.Inject; import com.google.inject.name.Named; @@ -34,8 +34,8 @@ import org.geysermc.event.Listener; import org.geysermc.event.subscribe.Subscribe; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.event.lifecycle.PostEnableEvent; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.event.lifecycle.PostEnableEvent; @AutoBind @Listener diff --git a/core/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java b/core/src/main/java/org/geysermc/floodgate/core/util/ReflectionUtils.java similarity index 99% rename from core/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java rename to core/src/main/java/org/geysermc/floodgate/core/util/ReflectionUtils.java index 709dfd43..62e2d00b 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/ReflectionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; @@ -33,6 +33,7 @@ import javax.annotation.Nullable; import lombok.Getter; import lombok.Setter; +import org.geysermc.floodgate.util.Constants; @SuppressWarnings("PMD.AvoidBranchingStatementAsLastInLoop") public final class ReflectionUtils { diff --git a/core/src/main/java/org/geysermc/floodgate/util/Utils.java b/core/src/main/java/org/geysermc/floodgate/core/util/Utils.java similarity index 97% rename from core/src/main/java/org/geysermc/floodgate/util/Utils.java rename to core/src/main/java/org/geysermc/floodgate/core/util/Utils.java index cf4b7f1a..fa35e40a 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/Utils.java +++ b/core/src/main/java/org/geysermc/floodgate/core/util/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org + * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ * @link https://github.com/GeyserMC/Floodgate */ -package org.geysermc.floodgate.util; +package org.geysermc.floodgate.core.util; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; @@ -42,6 +42,7 @@ import java.util.concurrent.CompletableFuture; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.geysermc.floodgate.util.Constants; public class Utils { private static final Pattern NON_UNIQUE_PREFIX = Pattern.compile("^\\w{0,16}$"); diff --git a/core/src/main/templates/org/geysermc/floodgate/util/Constants.java b/core/src/main/templates/org/geysermc/floodgate/core/util/Constants.java similarity index 100% rename from core/src/main/templates/org/geysermc/floodgate/util/Constants.java rename to core/src/main/templates/org/geysermc/floodgate/core/util/Constants.java diff --git a/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java b/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java index 19f9058b..4ad7d3cb 100644 --- a/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java +++ b/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java @@ -51,8 +51,8 @@ import org.geysermc.floodgate.api.link.LinkRequest; import org.geysermc.floodgate.api.link.LinkRequestResult; import org.geysermc.floodgate.database.config.MongoConfig; -import org.geysermc.floodgate.link.CommonPlayerLink; -import org.geysermc.floodgate.link.LinkRequestImpl; +import org.geysermc.floodgate.core.link.CommonPlayerLink; +import org.geysermc.floodgate.core.link.LinkRequestImpl; import org.geysermc.floodgate.util.LinkedPlayer; public class MongoDbDatabase extends CommonPlayerLink { diff --git a/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java b/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java index e7cfae8e..cec6a324 100644 --- a/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java +++ b/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java @@ -26,6 +26,7 @@ package org.geysermc.floodgate.database.config; import lombok.Getter; +import org.geysermc.floodgate.core.database.config.DatabaseConfig; @Getter public class MongoConfig implements DatabaseConfig { diff --git a/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java b/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java index 60c19716..50382174 100644 --- a/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java +++ b/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java @@ -42,8 +42,8 @@ import org.geysermc.floodgate.api.link.LinkRequest; import org.geysermc.floodgate.api.link.LinkRequestResult; import org.geysermc.floodgate.database.config.MysqlConfig; -import org.geysermc.floodgate.link.CommonPlayerLink; -import org.geysermc.floodgate.link.LinkRequestImpl; +import org.geysermc.floodgate.core.link.CommonPlayerLink; +import org.geysermc.floodgate.core.link.LinkRequestImpl; import org.geysermc.floodgate.util.LinkedPlayer; public class MysqlDatabase extends CommonPlayerLink { diff --git a/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java b/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java index b85748e7..0af667ac 100644 --- a/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java +++ b/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java @@ -26,6 +26,7 @@ package org.geysermc.floodgate.database.config; import lombok.Getter; +import org.geysermc.floodgate.core.database.config.DatabaseConfig; @Getter public class MysqlConfig implements DatabaseConfig { diff --git a/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java b/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java index 78a54952..505b1204 100644 --- a/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java +++ b/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java @@ -42,8 +42,8 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.floodgate.api.link.LinkRequest; import org.geysermc.floodgate.api.link.LinkRequestResult; -import org.geysermc.floodgate.link.CommonPlayerLink; -import org.geysermc.floodgate.link.LinkRequestImpl; +import org.geysermc.floodgate.core.link.CommonPlayerLink; +import org.geysermc.floodgate.core.link.LinkRequestImpl; import org.geysermc.floodgate.util.LinkedPlayer; public class SqliteDatabase extends CommonPlayerLink { diff --git a/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java b/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java index a12c41a8..43e6af6b 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java +++ b/spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java @@ -27,18 +27,18 @@ import com.google.inject.Guice; import com.google.inject.Injector; -import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.geysermc.floodgate.api.handshake.HandshakeHandlers; import org.geysermc.floodgate.api.logger.FloodgateLogger; +import org.geysermc.floodgate.core.FloodgatePlatform; import org.geysermc.floodgate.module.PaperListenerModule; -import org.geysermc.floodgate.module.PluginMessageModule; -import org.geysermc.floodgate.module.ServerCommonModule; +import org.geysermc.floodgate.core.module.PluginMessageModule; +import org.geysermc.floodgate.core.module.ServerCommonModule; import org.geysermc.floodgate.module.SpigotAddonModule; import org.geysermc.floodgate.module.SpigotCommandModule; import org.geysermc.floodgate.module.SpigotListenerModule; import org.geysermc.floodgate.module.SpigotPlatformModule; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; import org.geysermc.floodgate.util.SpigotHandshakeHandler; import org.geysermc.floodgate.util.SpigotProtocolSupportHandler; import org.geysermc.floodgate.util.SpigotProtocolSupportListener; diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java index 6e5c79f7..563a7d4a 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java +++ b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java @@ -29,12 +29,12 @@ import com.google.inject.name.Named; import io.netty.channel.Channel; import io.netty.util.AttributeKey; -import org.geysermc.floodgate.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.inject.InjectorAddon; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; public final class SpigotDataAddon implements InjectorAddon { @Inject private FloodgateHandshakeHandler handshakeHandler; diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java index 383fa7e9..213363cf 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java +++ b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java @@ -25,8 +25,8 @@ package org.geysermc.floodgate.addon.data; -import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue; -import static org.geysermc.floodgate.util.ReflectionUtils.setValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getCastedValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.setValue; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; @@ -35,9 +35,11 @@ import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult; +import org.geysermc.floodgate.core.addon.data.CommonDataHandler; +import org.geysermc.floodgate.core.addon.data.PacketBlocker; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.HandshakeResult; import org.geysermc.floodgate.util.ClassNames; import org.geysermc.floodgate.util.Constants; import org.geysermc.floodgate.util.ProxyUtils; diff --git a/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java b/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java index 17812624..027b476d 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java +++ b/spigot/src/main/java/org/geysermc/floodgate/inject/spigot/SpigotInjector.java @@ -39,9 +39,9 @@ import java.util.List; import lombok.Getter; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; import org.geysermc.floodgate.util.ClassNames; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; @Singleton public final class SpigotInjector extends CommonPlatformInjector { diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java b/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java index 836b9fb2..0fa47b6d 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java +++ b/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java @@ -33,7 +33,7 @@ import java.util.UUID; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.geysermc.floodgate.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.util.Constants; diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java index 3574af44..290c112b 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java +++ b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java @@ -32,10 +32,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; -import org.geysermc.floodgate.api.SimpleFloodgateApi; +import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.util.LanguageManager; public final class SpigotListener implements Listener { @Inject private SimpleFloodgateApi api; diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java index d3052286..ef993372 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java +++ b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListenerRegistration.java @@ -30,7 +30,7 @@ import org.bukkit.Bukkit; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; @RequiredArgsConstructor(onConstructor = @__(@Inject)) public final class SpigotListenerRegistration implements ListenerRegistration { diff --git a/spigot/src/main/java/org/geysermc/floodgate/module/PaperListenerModule.java b/spigot/src/main/java/org/geysermc/floodgate/module/PaperListenerModule.java index fb7249fb..0147dddc 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/module/PaperListenerModule.java +++ b/spigot/src/main/java/org/geysermc/floodgate/module/PaperListenerModule.java @@ -30,7 +30,7 @@ import com.google.inject.multibindings.ProvidesIntoSet; import org.bukkit.event.Listener; import org.geysermc.floodgate.listener.PaperProfileListener; -import org.geysermc.floodgate.register.ListenerRegister; +import org.geysermc.floodgate.core.register.ListenerRegister; public class PaperListenerModule extends SpigotListenerModule { @Override diff --git a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotAddonModule.java b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotAddonModule.java index d5a34b82..37fd7812 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotAddonModule.java +++ b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotAddonModule.java @@ -28,12 +28,12 @@ import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.ProvidesIntoSet; -import org.geysermc.floodgate.addon.AddonManagerAddon; -import org.geysermc.floodgate.addon.DebugAddon; -import org.geysermc.floodgate.addon.PacketHandlerAddon; +import org.geysermc.floodgate.core.addon.AddonManagerAddon; +import org.geysermc.floodgate.core.addon.DebugAddon; +import org.geysermc.floodgate.core.addon.PacketHandlerAddon; import org.geysermc.floodgate.addon.data.SpigotDataAddon; import org.geysermc.floodgate.api.inject.InjectorAddon; -import org.geysermc.floodgate.register.AddonRegister; +import org.geysermc.floodgate.core.register.AddonRegister; public final class SpigotAddonModule extends AbstractModule { @Override diff --git a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotCommandModule.java b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotCommandModule.java index d616181e..aeb011fa 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotCommandModule.java +++ b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotCommandModule.java @@ -33,11 +33,12 @@ import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.PluginManager; import org.geysermc.floodgate.SpigotPlugin; -import org.geysermc.floodgate.command.util.Permission; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.player.FloodgateCommandPreprocessor; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.audience.FloodgateSenderMapper; +import org.geysermc.floodgate.core.command.util.Permission; +import org.geysermc.floodgate.core.module.CommandModule; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.player.FloodgateCommandPreprocessor; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.audience.FloodgateSenderMapper; import org.incendo.cloud.CommandManager; import org.incendo.cloud.execution.ExecutionCoordinator; import org.incendo.cloud.paper.LegacyPaperCommandManager; diff --git a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotListenerModule.java b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotListenerModule.java index ba9e64e6..523d611e 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotListenerModule.java +++ b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotListenerModule.java @@ -31,7 +31,7 @@ import com.google.inject.multibindings.ProvidesIntoSet; import org.bukkit.event.Listener; import org.geysermc.floodgate.listener.SpigotListener; -import org.geysermc.floodgate.register.ListenerRegister; +import org.geysermc.floodgate.core.register.ListenerRegister; public class SpigotListenerModule extends AbstractModule { @Override diff --git a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java index 1c03dc95..8806fb01 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java +++ b/spigot/src/main/java/org/geysermc/floodgate/module/SpigotPlatformModule.java @@ -37,20 +37,20 @@ import org.geysermc.floodgate.SpigotPlugin; import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; import org.geysermc.floodgate.inject.spigot.SpigotInjector; import org.geysermc.floodgate.listener.SpigotListenerRegistration; -import org.geysermc.floodgate.logger.JavaUtilFloodgateLogger; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.platform.util.PlatformUtils; -import org.geysermc.floodgate.pluginmessage.PluginMessageRegistration; +import org.geysermc.floodgate.core.logger.JavaUtilFloodgateLogger; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; import org.geysermc.floodgate.pluginmessage.SpigotPluginMessageRegistration; import org.geysermc.floodgate.pluginmessage.SpigotPluginMessageUtils; import org.geysermc.floodgate.pluginmessage.SpigotSkinApplier; -import org.geysermc.floodgate.skin.SkinApplier; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.skin.SkinApplier; +import org.geysermc.floodgate.core.util.LanguageManager; import org.geysermc.floodgate.util.SpigotCommandUtil; import org.geysermc.floodgate.util.SpigotPlatformUtils; import org.geysermc.floodgate.util.SpigotVersionSpecificMethods; diff --git a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageRegistration.java b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageRegistration.java index a73b5092..939ba05c 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageRegistration.java +++ b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageRegistration.java @@ -28,6 +28,8 @@ import lombok.RequiredArgsConstructor; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.messaging.Messenger; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; @RequiredArgsConstructor public class SpigotPluginMessageRegistration implements PluginMessageRegistration { diff --git a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageUtils.java b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageUtils.java index 3261f71b..1be81177 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageUtils.java +++ b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageUtils.java @@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; @RequiredArgsConstructor public class SpigotPluginMessageUtils extends PluginMessageUtils { diff --git a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java index d312afdc..a4809a1a 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java +++ b/spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java @@ -36,11 +36,11 @@ import org.geysermc.floodgate.api.event.skin.SkinApplyEvent; import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.event.EventBus; -import org.geysermc.floodgate.event.skin.SkinApplyEventImpl; -import org.geysermc.floodgate.skin.SkinApplier; +import org.geysermc.floodgate.core.event.EventBus; +import org.geysermc.floodgate.core.event.skin.SkinApplyEventImpl; +import org.geysermc.floodgate.core.skin.SkinApplier; import org.geysermc.floodgate.util.ClassNames; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; import org.geysermc.floodgate.util.SpigotVersionSpecificMethods; @Singleton diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java index 029b89b1..4dd3d8c7 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java @@ -25,17 +25,17 @@ package org.geysermc.floodgate.util; -import static org.geysermc.floodgate.util.ReflectionUtils.castedStaticBooleanValue; -import static org.geysermc.floodgate.util.ReflectionUtils.getBooleanValue; -import static org.geysermc.floodgate.util.ReflectionUtils.getClassOrFallback; -import static org.geysermc.floodgate.util.ReflectionUtils.getClassSilently; -import static org.geysermc.floodgate.util.ReflectionUtils.getConstructor; -import static org.geysermc.floodgate.util.ReflectionUtils.getField; -import static org.geysermc.floodgate.util.ReflectionUtils.getFieldOfType; -import static org.geysermc.floodgate.util.ReflectionUtils.getMethod; -import static org.geysermc.floodgate.util.ReflectionUtils.getValue; -import static org.geysermc.floodgate.util.ReflectionUtils.invoke; -import static org.geysermc.floodgate.util.ReflectionUtils.makeAccessible; +import static org.geysermc.floodgate.core.util.ReflectionUtils.castedStaticBooleanValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getBooleanValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getClassOrFallback; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getClassSilently; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getConstructor; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getField; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getFieldOfType; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getMethod; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.invoke; +import static org.geysermc.floodgate.core.util.ReflectionUtils.makeAccessible; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; @@ -49,6 +49,7 @@ import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.checkerframework.checker.nullness.qual.Nullable; +import org.geysermc.floodgate.core.util.ReflectionUtils; @SuppressWarnings("PMD.SystemPrintln") public class ClassNames { diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/ProxyUtils.java b/spigot/src/main/java/org/geysermc/floodgate/util/ProxyUtils.java index d9d7791d..a9bffbb0 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/ProxyUtils.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/ProxyUtils.java @@ -25,6 +25,8 @@ package org.geysermc.floodgate.util; +import org.geysermc.floodgate.core.util.ReflectionUtils; + public final class ProxyUtils { public static boolean isProxyData() { diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotCommandUtil.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotCommandUtil.java index d6028abe..fbf21c50 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotCommandUtil.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotCommandUtil.java @@ -27,16 +27,16 @@ import java.util.Collection; import java.util.UUID; -import org.bukkit.OfflinePlayer; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.UserAudience.ConsoleAudience; -import org.geysermc.floodgate.player.UserAudience.PlayerAudience; +import org.geysermc.floodgate.core.util.LanguageManager; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.UserAudience.ConsoleAudience; +import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience; public final class SpigotCommandUtil extends CommandUtil { private final Server server; diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotPlatformUtils.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotPlatformUtils.java index 538c8ce6..049ce559 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotPlatformUtils.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotPlatformUtils.java @@ -26,7 +26,7 @@ package org.geysermc.floodgate.util; import org.bukkit.Bukkit; -import org.geysermc.floodgate.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; public class SpigotPlatformUtils extends PlatformUtils { @Override diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportHandler.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportHandler.java index b944a2f8..5ce2ecd1 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportHandler.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportHandler.java @@ -35,6 +35,7 @@ import org.geysermc.floodgate.api.packet.PacketHandler; import org.geysermc.floodgate.api.packet.PacketHandlers; import org.geysermc.floodgate.api.player.FloodgatePlayer; +import org.geysermc.floodgate.core.util.ReflectionUtils; public class SpigotProtocolSupportHandler implements PacketHandler { private static final Method getFromChannel; diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportListener.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportListener.java index b5224b34..e051b023 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportListener.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotProtocolSupportListener.java @@ -25,8 +25,8 @@ package org.geysermc.floodgate.util; -import static org.geysermc.floodgate.util.ReflectionUtils.getMethod; -import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getMethod; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getPrefixedClass; import java.lang.reflect.Method; import java.util.UUID; @@ -35,6 +35,7 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; import org.geysermc.floodgate.api.FloodgateApi; +import org.geysermc.floodgate.core.util.ReflectionUtils; @SuppressWarnings("unchecked") public final class SpigotProtocolSupportListener { diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java index 7569c615..ec181b80 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java @@ -33,7 +33,8 @@ import org.bukkit.plugin.Plugin; import org.geysermc.floodgate.SpigotPlugin; import org.geysermc.floodgate.api.event.skin.SkinApplyEvent; -import org.geysermc.floodgate.skin.SkinDataImpl; +import org.geysermc.floodgate.core.skin.SkinDataImpl; +import org.geysermc.floodgate.core.util.ReflectionUtils; public final class SpigotVersionSpecificMethods { private static final Method GET_SPIGOT; diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/WhitelistUtils.java b/spigot/src/main/java/org/geysermc/floodgate/util/WhitelistUtils.java index d5779565..bef9faf8 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/WhitelistUtils.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/WhitelistUtils.java @@ -29,6 +29,7 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; +import org.geysermc.floodgate.core.util.ReflectionUtils; @SuppressWarnings("ConstantConditions") public final class WhitelistUtils { diff --git a/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java b/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java index d7c16754..a45e1c95 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java +++ b/velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java @@ -33,13 +33,14 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import java.nio.file.Path; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.module.CommandModule; -import org.geysermc.floodgate.module.PluginMessageModule; -import org.geysermc.floodgate.module.ProxyCommonModule; +import org.geysermc.floodgate.core.FloodgatePlatform; +import org.geysermc.floodgate.core.module.CommandModule; +import org.geysermc.floodgate.core.module.PluginMessageModule; +import org.geysermc.floodgate.core.module.ProxyCommonModule; import org.geysermc.floodgate.module.VelocityAddonModule; import org.geysermc.floodgate.module.VelocityListenerModule; import org.geysermc.floodgate.module.VelocityPlatformModule; -import org.geysermc.floodgate.util.ReflectionUtils; +import org.geysermc.floodgate.core.util.ReflectionUtils; public final class VelocityPlugin { private final FloodgatePlatform platform; diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java index ebe0b833..9af93c67 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java +++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityDataAddon.java @@ -30,12 +30,13 @@ import com.velocitypowered.api.proxy.ProxyServer; import io.netty.channel.Channel; import io.netty.util.AttributeKey; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.addon.data.PacketBlocker; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.inject.InjectorAddon; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; public final class VelocityDataAddon implements InjectorAddon { @Inject private FloodgateHandshakeHandler handshakeHandler; diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java index 0c67c8a2..0e228469 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java +++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java @@ -26,13 +26,13 @@ package org.geysermc.floodgate.addon.data; import static com.google.common.base.Preconditions.checkNotNull; -import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue; -import static org.geysermc.floodgate.util.ReflectionUtils.getClassOrFallbackPrefixed; -import static org.geysermc.floodgate.util.ReflectionUtils.getField; -import static org.geysermc.floodgate.util.ReflectionUtils.getMethodByName; -import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass; -import static org.geysermc.floodgate.util.ReflectionUtils.invoke; -import static org.geysermc.floodgate.util.ReflectionUtils.setValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getCastedValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getClassOrFallbackPrefixed; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getField; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getMethodByName; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getPrefixedClass; +import static org.geysermc.floodgate.core.util.ReflectionUtils.invoke; +import static org.geysermc.floodgate.core.util.ReflectionUtils.setValue; import io.netty.channel.Channel; import io.netty.util.AttributeKey; @@ -41,10 +41,12 @@ import java.net.InetSocketAddress; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler.HandshakeResult; -import org.geysermc.floodgate.player.FloodgateHandshakeHandler.ResultType; +import org.geysermc.floodgate.core.addon.data.CommonDataHandler; +import org.geysermc.floodgate.core.addon.data.PacketBlocker; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.HandshakeResult; +import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.ResultType; public final class VelocityProxyDataHandler extends CommonDataHandler { private static final Field HANDSHAKE; diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java index b68fafaa..f3910735 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java +++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java @@ -26,14 +26,14 @@ package org.geysermc.floodgate.addon.data; import static com.google.common.base.Preconditions.checkNotNull; -import static org.geysermc.floodgate.util.ReflectionUtils.castedInvoke; -import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue; -import static org.geysermc.floodgate.util.ReflectionUtils.getClassOrFallbackPrefixed; -import static org.geysermc.floodgate.util.ReflectionUtils.getField; -import static org.geysermc.floodgate.util.ReflectionUtils.getMethod; -import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass; -import static org.geysermc.floodgate.util.ReflectionUtils.invoke; -import static org.geysermc.floodgate.util.ReflectionUtils.setValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.castedInvoke; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getCastedValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getClassOrFallbackPrefixed; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getField; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getMethod; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getPrefixedClass; +import static org.geysermc.floodgate.core.util.ReflectionUtils.invoke; +import static org.geysermc.floodgate.core.util.ReflectionUtils.setValue; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; @@ -42,9 +42,9 @@ import io.netty.channel.ChannelPromise; import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.player.FloodgatePlayerImpl; +import org.geysermc.floodgate.core.player.FloodgatePlayerImpl; import org.geysermc.floodgate.util.BedrockData; @SuppressWarnings("ConstantConditions") diff --git a/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java b/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java index 4d122cf1..1a38256e 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java +++ b/velocity/src/main/java/org/geysermc/floodgate/inject/velocity/VelocityInjector.java @@ -25,10 +25,10 @@ package org.geysermc.floodgate.inject.velocity; -import static org.geysermc.floodgate.util.ReflectionUtils.castedInvoke; -import static org.geysermc.floodgate.util.ReflectionUtils.getMethod; -import static org.geysermc.floodgate.util.ReflectionUtils.getValue; -import static org.geysermc.floodgate.util.ReflectionUtils.invoke; +import static org.geysermc.floodgate.core.util.ReflectionUtils.castedInvoke; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getMethod; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.invoke; import com.velocitypowered.api.proxy.ProxyServer; import io.netty.channel.Channel; @@ -36,7 +36,7 @@ import java.lang.reflect.Method; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; @RequiredArgsConstructor public final class VelocityInjector extends CommonPlatformInjector { diff --git a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java index cd625957..b59c97a8 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java +++ b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java @@ -25,12 +25,12 @@ package org.geysermc.floodgate.listener; -import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue; -import static org.geysermc.floodgate.util.ReflectionUtils.getField; -import static org.geysermc.floodgate.util.ReflectionUtils.getFieldOfType; -import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass; -import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClassSilently; -import static org.geysermc.floodgate.util.ReflectionUtils.getValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getCastedValue; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getField; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getFieldOfType; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getPrefixedClass; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getPrefixedClassSilently; +import static org.geysermc.floodgate.core.util.ReflectionUtils.getValue; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -53,14 +53,14 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; import net.kyori.adventure.text.Component; -import org.geysermc.floodgate.api.ProxyFloodgateApi; +import org.geysermc.floodgate.core.api.ProxyFloodgateApi; import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.config.ProxyFloodgateConfig; -import org.geysermc.floodgate.skin.SkinDataImpl; +import org.geysermc.floodgate.core.config.ProxyFloodgateConfig; +import org.geysermc.floodgate.core.skin.SkinDataImpl; import org.geysermc.floodgate.util.Constants; -import org.geysermc.floodgate.util.LanguageManager; -import org.geysermc.floodgate.util.MojangUtils; +import org.geysermc.floodgate.core.util.LanguageManager; +import org.geysermc.floodgate.core.util.MojangUtils; public final class VelocityListener { private static final Field INITIAL_MINECRAFT_CONNECTION; diff --git a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListenerRegistration.java b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListenerRegistration.java index 024a0714..73c8e604 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListenerRegistration.java +++ b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListenerRegistration.java @@ -28,7 +28,7 @@ import com.velocitypowered.api.event.EventManager; import lombok.RequiredArgsConstructor; import org.geysermc.floodgate.VelocityPlugin; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; @RequiredArgsConstructor public final class VelocityListenerRegistration implements ListenerRegistration { diff --git a/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java b/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java index 17efe8a6..51095fc6 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java +++ b/velocity/src/main/java/org/geysermc/floodgate/logger/Slf4jFloodgateLogger.java @@ -25,15 +25,15 @@ package org.geysermc.floodgate.logger; -import static org.geysermc.floodgate.util.MessageFormatter.format; +import static org.geysermc.floodgate.core.util.MessageFormatter.format; import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.config.FloodgateConfig; -import org.geysermc.floodgate.util.LanguageManager; +import org.geysermc.floodgate.core.config.FloodgateConfig; +import org.geysermc.floodgate.core.util.LanguageManager; import org.slf4j.Logger; @Singleton diff --git a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityAddonModule.java b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityAddonModule.java index 8c89ab7e..cdb80ed8 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityAddonModule.java +++ b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityAddonModule.java @@ -28,12 +28,12 @@ import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.ProvidesIntoSet; -import org.geysermc.floodgate.addon.AddonManagerAddon; -import org.geysermc.floodgate.addon.DebugAddon; -import org.geysermc.floodgate.addon.PacketHandlerAddon; +import org.geysermc.floodgate.core.addon.AddonManagerAddon; +import org.geysermc.floodgate.core.addon.DebugAddon; +import org.geysermc.floodgate.core.addon.PacketHandlerAddon; import org.geysermc.floodgate.addon.data.VelocityDataAddon; import org.geysermc.floodgate.api.inject.InjectorAddon; -import org.geysermc.floodgate.register.AddonRegister; +import org.geysermc.floodgate.core.register.AddonRegister; public final class VelocityAddonModule extends AbstractModule { @Override diff --git a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityListenerModule.java b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityListenerModule.java index 3b0c8e6a..2dd96ab7 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityListenerModule.java +++ b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityListenerModule.java @@ -30,8 +30,8 @@ import com.google.inject.TypeLiteral; import com.google.inject.multibindings.ProvidesIntoSet; import org.geysermc.floodgate.listener.VelocityListener; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.register.ListenerRegister; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.register.ListenerRegister; public final class VelocityListenerModule extends AbstractModule { @Override diff --git a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java index 91ced577..31cb1037 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java +++ b/velocity/src/main/java/org/geysermc/floodgate/module/VelocityPlatformModule.java @@ -36,22 +36,22 @@ import lombok.RequiredArgsConstructor; import org.geysermc.floodgate.VelocityPlugin; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.inject.CommonPlatformInjector; +import org.geysermc.floodgate.core.inject.CommonPlatformInjector; import org.geysermc.floodgate.inject.velocity.VelocityInjector; import org.geysermc.floodgate.listener.VelocityListenerRegistration; import org.geysermc.floodgate.logger.Slf4jFloodgateLogger; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.platform.listener.ListenerRegistration; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.platform.util.PlatformUtils; -import org.geysermc.floodgate.player.FloodgateCommandPreprocessor; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.audience.FloodgateSenderMapper; -import org.geysermc.floodgate.pluginmessage.PluginMessageManager; -import org.geysermc.floodgate.pluginmessage.PluginMessageRegistration; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.platform.listener.ListenerRegistration; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.player.FloodgateCommandPreprocessor; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.audience.FloodgateSenderMapper; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; import org.geysermc.floodgate.pluginmessage.VelocityPluginMessageRegistration; import org.geysermc.floodgate.pluginmessage.VelocityPluginMessageUtils; -import org.geysermc.floodgate.skin.SkinApplier; +import org.geysermc.floodgate.core.skin.SkinApplier; import org.geysermc.floodgate.util.VelocityCommandUtil; import org.geysermc.floodgate.util.VelocityPlatformUtils; import org.geysermc.floodgate.util.VelocitySkinApplier; diff --git a/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageRegistration.java b/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageRegistration.java index 7023c207..062b842c 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageRegistration.java +++ b/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageRegistration.java @@ -29,6 +29,8 @@ import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import lombok.RequiredArgsConstructor; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; @RequiredArgsConstructor public class VelocityPluginMessageRegistration implements PluginMessageRegistration { diff --git a/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java b/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java index f6a8b75f..41f262b2 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java +++ b/velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java @@ -39,9 +39,11 @@ import lombok.RequiredArgsConstructor; import net.kyori.adventure.text.Component; import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel.Identity; -import org.geysermc.floodgate.pluginmessage.PluginMessageChannel.Result; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager; +import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel.Identity; +import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel.Result; @RequiredArgsConstructor public class VelocityPluginMessageUtils extends PluginMessageUtils { diff --git a/velocity/src/main/java/org/geysermc/floodgate/util/VelocityCommandUtil.java b/velocity/src/main/java/org/geysermc/floodgate/util/VelocityCommandUtil.java index a2c355f3..f54af4b7 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/util/VelocityCommandUtil.java +++ b/velocity/src/main/java/org/geysermc/floodgate/util/VelocityCommandUtil.java @@ -35,10 +35,12 @@ import net.kyori.adventure.text.Component; import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.platform.command.CommandUtil; -import org.geysermc.floodgate.player.UserAudience; -import org.geysermc.floodgate.player.UserAudience.ConsoleAudience; -import org.geysermc.floodgate.player.UserAudience.PlayerAudience; +import org.geysermc.floodgate.core.util.LanguageManager; +import org.geysermc.floodgate.core.util.Utils; +import org.geysermc.floodgate.core.platform.command.CommandUtil; +import org.geysermc.floodgate.core.player.UserAudience; +import org.geysermc.floodgate.core.player.UserAudience.ConsoleAudience; +import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience; public final class VelocityCommandUtil extends CommandUtil { private static UserAudience console; diff --git a/velocity/src/main/java/org/geysermc/floodgate/util/VelocityPlatformUtils.java b/velocity/src/main/java/org/geysermc/floodgate/util/VelocityPlatformUtils.java index 0340cfac..eb677884 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/util/VelocityPlatformUtils.java +++ b/velocity/src/main/java/org/geysermc/floodgate/util/VelocityPlatformUtils.java @@ -28,7 +28,7 @@ import com.google.inject.Inject; import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.ProxyServer; -import org.geysermc.floodgate.platform.util.PlatformUtils; +import org.geysermc.floodgate.core.platform.util.PlatformUtils; public final class VelocityPlatformUtils extends PlatformUtils { @Inject diff --git a/velocity/src/main/java/org/geysermc/floodgate/util/VelocitySkinApplier.java b/velocity/src/main/java/org/geysermc/floodgate/util/VelocitySkinApplier.java index f9818cbc..35ceb7c5 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/util/VelocitySkinApplier.java +++ b/velocity/src/main/java/org/geysermc/floodgate/util/VelocitySkinApplier.java @@ -35,10 +35,10 @@ import org.geysermc.floodgate.api.event.skin.SkinApplyEvent; import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData; import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.event.EventBus; -import org.geysermc.floodgate.event.skin.SkinApplyEventImpl; -import org.geysermc.floodgate.skin.SkinApplier; -import org.geysermc.floodgate.skin.SkinDataImpl; +import org.geysermc.floodgate.core.event.EventBus; +import org.geysermc.floodgate.core.event.skin.SkinApplyEventImpl; +import org.geysermc.floodgate.core.skin.SkinApplier; +import org.geysermc.floodgate.core.skin.SkinDataImpl; @Singleton public class VelocitySkinApplier implements SkinApplier {