From ddc3aa92792632aafa2da662af8cb8e3ea3335b1 Mon Sep 17 00:00:00 2001 From: games647 Date: Thu, 26 Apr 2018 10:08:56 +0200 Subject: [PATCH] Replace deprecated PropertiesResolveEvent with LoginFinishEvent affects only ProtocolSupport --- README.md | 4 +--- .../games647/fastlogin/bukkit/FastLoginBukkit.java | 8 ++++---- .../{commands => command}/CrackedCommand.java | 2 +- .../{commands => command}/PremiumCommand.java | 2 +- .../{commands => command}/ToggleCommand.java | 6 +++--- .../bukkit/{hooks => hook}/AuthMeHook.java | 2 +- .../bukkit/{hooks => hook}/CrazyLoginHook.java | 2 +- .../bukkit/{hooks => hook}/LogItHook.java | 2 +- .../bukkit/{hooks => hook}/LoginSecurityHook.java | 2 +- .../bukkit/{hooks => hook}/UltraAuthHook.java | 2 +- .../bukkit/{hooks => hook}/xAuthHook.java | 2 +- .../fastlogin/bukkit/listener/BungeeListener.java | 6 +++--- .../bukkit/listener/ConnectionListener.java | 2 +- .../protocolsupport/ProtocolSupportListener.java | 13 ++++++++----- .../bukkit/{tasks => task}/DelayedAuthHook.java | 14 +++++++------- .../bukkit/{tasks => task}/ForceLoginTask.java | 4 ++-- .../games647/fastlogin/bungee/FastLoginBungee.java | 4 ++-- .../bungee/{hooks => hook}/BungeeAuthHook.java | 2 +- .../fastlogin/bungee/listener/ConnectListener.java | 4 ++-- .../fastlogin/bungee/listener/MessageListener.java | 4 ++-- .../bungee/{tasks => task}/AsyncPremiumCheck.java | 2 +- .../bungee/{tasks => task}/AsyncToggleMessage.java | 2 +- .../bungee/{tasks => task}/ForceLoginTask.java | 8 ++++---- .../ChangePremiumMessage.java | 2 +- .../core/{messages => message}/ChannelMessage.java | 2 +- .../{messages => message}/LoginActionMessage.java | 2 +- .../core/{messages => message}/SuccessMessage.java | 2 +- 27 files changed, 54 insertions(+), 53 deletions(-) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{commands => command}/CrackedCommand.java (98%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{commands => command}/PremiumCommand.java (98%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{commands => command}/ToggleCommand.java (92%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{hooks => hook}/AuthMeHook.java (97%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{hooks => hook}/CrazyLoginHook.java (98%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{hooks => hook}/LogItHook.java (96%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{hooks => hook}/LoginSecurityHook.java (97%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{hooks => hook}/UltraAuthHook.java (97%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{hooks => hook}/xAuthHook.java (98%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{tasks => task}/DelayedAuthHook.java (88%) rename bukkit/src/main/java/com/github/games647/fastlogin/bukkit/{tasks => task}/ForceLoginTask.java (95%) rename bungee/src/main/java/com/github/games647/fastlogin/bungee/{hooks => hook}/BungeeAuthHook.java (95%) rename bungee/src/main/java/com/github/games647/fastlogin/bungee/{tasks => task}/AsyncPremiumCheck.java (97%) rename bungee/src/main/java/com/github/games647/fastlogin/bungee/{tasks => task}/AsyncToggleMessage.java (97%) rename bungee/src/main/java/com/github/games647/fastlogin/bungee/{tasks => task}/ForceLoginTask.java (89%) rename core/src/main/java/com/github/games647/fastlogin/core/{messages => message}/ChangePremiumMessage.java (96%) rename core/src/main/java/com/github/games647/fastlogin/core/{messages => message}/ChannelMessage.java (82%) rename core/src/main/java/com/github/games647/fastlogin/core/{messages => message}/LoginActionMessage.java (97%) rename core/src/main/java/com/github/games647/fastlogin/core/{messages => message}/SuccessMessage.java (90%) diff --git a/README.md b/README.md index fa3a70a7..a4e6bad9 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,6 @@ So they don't need to enter passwords. This is also called auto login (auto-logi * Good performance by using async non blocking operations * Locale messages * Import the database from similar plugins -* Free -* Open source ## Development builds @@ -29,7 +27,7 @@ Development builds of this project can be acquired at the provided CI (continuou latest changes from the Source-Code in preparation for the following release. This means they could contain new features, bug fixes and other changes since the last release. -Nevertheless builds are only tested using a small set of automated and minor manual tests. Therefore they **could** +Nevertheless builds are only tested using a small set of automated and a few manual tests. Therefore they **could** contain new bugs and are likely to be less stable than released versions. https://ci.codemc.org/job/Games647/job/FastLogin/changes diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java index e0fe7a83..4a1cccfc 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java @@ -1,16 +1,16 @@ package com.github.games647.fastlogin.bukkit; -import com.github.games647.fastlogin.bukkit.commands.CrackedCommand; -import com.github.games647.fastlogin.bukkit.commands.PremiumCommand; +import com.github.games647.fastlogin.bukkit.command.CrackedCommand; +import com.github.games647.fastlogin.bukkit.command.PremiumCommand; import com.github.games647.fastlogin.bukkit.listener.BungeeListener; import com.github.games647.fastlogin.bukkit.listener.ConnectionListener; import com.github.games647.fastlogin.bukkit.listener.protocollib.ProtocolLibListener; import com.github.games647.fastlogin.bukkit.listener.protocollib.SkinApplyListener; import com.github.games647.fastlogin.bukkit.listener.protocolsupport.ProtocolSupportListener; -import com.github.games647.fastlogin.bukkit.tasks.DelayedAuthHook; +import com.github.games647.fastlogin.bukkit.task.DelayedAuthHook; import com.github.games647.fastlogin.core.CommonUtil; import com.github.games647.fastlogin.core.PremiumStatus; -import com.github.games647.fastlogin.core.messages.ChannelMessage; +import com.github.games647.fastlogin.core.message.ChannelMessage; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.PlatformPlugin; import com.google.common.io.ByteArrayDataOutput; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java similarity index 98% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java index 6269bfe9..3ec7dd2d 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.commands; +package com.github.games647.fastlogin.bukkit.command; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.StoredProfile; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/PremiumCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java similarity index 98% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/PremiumCommand.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java index b9d52359..5483856d 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/PremiumCommand.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.commands; +package com.github.games647.fastlogin.bukkit.command; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.StoredProfile; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/ToggleCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/ToggleCommand.java similarity index 92% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/ToggleCommand.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/ToggleCommand.java index 11344457..eca50c56 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/ToggleCommand.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/ToggleCommand.java @@ -1,8 +1,8 @@ -package com.github.games647.fastlogin.bukkit.commands; +package com.github.games647.fastlogin.bukkit.command; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.core.messages.ChangePremiumMessage; -import com.github.games647.fastlogin.core.messages.ChannelMessage; +import com.github.games647.fastlogin.core.message.ChangePremiumMessage; +import com.github.games647.fastlogin.core.message.ChannelMessage; import java.util.Optional; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/AuthMeHook.java similarity index 97% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/AuthMeHook.java index 1daeef00..23cbe5ff 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/AuthMeHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.hooks; +package com.github.games647.fastlogin.bukkit.hook; import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/CrazyLoginHook.java similarity index 98% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/CrazyLoginHook.java index 5925d6bd..60e77a25 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/CrazyLoginHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.hooks; +package com.github.games647.fastlogin.bukkit.hook; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.hooks.AuthPlugin; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LogItHook.java similarity index 96% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LogItHook.java index b8fc6230..26321909 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LogItHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.hooks; +package com.github.games647.fastlogin.bukkit.hook; import com.github.games647.fastlogin.core.hooks.AuthPlugin; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java similarity index 97% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java index fb51158e..85832b9d 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.hooks; +package com.github.games647.fastlogin.bukkit.hook; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.hooks.AuthPlugin; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java similarity index 97% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java index 3fbad417..6caa8377 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.hooks; +package com.github.games647.fastlogin.bukkit.hook; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.hooks.AuthPlugin; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/xAuthHook.java similarity index 98% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/xAuthHook.java index 74db193f..2c5a2f5b 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/xAuthHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bukkit.hooks; +package com.github.games647.fastlogin.bukkit.hook; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.hooks.AuthPlugin; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java index 229c3ae3..70e55c5d 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java @@ -2,11 +2,11 @@ package com.github.games647.fastlogin.bukkit.listener; import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.bukkit.tasks.ForceLoginTask; +import com.github.games647.fastlogin.bukkit.task.ForceLoginTask; import com.github.games647.fastlogin.core.PremiumStatus; import com.github.games647.fastlogin.core.hooks.AuthPlugin; -import com.github.games647.fastlogin.core.messages.LoginActionMessage; -import com.github.games647.fastlogin.core.messages.LoginActionMessage.Type; +import com.github.games647.fastlogin.core.message.LoginActionMessage; +import com.github.games647.fastlogin.core.message.LoginActionMessage.Type; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java index fec78d49..d8eaafa8 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java @@ -1,7 +1,7 @@ package com.github.games647.fastlogin.bukkit.listener; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.bukkit.tasks.ForceLoginTask; +import com.github.games647.fastlogin.bukkit.task.ForceLoginTask; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java index 0e323102..fd46e14e 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit.listener.protocolsupport; -import com.github.games647.craftapi.model.skin.Property; import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.StoredProfile; @@ -13,8 +12,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import protocolsupport.api.events.ConnectionCloseEvent; +import protocolsupport.api.events.PlayerLoginFinishEvent; import protocolsupport.api.events.PlayerLoginStartEvent; -import protocolsupport.api.events.PlayerPropertiesResolveEvent; public class ProtocolSupportListener extends JoinManagement implements Listener { @@ -49,12 +48,16 @@ public class ProtocolSupportListener extends JoinManagement premium player - if (propertiesResolveEvent.hasProperty(Property.TEXTURE_KEY) && session != null) { + if (session != null) { session.setVerified(true); } } diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/DelayedAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java similarity index 88% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/DelayedAuthHook.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java index 1237e53c..440f019c 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/DelayedAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java @@ -1,12 +1,12 @@ -package com.github.games647.fastlogin.bukkit.tasks; +package com.github.games647.fastlogin.bukkit.task; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.bukkit.hooks.AuthMeHook; -import com.github.games647.fastlogin.bukkit.hooks.CrazyLoginHook; -import com.github.games647.fastlogin.bukkit.hooks.LogItHook; -import com.github.games647.fastlogin.bukkit.hooks.LoginSecurityHook; -import com.github.games647.fastlogin.bukkit.hooks.UltraAuthHook; -import com.github.games647.fastlogin.bukkit.hooks.xAuthHook; +import com.github.games647.fastlogin.bukkit.hook.AuthMeHook; +import com.github.games647.fastlogin.bukkit.hook.CrazyLoginHook; +import com.github.games647.fastlogin.bukkit.hook.LogItHook; +import com.github.games647.fastlogin.bukkit.hook.LoginSecurityHook; +import com.github.games647.fastlogin.bukkit.hook.UltraAuthHook; +import com.github.games647.fastlogin.bukkit.hook.xAuthHook; import com.github.games647.fastlogin.core.hooks.AuthPlugin; import java.lang.reflect.Constructor; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java similarity index 95% rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java index 791f5632..f7d4e639 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java @@ -1,9 +1,9 @@ -package com.github.games647.fastlogin.bukkit.tasks; +package com.github.games647.fastlogin.bukkit.task; import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.core.PremiumStatus; -import com.github.games647.fastlogin.core.messages.SuccessMessage; +import com.github.games647.fastlogin.core.message.SuccessMessage; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.ForceLoginManagement; import com.github.games647.fastlogin.core.shared.LoginSession; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java index 4373adc4..a7caa528 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java @@ -1,10 +1,10 @@ package com.github.games647.fastlogin.bungee; -import com.github.games647.fastlogin.bungee.hooks.BungeeAuthHook; +import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook; import com.github.games647.fastlogin.bungee.listener.ConnectListener; import com.github.games647.fastlogin.bungee.listener.MessageListener; import com.github.games647.fastlogin.core.CommonUtil; -import com.github.games647.fastlogin.core.messages.ChannelMessage; +import com.github.games647.fastlogin.core.message.ChannelMessage; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.PlatformPlugin; import com.google.common.collect.MapMaker; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthHook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeAuthHook.java similarity index 95% rename from bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthHook.java rename to bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeAuthHook.java index 15bfb058..71ba932e 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthHook.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeAuthHook.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bungee.hooks; +package com.github.games647.fastlogin.bungee.hook; import com.github.games647.fastlogin.core.hooks.AuthPlugin; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java index a7759a17..8b160a3c 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java @@ -2,8 +2,8 @@ package com.github.games647.fastlogin.bungee.listener; import com.github.games647.craftapi.UUIDAdapter; import com.github.games647.fastlogin.bungee.FastLoginBungee; -import com.github.games647.fastlogin.bungee.tasks.AsyncPremiumCheck; -import com.github.games647.fastlogin.bungee.tasks.ForceLoginTask; +import com.github.games647.fastlogin.bungee.task.AsyncPremiumCheck; +import com.github.games647.fastlogin.bungee.task.ForceLoginTask; import com.github.games647.fastlogin.core.StoredProfile; import com.github.games647.fastlogin.core.shared.LoginSession; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java index a3fc07fb..fdec57d1 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java @@ -2,9 +2,9 @@ package com.github.games647.fastlogin.bungee.listener; import com.github.games647.fastlogin.bungee.BungeeLoginSession; import com.github.games647.fastlogin.bungee.FastLoginBungee; -import com.github.games647.fastlogin.bungee.tasks.AsyncToggleMessage; +import com.github.games647.fastlogin.bungee.task.AsyncToggleMessage; import com.github.games647.fastlogin.core.StoredProfile; -import com.github.games647.fastlogin.core.messages.ChangePremiumMessage; +import com.github.games647.fastlogin.core.message.ChangePremiumMessage; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncPremiumCheck.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java similarity index 97% rename from bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncPremiumCheck.java rename to bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java index debe0b23..16c09da2 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncPremiumCheck.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bungee.tasks; +package com.github.games647.fastlogin.bungee.task; import com.github.games647.fastlogin.bungee.BungeeLoginSession; import com.github.games647.fastlogin.bungee.BungeeLoginSource; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncToggleMessage.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java similarity index 97% rename from bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncToggleMessage.java rename to bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java index d43bc82f..14c0f9fc 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncToggleMessage.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.bungee.tasks; +package com.github.games647.fastlogin.bungee.task; import com.github.games647.fastlogin.bungee.FastLoginBungee; import com.github.games647.fastlogin.core.StoredProfile; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/ForceLoginTask.java similarity index 89% rename from bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java rename to bungee/src/main/java/com/github/games647/fastlogin/bungee/task/ForceLoginTask.java index aa02a0a3..8e314431 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/ForceLoginTask.java @@ -1,10 +1,10 @@ -package com.github.games647.fastlogin.bungee.tasks; +package com.github.games647.fastlogin.bungee.task; import com.github.games647.fastlogin.bungee.BungeeLoginSession; import com.github.games647.fastlogin.bungee.FastLoginBungee; -import com.github.games647.fastlogin.core.messages.ChannelMessage; -import com.github.games647.fastlogin.core.messages.LoginActionMessage; -import com.github.games647.fastlogin.core.messages.LoginActionMessage.Type; +import com.github.games647.fastlogin.core.message.ChannelMessage; +import com.github.games647.fastlogin.core.message.LoginActionMessage; +import com.github.games647.fastlogin.core.message.LoginActionMessage.Type; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.ForceLoginManagement; import com.github.games647.fastlogin.core.shared.LoginSession; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java similarity index 96% rename from core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java rename to core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java index 9e81065e..9851163a 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.core.messages; +package com.github.games647.fastlogin.core.message; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/messages/ChannelMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/ChannelMessage.java similarity index 82% rename from core/src/main/java/com/github/games647/fastlogin/core/messages/ChannelMessage.java rename to core/src/main/java/com/github/games647/fastlogin/core/message/ChannelMessage.java index 2be36168..ced5b9be 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/messages/ChannelMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/ChannelMessage.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.core.messages; +package com.github.games647.fastlogin.core.message; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/messages/LoginActionMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java similarity index 97% rename from core/src/main/java/com/github/games647/fastlogin/core/messages/LoginActionMessage.java rename to core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java index 61b1fd20..8f679d94 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/messages/LoginActionMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.core.messages; +package com.github.games647.fastlogin.core.message; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/messages/SuccessMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java similarity index 90% rename from core/src/main/java/com/github/games647/fastlogin/core/messages/SuccessMessage.java rename to core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java index 558f6991..250130a8 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/messages/SuccessMessage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java @@ -1,4 +1,4 @@ -package com.github.games647.fastlogin.core.messages; +package com.github.games647.fastlogin.core.message; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput;