diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b5e1794..e5d49f8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +######1.10 + +* Remove deprecated API methods from the last version + ######1.9 * Added second attempt login -> cracked login diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 30a9d881..608b4bb0 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ com.github.games647 fastlogin - 1.9 + 1.10 ../pom.xml 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 6ab102b4..ab777863 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 @@ -6,7 +6,6 @@ import com.comphenix.protocol.ProtocolLibrary; import com.github.games647.fastlogin.bukkit.commands.CrackedCommand; import com.github.games647.fastlogin.bukkit.commands.ImportCommand; import com.github.games647.fastlogin.bukkit.commands.PremiumCommand; -import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin; import com.github.games647.fastlogin.bukkit.listener.BukkitJoinListener; import com.github.games647.fastlogin.bukkit.listener.BungeeCordListener; import com.github.games647.fastlogin.bukkit.listener.protocollib.EncryptionPacketListener; @@ -138,11 +137,6 @@ public class FastLoginBukkit extends JavaPlugin { } } - @Deprecated - public void setPasswordGenerator(PasswordGenerator passwordGenerator) { - core.setPasswordGenerator(passwordGenerator); - } - /** * Gets a thread-safe map about players which are connecting to the server are being checked to be premium (paid * account) @@ -162,22 +156,6 @@ public class FastLoginBukkit extends JavaPlugin { return keyPair; } - /** - * Gets the auth plugin hook in order to interact with the plugins. This can be null if no supporting auth plugin - * was found. - * - * @return interface to any supported auth plugin - */ - @Deprecated - public BukkitAuthPlugin getAuthPlugin() { - return (BukkitAuthPlugin) core.getAuthPluginHook(); - } - - @Deprecated - public void setAuthPluginHook(BukkitAuthPlugin authPlugin) { - core.setAuthPluginHook(authPlugin); - } - public boolean isBungeeCord() { return bungeeCord; } diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PasswordGenerator.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PasswordGenerator.java deleted file mode 100644 index 48653bc4..00000000 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PasswordGenerator.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.games647.fastlogin.bukkit; - -import org.bukkit.entity.Player; - -/** - * - * @deprecated please use com.github.games647.fastlogin.core.hooks.PasswordGenerator - */ -@Deprecated -public interface PasswordGenerator extends com.github.games647.fastlogin.core.hooks.PasswordGenerator { - - @Override - String getRandomPassword(Player player); -} diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/BukkitAuthPlugin.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/BukkitAuthPlugin.java deleted file mode 100644 index b5ddf2c9..00000000 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/BukkitAuthPlugin.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.games647.fastlogin.bukkit.hooks; - -import com.github.games647.fastlogin.core.hooks.AuthPlugin; - -import org.bukkit.entity.Player; - -/** - * @deprecated please use com.github.games647.fastlogin.core.hooks.AuthPlugin - */ -@Deprecated -public interface BukkitAuthPlugin extends AuthPlugin { - - @Override - boolean forceLogin(Player player); - - @Override - boolean isRegistered(String playerName) throws Exception; - - @Override - boolean forceRegister(Player player, String password); -} 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/tasks/ForceLoginTask.java index 7abfcf97..e54d78b0 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java @@ -9,7 +9,6 @@ import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import java.util.logging.Level; import org.bukkit.Bukkit; @@ -120,11 +119,9 @@ public class ForceLoginTask implements Runnable { } private boolean isOnlineThreadSafe() { - //the playerlist isn't thread-safe - Future onlineFuture = Bukkit.getScheduler().callSyncMethod(plugin, player::isOnline); - try { - return onlineFuture.get(); + //the playerlist isn't thread-safe + return Bukkit.getScheduler().callSyncMethod(plugin, player::isOnline).get(); } catch (InterruptedException | ExecutionException ex) { plugin.getLogger().log(Level.SEVERE, "Failed to perform thread-safe online check", ex); return false; diff --git a/bungee/pom.xml b/bungee/pom.xml index 5b988c9d..198612d6 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ com.github.games647 fastlogin - 1.9 + 1.10 ../pom.xml 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 0fc42fef..5f796d3d 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,7 +1,6 @@ package com.github.games647.fastlogin.bungee; import com.github.games647.fastlogin.bungee.hooks.BungeeAuthHook; -import com.github.games647.fastlogin.bungee.hooks.BungeeAuthPlugin; import com.github.games647.fastlogin.bungee.listener.PlayerConnectionListener; import com.github.games647.fastlogin.bungee.listener.PluginMessageListener; import com.google.common.collect.Maps; @@ -97,11 +96,6 @@ public class FastLoginBungee extends Plugin { return core; } - @Deprecated - public void setAuthPluginHook(BungeeAuthPlugin authPlugin) { - core.setAuthPluginHook(authPlugin); - } - public Configuration getConfig() { return config; } @@ -110,16 +104,6 @@ public class FastLoginBungee extends Plugin { return session; } - /** - * Get the auth plugin hook for BungeeCord - * - * @return the auth hook for BungeeCord. null if none found - */ - @Deprecated - public BungeeAuthPlugin getBungeeAuthPlugin() { - return (BungeeAuthPlugin) core.getAuthPluginHook(); - } - private void registerHook() { Plugin plugin = getProxy().getPluginManager().getPlugin("BungeeAuth"); if (plugin != null) { diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthPlugin.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthPlugin.java deleted file mode 100644 index ead48fbf..00000000 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hooks/BungeeAuthPlugin.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.games647.fastlogin.bungee.hooks; - -import com.github.games647.fastlogin.core.hooks.AuthPlugin; -import net.md_5.bungee.api.connection.ProxiedPlayer; - -/** - * @deprecated please use com.github.games647.fastlogin.core.hooks.AuthPlugin - */ -@Deprecated -public interface BungeeAuthPlugin extends AuthPlugin { - - @Override - boolean forceLogin(ProxiedPlayer player); - - @Override - boolean isRegistered(String playerName) throws Exception; - - @Override - boolean forceRegister(ProxiedPlayer player, String password); -} diff --git a/core/pom.xml b/core/pom.xml index 9f26bd6e..a5e6c2cb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.github.games647 fastlogin - 1.9 + 1.10 ../pom.xml diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java index 62cd0bb2..4a1820e3 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java @@ -28,7 +28,7 @@ public abstract class JoinManagement { String ip = source.getAddress().getAddress().getHostAddress(); try { if (profile.getUserId() == -1) { - if (core.getPendingLogins().containsKey(ip + username) && config.get("secondAttemptCracked", false)) { + if (core.getPendingLogins().remove(ip + username) != null && config.get("secondAttemptCracked", false)) { core.getLogger().log(Level.INFO, "Second attempt login -> cracked {0}", username); //first login request failed so make a cracked session diff --git a/pom.xml b/pom.xml index 79571a5a..0bc7927b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom FastLogin - 1.9 + 1.10 2015 https://www.spigotmc.org/resources/fastlogin.14153/ diff --git a/universal/pom.xml b/universal/pom.xml index 35466afa..8327dfad 100644 --- a/universal/pom.xml +++ b/universal/pom.xml @@ -5,7 +5,7 @@ com.github.games647 fastlogin - 1.9 + 1.10 ../pom.xml