From 4292e9aaa037804e4e6c5c90ec3b0b55a9d3bd92 Mon Sep 17 00:00:00 2001 From: games647 Date: Thu, 15 Sep 2016 11:10:52 +0200 Subject: [PATCH] Less deprecated warnings + Clean up --- .../fastlogin/bukkit/FastLoginBukkit.java | 6 +++-- .../fastlogin/bukkit/hooks/FakePlayer.java | 23 ++++++++++++++++++ .../bukkit/listener/BungeeCordListener.java | 6 ++--- .../listener/protocollib/NameCheckTask.java | 4 ++-- .../ProtocolSupportListener.java | 4 ++-- .../bukkit/tasks/DelayedAuthHook.java | 4 ++-- .../bukkit/tasks/ForceLoginTask.java | 8 +++---- bukkit/src/main/resources/plugin.yml | 10 +------- .../games647/fastlogin/bungee/BungeeCore.java | 19 ++++++++------- .../fastlogin/bungee/BungeeLoginSource.java | 3 ++- .../fastlogin/bungee/FastLoginBungee.java | 8 ++++--- .../fastlogin/bungee/ImportCommand.java | 24 +++++++++++++------ .../listener/PluginMessageListener.java | 1 + .../bungee/tasks/AsyncPremiumCheck.java | 2 +- .../bungee/tasks/ForceLoginTask.java | 13 +++++----- .../fastlogin/core/shared/FastLoginCore.java | 17 +++++++------ 16 files changed, 94 insertions(+), 58 deletions(-) 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 b975c4d2..a81c285c 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 @@ -159,8 +159,9 @@ public class FastLoginBukkit extends JavaPlugin { * * @return interface to any supported auth plugin */ + @Deprecated public BukkitAuthPlugin getAuthPlugin() { - AuthPlugin authPlugin = core.getAuthPlugin(); + AuthPlugin authPlugin = core.getAuthPluginHook(); if (authPlugin == null) { try { Thread.sleep(1000); @@ -172,8 +173,9 @@ public class FastLoginBukkit extends JavaPlugin { return (BukkitAuthPlugin) authPlugin; } + @Deprecated public void setAuthPluginHook(BukkitAuthPlugin authPlugin) { - core.setAuthPlugin(authPlugin); + core.setAuthPluginHook(authPlugin); } public boolean isBungeeCord() { diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/FakePlayer.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/FakePlayer.java index 5d818014..c409372b 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/FakePlayer.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/FakePlayer.java @@ -161,6 +161,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void playNote(Location loc, byte instrument, byte note) { throw new UnsupportedOperationException("Not supported yet."); } @@ -181,6 +182,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void playEffect(Location loc, Effect effect, int data) { throw new UnsupportedOperationException("Not supported yet."); } @@ -191,16 +193,19 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void sendBlockChange(Location loc, Material material, byte data) { throw new UnsupportedOperationException("Not supported yet."); } @Override + @Deprecated public boolean sendChunkChange(Location loc, int sx, int sy, int sz, byte[] data) { throw new UnsupportedOperationException("Not supported yet."); } @Override + @Deprecated public void sendBlockChange(Location loc, int material, byte data) { throw new UnsupportedOperationException("Not supported yet."); } @@ -476,6 +481,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public boolean isOnGround() { throw new UnsupportedOperationException("Not supported yet."); } @@ -511,6 +517,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void setTexturePack(String url) { throw new UnsupportedOperationException("Not supported yet."); } @@ -561,11 +568,13 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void sendTitle(String title, String subtitle) { throw new UnsupportedOperationException("Not supported yet."); } @Override + @Deprecated public void resetTitle() { throw new UnsupportedOperationException("Not supported yet."); } @@ -686,11 +695,13 @@ public class FakePlayer implements Player { } @Override + @Deprecated public ItemStack getItemInHand() { throw new UnsupportedOperationException("Not supported yet."); } @Override + @Deprecated public void setItemInHand(ItemStack item) { throw new UnsupportedOperationException("Not supported yet."); } @@ -751,6 +762,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public List getLineOfSight(HashSet transparent, int maxDistance) { throw new UnsupportedOperationException("Not supported yet."); } @@ -761,6 +773,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public Block getTargetBlock(HashSet transparent, int maxDistance) { throw new UnsupportedOperationException("Not supported yet."); } @@ -771,6 +784,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public List getLastTwoTargetBlocks(HashSet transparent, int maxDistance) { throw new UnsupportedOperationException("Not supported yet."); } @@ -816,6 +830,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public int _INVALID_getLastDamage() { throw new UnsupportedOperationException("Not supported yet."); } @@ -826,6 +841,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void _INVALID_setLastDamage(int damage) { throw new UnsupportedOperationException("Not supported yet."); } @@ -1226,6 +1242,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void _INVALID_damage(int amount) { throw new UnsupportedOperationException("Not supported yet."); } @@ -1236,6 +1253,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void _INVALID_damage(int amount, Entity source) { throw new UnsupportedOperationException("Not supported yet."); } @@ -1246,6 +1264,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public int _INVALID_getHealth() { throw new UnsupportedOperationException("Not supported yet."); } @@ -1256,6 +1275,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void _INVALID_setHealth(int health) { throw new UnsupportedOperationException("Not supported yet."); } @@ -1266,6 +1286,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public int _INVALID_getMaxHealth() { throw new UnsupportedOperationException("Not supported yet."); } @@ -1276,6 +1297,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void _INVALID_setMaxHealth(int health) { throw new UnsupportedOperationException("Not supported yet."); } @@ -1331,6 +1353,7 @@ public class FakePlayer implements Player { } @Override + @Deprecated public void setBanned(boolean banned) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java index 4e900fc1..338f54cb 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java @@ -1,9 +1,9 @@ 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.BukkitLoginSession; -import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin; +import com.github.games647.fastlogin.core.hooks.AuthPlugin; import com.google.common.base.Charsets; import com.google.common.collect.Sets; import com.google.common.io.ByteArrayDataInput; @@ -80,7 +80,7 @@ public class BungeeCordListener implements PluginMessageListener { Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() { @Override public void run() { - BukkitAuthPlugin authPlugin = plugin.getAuthPlugin(); + AuthPlugin authPlugin = plugin.getCore().getAuthPluginHook(); try { //we need to check if the player is registered on Bukkit too if (authPlugin == null || !authPlugin.isRegistered(playerName)) { diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java index 299bbe41..0ddc90b7 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java @@ -4,8 +4,8 @@ import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketEvent; import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.core.shared.JoinManagement; import com.github.games647.fastlogin.core.PlayerProfile; +import com.github.games647.fastlogin.core.shared.JoinManagement; import java.util.Random; import java.util.logging.Level; @@ -23,7 +23,7 @@ public class NameCheckTask extends JoinManagement authPlugin = plugin.getCore().getAuthPluginHook(); if (authPlugin == null) { //maybe only bungeecord plugin sendSuccessNotification(); @@ -85,7 +85,7 @@ public class ForceLoginTask implements Runnable { } } - private boolean forceRegister(BukkitAuthPlugin authPlugin, Player player) { + private boolean forceRegister(AuthPlugin authPlugin, Player player) { plugin.getLogger().log(Level.FINE, "Register player {0}", player.getName()); String generatedPassword = plugin.getCore().getPasswordGenerator().getRandomPassword(player); @@ -99,7 +99,7 @@ public class ForceLoginTask implements Runnable { return success; } - private boolean forceLogin(BukkitAuthPlugin authPlugin, Player player) { + private boolean forceLogin(AuthPlugin authPlugin, Player player) { plugin.getLogger().log(Level.FINE, "Logging player {0} in", player.getName()); boolean success = authPlugin.forceLogin(player); diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 6e0932c0..29c59626 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -15,17 +15,9 @@ dev-url: ${project.url} load: STARTUP softdepend: - # We require either ProtocolLib or ProtocolSupport + # We depend either ProtocolLib or ProtocolSupport - ProtocolSupport - ProtocolLib - # Auth plugins - we delay the hook -# - xAuth -# - AuthMe -# - LogIt -# - CrazyLogin -# - LoginSecurity -# - RoyalAuth -# - UltraAuth commands: ${project.parent.name}: diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java index ed8aefc8..bc0d5148 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java @@ -23,6 +23,16 @@ import net.md_5.bungee.config.YamlConfiguration; public class BungeeCore extends FastLoginCore { + private static Map generateConfigMap(Configuration config) { + Map configMap = Maps.newHashMap(); + Collection keys = config.getKeys(); + for (String key : keys) { + configMap.put(key, config.get(key)); + } + + return configMap; + } + private final FastLoginBungee plugin; public BungeeCore(FastLoginBungee plugin) { @@ -93,13 +103,4 @@ public class BungeeCore extends FastLoginCore { } } - private static Map generateConfigMap(Configuration config) { - Map configMap = Maps.newHashMap(); - Collection keys = config.getKeys(); - for (String key : keys) { - configMap.put(key, config.get(key)); - } - - return configMap; - } } diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java index 5111db45..b0f9bacd 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java @@ -4,6 +4,7 @@ import com.github.games647.fastlogin.core.shared.LoginSource; import java.net.InetSocketAddress; +import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.PendingConnection; public class BungeeLoginSource implements LoginSource { @@ -21,7 +22,7 @@ public class BungeeLoginSource implements LoginSource { @Override public void kick(String message) { - connection.disconnect(message); + connection.disconnect(TextComponent.fromLegacyText(message)); } @Override 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 9f7d6aab..b25d28f4 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 @@ -74,8 +74,9 @@ public class FastLoginBungee extends Plugin { return core; } + @Deprecated public void setAuthPluginHook(BungeeAuthPlugin authPlugin) { - core.setAuthPlugin(authPlugin); + core.setAuthPluginHook(authPlugin); } public Configuration getConfig() { @@ -91,14 +92,15 @@ public class FastLoginBungee extends Plugin { * * @return the auth hook for BungeeCord. null if none found */ + @Deprecated public BungeeAuthPlugin getBungeeAuthPlugin() { - return (BungeeAuthPlugin) core.getAuthPlugin(); + return (BungeeAuthPlugin) core.getAuthPluginHook(); } private void registerHook() { Plugin plugin = getProxy().getPluginManager().getPlugin("BungeeAuth"); if (plugin != null) { - core.setAuthPlugin(new BungeeAuthHook()); + core.setAuthPluginHook(new BungeeAuthHook()); getLogger().info("Hooked into BungeeAuth"); } } diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/ImportCommand.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/ImportCommand.java index b377fce5..3f1023aa 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/ImportCommand.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/ImportCommand.java @@ -6,6 +6,8 @@ import com.github.games647.fastlogin.core.importer.ImportPlugin; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.plugin.Command; public class ImportCommand extends Command { @@ -21,7 +23,8 @@ public class ImportCommand extends Command { @Override public void execute(CommandSender sender, String[] args) { if (args.length < 2) { - sender.sendMessage(ChatColor.DARK_RED + "You need to specify the import plugin and database type"); + String message = ChatColor.DARK_RED + "You need to specify the import plugin and database type"; + sender.sendMessage(convertFromLegacy(message)); return; } @@ -37,7 +40,8 @@ public class ImportCommand extends Command { importPlugin = ImportPlugin.ELDZI; break; default: - sender.sendMessage(ChatColor.DARK_RED + "Unknown auto login plugin"); + String message = ChatColor.DARK_RED + "Unknown auto login plugin"; + sender.sendMessage(convertFromLegacy(message)); return; } @@ -50,7 +54,8 @@ public class ImportCommand extends Command { sqlite = false; break; default: - sender.sendMessage(ChatColor.DARK_RED + "Unknown storage type to import from. Either SQLite or MySQL"); + String message = ChatColor.DARK_RED + "Unknown storage type to import from. Either SQLite or MySQL"; + sender.sendMessage(convertFromLegacy(message)); return; } @@ -60,8 +65,9 @@ public class ImportCommand extends Command { String password = ""; if (!sqlite) { if (args.length <= 5) { - sender.sendMessage(ChatColor.DARK_RED + "If importing from MySQL, you need to specify host database " - + "and username passowrd too"); + String message = ChatColor.DARK_RED + "If importing from MySQL, you need to specify host database " + + "and username passowrd too"; + sender.sendMessage(convertFromLegacy(message)); return; } @@ -75,9 +81,13 @@ public class ImportCommand extends Command { AuthStorage storage = core.getStorage(); boolean success = core.importDatabase(importPlugin, true, storage, host, database, username, password); if (success) { - sender.sendMessage(ChatColor.DARK_GREEN + "Successful imported the data"); + sender.sendMessage(convertFromLegacy(ChatColor.DARK_GREEN + "Successful imported the data")); } else { - sender.sendMessage(ChatColor.DARK_RED + "Failed to import the data. Check out the logs"); + sender.sendMessage(convertFromLegacy(ChatColor.DARK_RED + "Failed to import the data. Check out the logs")); } } + + private BaseComponent[] convertFromLegacy(String message) { + return TextComponent.fromLegacyText(message); + } } diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java index 76292b93..b35de067 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java @@ -6,6 +6,7 @@ import com.github.games647.fastlogin.bungee.tasks.AsyncToggleMessage; import com.github.games647.fastlogin.core.PlayerProfile; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; + import java.util.Arrays; import net.md_5.bungee.api.ProxyServer; 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/tasks/AsyncPremiumCheck.java index d709f346..941181b7 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncPremiumCheck.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/AsyncPremiumCheck.java @@ -16,7 +16,7 @@ public class AsyncPremiumCheck extends JoinManagement authPlugin = plugin.getCore().getAuthPluginHook(); if (authPlugin == null) { //save will happen on success message from bukkit sendBukkitLoginNotification(autoRegister); @@ -73,7 +74,7 @@ public class ForceLoginTask implements Runnable { } } - private void forceRegister(BungeeLoginSession session, BungeeAuthPlugin authPlugin) { + private void forceRegister(BungeeLoginSession session, AuthPlugin authPlugin) { if (session.isAlreadyLogged()) { sendBukkitLoginNotification(true); return; @@ -88,12 +89,12 @@ public class ForceLoginTask implements Runnable { String message = plugin.getCore().getMessage("auto-register"); if (message != null) { message = message.replace("%password", password); - player.sendMessage(message); + player.sendMessage(TextComponent.fromLegacyText(message)); } } } - private void forceLogin(BungeeLoginSession session, BungeeAuthPlugin authPlugin) { + private void forceLogin(BungeeLoginSession session, AuthPlugin authPlugin) { if (session.isAlreadyLogged()) { sendBukkitLoginNotification(false); return; @@ -105,7 +106,7 @@ public class ForceLoginTask implements Runnable { sendBukkitLoginNotification(false); String message = plugin.getCore().getMessage("auto-login"); if (message != null) { - player.sendMessage(message); + player.sendMessage(TextComponent.fromLegacyText(message)); } } } diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java index fdbe7e52..1bacffc7 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java @@ -26,7 +26,10 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -public abstract class FastLoginCore { +/** + * @param

Player class + */ +public abstract class FastLoginCore

{ public static ConcurrentMap buildCache(int expireAfterWrite, int maxSize) { CompatibleCacheBuilder builder = CompatibleCacheBuilder.newBuilder(); @@ -67,8 +70,8 @@ public abstract class FastLoginCore { private MojangApiConnector mojangApiConnector; private AuthStorage storage; - private PasswordGenerator passwordGenerator = new DefaultPasswordGenerator<>(); - private AuthPlugin authPlugin; + private PasswordGenerator

passwordGenerator = new DefaultPasswordGenerator<>(); + private AuthPlugin

authPlugin; public FastLoginCore(Map config) { this.pendingLogins = FastLoginCore.buildCache(5, 0); @@ -164,11 +167,11 @@ public abstract class FastLoginCore { return sharedConfig; } - public PasswordGenerator getPasswordGenerator() { + public PasswordGenerator

getPasswordGenerator() { return passwordGenerator; } - public void setPasswordGenerator(PasswordGenerator passwordGenerator) { + public void setPasswordGenerator(PasswordGenerator

passwordGenerator) { this.passwordGenerator = passwordGenerator; } @@ -180,11 +183,11 @@ public abstract class FastLoginCore { return pendingConfirms; } - public AuthPlugin getAuthPlugin() { + public AuthPlugin

getAuthPluginHook() { return authPlugin; } - public void setAuthPlugin(AuthPlugin authPlugin) { + public void setAuthPluginHook(AuthPlugin

authPlugin) { this.authPlugin = authPlugin; }