Added localization messages (Fixes #20)

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java

@@ -7,6 +7,9 @@ import java.io.File;
 import java.util.concurrent.ThreadFactory;
 import java.util.logging.Logger;
 
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.file.YamlConfiguration;
+
 public class BukkitCore extends FastLoginCore {
 
     private final FastLoginBukkit plugin;
@@ -34,4 +37,21 @@ public class BukkitCore extends FastLoginCore {
                 .setDaemon(true)
                 .build();
     }
+
+    @Override
+    public void loadMessages() {
+        plugin.saveResource("messages.yml", false);
+
+        File messageFile = new File(plugin.getDataFolder(), "messages.yml");
+        YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile);
+        for (String key : messageConfig.getKeys(false)) {
+            String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
+            localeMessages.put(key, message);
+        }
+    }
+
+    @Override
+    public void loadConfig() {
+        plugin.saveConfig();
+    }
 }

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java

@@ -1,5 +1,6 @@
 package com.github.games647.fastlogin.bukkit;
 
+import com.github.games647.fastlogin.bukkit.tasks.DelayedAuthHook;
 import com.avaje.ebeaninternal.api.ClassUtil;
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -59,6 +60,9 @@ public class FastLoginBukkit extends JavaPlugin {
     @Override
     public void onEnable() {
         core.setMojangApiConnector(new MojangApiBukkit(core));
+        
+        core.loadConfig();
+        core.loadMessages();
 
         try {
             if (ClassUtil.isPresent("org.spigotmc.SpigotConfig")) {
@@ -69,8 +73,6 @@ public class FastLoginBukkit extends JavaPlugin {
             ex.printStackTrace();
         }
 
-        saveDefaultConfig();
-
         if (getServer().getOnlineMode()) {
             //we need to require offline to prevent a session request for a offline player
             getLogger().severe("Server have to be in offline mode");

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java

@@ -25,13 +25,13 @@ public class CrackedCommand implements CommandExecutor {
         if (args.length == 0) {
             if (!(sender instanceof Player)) {
                 //console or command block
-                sender.sendMessage(ChatColor.DARK_RED + "Only players can remove themselves from the premium list");
+                sender.sendMessage(plugin.getCore().getMessage("no-console"));
                 return true;
             }
 
             if (plugin.isBungeeCord()) {
                 notifiyBungeeCord(sender, sender.getName());
-                sender.sendMessage(ChatColor.YELLOW + "Sending request...");
+                sender.sendMessage(plugin.getCore().getMessage("wait-on-proxy"));
             } else {
                 //todo: load async if it's not in the cache anymore
                 final PlayerProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
@@ -53,18 +53,18 @@ public class CrackedCommand implements CommandExecutor {
             return true;
         } else {
             if (!sender.hasPermission(command.getPermission() + ".other")) {
-                sender.sendMessage(ChatColor.DARK_RED + "Not enough permissions");
+                sender.sendMessage(plugin.getCore().getMessage("no-permission"));
                 return true;
             }
 
             if (plugin.isBungeeCord()) {
                 notifiyBungeeCord(sender, args[0]);
-                sender.sendMessage(ChatColor.YELLOW + "Sending request for player " + args[0] + "...");
+                sender.sendMessage(plugin.getCore().getMessage("wait-on-proxy"));
             } else {
                 //todo: load async if it's not in the cache anymore
                 final PlayerProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
                 if (profile == null) {
-                    sender.sendMessage(ChatColor.DARK_RED + "Player not in the database");
+                    sender.sendMessage(plugin.getCore().getMessage("player-unknown"));
                     return true;
                 }
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/PremiumCommand.java

@@ -30,13 +30,13 @@ public class PremiumCommand implements CommandExecutor {
         if (args.length == 0) {
             if (!(sender instanceof Player)) {
                 //console or command block
-                sender.sendMessage(ChatColor.DARK_RED + "Only players can add themselves as premium");
+                sender.sendMessage(plugin.getCore().getMessage("no-console"));
                 return true;
             }
 
             if (plugin.isBungeeCord()) {
                 notifiyBungeeCord(sender, sender.getName());
-                sender.sendMessage(ChatColor.YELLOW + "Sending request...");
+                sender.sendMessage(plugin.getCore().getMessage("wait-on-proxy"));
             } else {
 //            //todo: load async if it's not in the cache anymore
                 final PlayerProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
@@ -59,18 +59,18 @@ public class PremiumCommand implements CommandExecutor {
             return true;
         } else {
             if (!sender.hasPermission(command.getPermission() + ".other")) {
-                sender.sendMessage(ChatColor.DARK_RED + "Not enough permissions");
+                sender.sendMessage(plugin.getCore().getMessage("no-permission"));
                 return true;
             }
 
             if (plugin.isBungeeCord()) {
                 notifiyBungeeCord(sender, args[0]);
-                sender.sendMessage(ChatColor.YELLOW + "Sending request...");
+                sender.sendMessage(plugin.getCore().getMessage("wait-on-proxy"));
             } else {
                 //todo: load async if it's not in the cache anymore
                 final PlayerProfile profile = plugin.getCore().getStorage().loadProfile(args[0]);
                 if (profile == null) {
-                    sender.sendMessage(ChatColor.DARK_RED + "Player not in the database");
+                    sender.sendMessage(plugin.getCore().getMessage("player-unknown"));
                     return true;
                 }
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java

@@ -7,10 +7,10 @@ import de.st_ddt.crazylogin.data.LoginPlayerData;
 import de.st_ddt.crazylogin.databases.CrazyLoginDataDatabase;
 import de.st_ddt.crazylogin.listener.PlayerListener;
 import de.st_ddt.crazylogin.metadata.Authenticated;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-
 import java.util.logging.Level;
 
 import org.bukkit.Bukkit;

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java

@@ -5,14 +5,13 @@ import com.lenis0012.bukkit.ls.LoginSecurity;
 import com.lenis0012.bukkit.ls.data.DataManager;
 
 import java.net.InetAddress;
-
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
-import org.bukkit.Bukkit;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 /**
@@ -27,6 +26,11 @@ import org.bukkit.entity.Player;
 public class LoginSecurityHook implements BukkitAuthPlugin {
 
     protected final LoginSecurity securityPlugin = LoginSecurity.instance;
+//    protected final boolean newVersion;
+
+    public LoginSecurityHook() {
+//        this.newVersion = ClassUtil.isPresent("com.lenis0012.bukkit.loginsecurity.session.action.LoginAction");
+    }
 
     @Override
     public boolean forceLogin(final Player player) {

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java

@@ -6,7 +6,6 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 
 import org.bukkit.Bukkit;
-
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java

@@ -4,7 +4,7 @@ import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedSignedProperty;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.ForceLoginTask;
+import com.github.games647.fastlogin.bukkit.tasks.ForceLoginTask;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.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.ForceLoginTask;
+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.google.common.base.Charsets;

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java

@@ -89,7 +89,8 @@ public class ProtocolSupportListener implements Listener {
         }
     }
 
-    private void startPremiumSession(String playerName, PlayerLoginStartEvent loginStartEvent, boolean registered, PlayerProfile playerProfile) {
+    private void startPremiumSession(String playerName, PlayerLoginStartEvent loginStartEvent, boolean registered
+            , PlayerProfile playerProfile) {
         loginStartEvent.setOnlineMode(true);
         InetSocketAddress address = loginStartEvent.getAddress();
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/packet/EncryptionPacketListener.java

@@ -9,9 +9,9 @@ import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.EncryptionUtil;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -75,7 +75,7 @@ public class EncryptionPacketListener extends PacketAdapter {
 
         BukkitLoginSession session = plugin.getSessions().get(player.getAddress().toString());
         if (session == null) {
-            disconnect(packetEvent, "Invalid request", Level.FINE
+            disconnect(packetEvent, plugin.getCore().getMessage("invalid-requst"), true
                     , "Player {0} tried to send encryption response at invalid state", player.getAddress());
             return;
         }
@@ -106,7 +106,7 @@ public class EncryptionPacketListener extends PacketAdapter {
             receiveFakeStartPacket(username, player);
         } else {
             //user tried to fake a authentication
-            disconnect(packetEvent, "Invalid session", Level.FINE
+            disconnect(packetEvent, plugin.getCore().getMessage("invalid-session"), true
                     , "Player {0} ({1}) tried to log in with an invalid session ServerId: {2}"
                     , session.getUsername(), player.getAddress(), serverId);
         }
@@ -137,9 +137,8 @@ public class EncryptionPacketListener extends PacketAdapter {
         //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L182
         if (!Arrays.equals(requestVerify, EncryptionUtil.decryptData(privateKey, responseVerify))) {
             //check if the verify token are equal to the server sent one
-            disconnect(packetEvent, "Invalid token", Level.FINE
-                    , "Player {0} ({1}) tried to login with an invalid verify token. "
-                            + "Server: {2} Client: {3}"
+            disconnect(packetEvent, plugin.getCore().getMessage("invalid-verify-token"), true
+                    , "Player {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}"
                     , session.getUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
             return false;
         }
@@ -168,23 +167,28 @@ public class EncryptionPacketListener extends PacketAdapter {
             Object networkManager = getNetworkManager(player);
 
             //try to detect the method by parameters
-            Method encryptConnectionMethod = FuzzyReflection.fromObject(networkManager)
-                    .getMethodByParameters("a", SecretKey.class);
+            Method encryptConnectionMethod = FuzzyReflection
+                    .fromObject(networkManager).getMethodByParameters("a", SecretKey.class);
 
             //encrypt/decrypt following packets
             //the client expects this behaviour
             encryptConnectionMethod.invoke(networkManager, loginKey);
         } catch (ReflectiveOperationException ex) {
-            disconnect(packetEvent, "Error occurred", Level.SEVERE, "Couldn't enable encryption", ex);
+            disconnect(packetEvent, plugin.getCore().getMessage("error-kick"), false, "Couldn't enable encryption", ex);
             return false;
         }
 
         return true;
     }
 
-    private void disconnect(PacketEvent packetEvent, String kickReason, Level logLevel, String logMessage
+    private void disconnect(PacketEvent packetEvent, String kickReason, boolean debugLevel, String logMessage
             , Object... arguments) {
-        plugin.getLogger().log(logLevel, logMessage, arguments);
+        if (debugLevel) {
+            plugin.getLogger().log(Level.FINE, logMessage, arguments);
+        } else {
+            plugin.getLogger().log(Level.SEVERE, logMessage, arguments);
+        }
+
         kickPlayer(packetEvent.getPlayer(), kickReason);
         //cancel the event in order to prevent the server receiving an invalid packet
         packetEvent.setCancelled(true);
@@ -219,7 +223,7 @@ public class EncryptionPacketListener extends PacketAdapter {
         } catch (InvocationTargetException | IllegalAccessException ex) {
             plugin.getLogger().log(Level.WARNING, "Failed to fake a new start packet", ex);
             //cancel the event in order to prevent the server receiving an invalid packet
-            kickPlayer(from, "Error occured");
+            kickPlayer(from, plugin.getCore().getMessage("error-kick"));
         }
     }
 }

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/DelayedAuthHook.java

@@ -1,5 +1,6 @@
-package com.github.games647.fastlogin.bukkit;
+package com.github.games647.fastlogin.bukkit.tasks;
 
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.bukkit.hooks.AuthMeHook;
 import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
 import com.github.games647.fastlogin.bukkit.hooks.CrazyLoginHook;

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java

@@ -1,5 +1,7 @@
-package com.github.games647.fastlogin.bukkit;
+package com.github.games647.fastlogin.bukkit.tasks;
 
+import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
+import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
 import com.github.games647.fastlogin.core.PlayerProfile;
 import com.github.games647.fastlogin.core.Storage;
@@ -12,7 +14,6 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 public class ForceLoginTask implements Runnable {
@@ -85,15 +86,14 @@ public class ForceLoginTask implements Runnable {
 
         String generatedPassword = plugin.generateStringPassword(player);
         boolean success = authPlugin.forceRegister(player, generatedPassword);
-        player.sendMessage(ChatColor.DARK_GREEN + "Auto registered with password: " + generatedPassword);
-        player.sendMessage(ChatColor.DARK_GREEN + "You may want change it?");
+        player.sendMessage(plugin.getCore().getMessage("auto-register").replace("%password", generatedPassword));
         return success;
     }
 
     private boolean forceLogin(BukkitAuthPlugin authPlugin, Player player) {
         plugin.getLogger().log(Level.FINE, "Logging player {0} in", player.getName());
         boolean success = authPlugin.forceLogin(player);
-        player.sendMessage(ChatColor.DARK_GREEN + "Auto logged in");
+        player.sendMessage(plugin.getCore().getMessage("auto-login"));
         return success;
     }