Cleanup, prepare for authme 5.4

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>fr.xephi</groupId>
     <artifactId>authmebungee</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>AuthMeBungee</name>
@@ -44,9 +44,7 @@
     <properties>
         <!-- Project Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bungeeVersion>1.12-SNAPSHOT</bungeeVersion>
-        <spigotVersion>1.12-R0.1-SNAPSHOT</spigotVersion>
-        <authMeVersion>5.3.3-SNAPSHOT</authMeVersion>
+        <authMeVersion>5.4.0-SNAPSHOT</authMeVersion>
     </properties>
 
     <build>
@@ -68,7 +66,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.7.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -78,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>
@@ -101,11 +99,6 @@
             <id>oss-repo</id>
             <url>http://oss.sonatype.org/content/groups/public</url>
         </repository>
-        <!-- Spigot Repo -->
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <!-- AuthMe Repo -->
         <repository>
             <id>xephi-repo</id>
@@ -118,39 +111,31 @@
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>injector</artifactId>
-            <version>0.3</version>
+            <version>0.4.1</version>
             <scope>compile</scope>
         </dependency>
 
         <!-- Configuration library -->
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>configme</artifactId>
-            <version>0.3</version>
+            <version>0.4</version>
             <scope>compile</scope>
         </dependency>
 
         <!-- Bungeecord API -->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>${bungeeVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Spigot API -->
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>${spigotVersion}</version>
+            <version>1.12-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- AuthMeAPI -->
         <dependency>
             <groupId>fr.xephi</groupId>
             <artifactId>authme</artifactId>
-            <version>${authMeVersion}</version>
+            <version>5.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

src/main/java/fr/xephi/authmebungee/bungeecord/AuthMeBungee.java → src/main/java/fr/xephi/authmebungee/AuthMeBungee.java

@@ -1,15 +1,14 @@
-package fr.xephi.authmebungee.bungeecord;
+package fr.xephi.authmebungee;
 
 import ch.jalu.configme.SettingsManager;
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
-import fr.xephi.authmebungee.bungeecord.commands.BungeeReloadCommand;
-import fr.xephi.authmebungee.bungeecord.config.BungeeSettingsProvider;
-import fr.xephi.authmebungee.bungeecord.listeners.BungeeMessageListener;
-import fr.xephi.authmebungee.bungeecord.listeners.BungeePlayerListener;
-import fr.xephi.authmebungee.bungeecord.services.AuthPlayerManager;
-import fr.xephi.authmebungee.bungeecord.services.BungeeMessageSender;
-import fr.xephi.authmebungee.common.annotations.DataFolder;
+import fr.xephi.authmebungee.annotations.DataFolder;
+import fr.xephi.authmebungee.commands.BungeeReloadCommand;
+import fr.xephi.authmebungee.config.BungeeSettingsProvider;
+import fr.xephi.authmebungee.listeners.BungeeMessageListener;
+import fr.xephi.authmebungee.listeners.BungeePlayerListener;
+import fr.xephi.authmebungee.services.AuthPlayerManager;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -22,7 +21,6 @@ public class AuthMeBungee extends Plugin {
     private Injector injector;
     private SettingsManager settings;
     private AuthPlayerManager authPlayerManager;
-    private BungeeMessageSender pluginMessageSender;
 
     public AuthMeBungee() {
     }
@@ -36,9 +34,8 @@ public void onEnable() {
         // Get singletons from the injector
         settings = injector.getSingleton(SettingsManager.class);
         authPlayerManager = injector.getSingleton(AuthPlayerManager.class);
-        pluginMessageSender = injector.getSingleton(BungeeMessageSender.class);
 
-        for(ProxiedPlayer player : getProxy().getPlayers()) {
+        for (ProxiedPlayer player : getProxy().getPlayers()) {
             authPlayerManager.addAuthPlayer(player);
         }
 

src/main/java/fr/xephi/authmebungee/common/annotations/DataFolder.java → src/main/java/fr/xephi/authmebungee/annotations/DataFolder.java

@@ -1,4 +1,4 @@
-package fr.xephi.authmebungee.common.annotations;
+package fr.xephi.authmebungee.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/fr/xephi/authmebungee/bungeecord/commands/BungeeReloadCommand.java → src/main/java/fr/xephi/authmebungee/commands/BungeeReloadCommand.java

@@ -1,4 +1,4 @@
-package fr.xephi.authmebungee.bungeecord.commands;
+package fr.xephi.authmebungee.commands;
 
 import ch.jalu.configme.SettingsManager;
 import net.md_5.bungee.api.ChatColor;

src/main/java/fr/xephi/authmebungee/bungeecord/config/BungeeConfigProperties.java → src/main/java/fr/xephi/authmebungee/config/BungeeConfigProperties.java

@@ -1,4 +1,4 @@
-package fr.xephi.authmebungee.bungeecord.config;
+package fr.xephi.authmebungee.config;
 
 import ch.jalu.configme.Comment;
 import ch.jalu.configme.SettingsHolder;

src/main/java/fr/xephi/authmebungee/bungeecord/config/BungeeSettingsProvider.java → src/main/java/fr/xephi/authmebungee/config/BungeeSettingsProvider.java

@@ -1,9 +1,9 @@
-package fr.xephi.authmebungee.bungeecord.config;
+package fr.xephi.authmebungee.config;
+
+import fr.xephi.authmebungee.annotations.DataFolder;
 
-import fr.xephi.authmebungee.common.annotations.DataFolder;
-import fr.xephi.authmebungee.common.config.SettingsProvider;
-import java.io.File;
 import javax.inject.Inject;
+import java.io.File;
 
 public class BungeeSettingsProvider extends SettingsProvider {
 

src/main/java/fr/xephi/authmebungee/common/config/SettingsDependent.java → src/main/java/fr/xephi/authmebungee/config/SettingsDependent.java

@@ -1,4 +1,4 @@
-package fr.xephi.authmebungee.common.config;
+package fr.xephi.authmebungee.config;
 
 import ch.jalu.configme.SettingsManager;
 

src/main/java/fr/xephi/authmebungee/common/config/SettingsProvider.java → src/main/java/fr/xephi/authmebungee/config/SettingsProvider.java

@@ -1,11 +1,11 @@
-package fr.xephi.authmebungee.common.config;
+package fr.xephi.authmebungee.config;
 
 import ch.jalu.configme.SettingsHolder;
 import ch.jalu.configme.SettingsManager;
 import ch.jalu.configme.migration.PlainMigrationService;
 import ch.jalu.configme.resource.PropertyResource;
 import ch.jalu.configme.resource.YamlFileResource;
-import fr.xephi.authmebungee.common.utils.FileUtils;
+import fr.xephi.authmebungee.utils.FileUtils;
 
 import javax.inject.Provider;
 import java.io.File;

src/main/java/fr/xephi/authmebungee/bungeecord/data/AuthPlayer.java → src/main/java/fr/xephi/authmebungee/data/AuthPlayer.java

@@ -1,4 +1,4 @@
-package fr.xephi.authmebungee.bungeecord.data;
+package fr.xephi.authmebungee.data;
 
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -14,7 +14,7 @@ public class AuthPlayer {
     private boolean isLogged;
 
     public AuthPlayer(String name, boolean isLogged) {
-        this.name = name;
+        this.name = name.toLowerCase();
         this.isLogged = isLogged;
     }
 
@@ -35,7 +35,12 @@ public void setLogged(boolean isLogged) {
     }
 
     public ProxiedPlayer getPlayer() {
-        return proxy.getPlayer(getName());
+        for (ProxiedPlayer current : proxy.getPlayers()) {
+            if (current.getName().equalsIgnoreCase(name)) {
+                return current;
+            }
+        }
+        return null;
     }
 
     public boolean isOnline() {

src/main/java/fr/xephi/authmebungee/bungeecord/listeners/BungeeMessageListener.java → src/main/java/fr/xephi/authmebungee/listeners/BungeeMessageListener.java

@@ -1,6 +1,6 @@
-package fr.xephi.authmebungee.bungeecord.listeners;
+package fr.xephi.authmebungee.listeners;
 
-import fr.xephi.authmebungee.bungeecord.services.AuthPlayerManager;
+import fr.xephi.authmebungee.services.AuthPlayerManager;
 import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
@@ -40,7 +40,7 @@ public void onPluginMessage(PluginMessageEvent event) {
             // Read the plugin message
             DataInputStream in = new DataInputStream(new ByteArrayInputStream(event.getData()));
 
-            if (!in.readUTF().equals("AuthMeBungee")) {
+            if (!in.readUTF().equals("AuthMe")) {
                 return;
             }
 
@@ -51,10 +51,10 @@ public void onPluginMessage(PluginMessageEvent event) {
             String task = in.readUTF();
 
             switch (task) {
-                case "Login":
+                case "login":
                     authPlayerManager.getAuthPlayer(in.readUTF()).setLogged(true);
                     break;
-                case "Logout":
+                case "logout":
                     authPlayerManager.getAuthPlayer(in.readUTF()).setLogged(false);
                     break;
             }

src/main/java/fr/xephi/authmebungee/bungeecord/listeners/BungeePlayerListener.java → src/main/java/fr/xephi/authmebungee/listeners/BungeePlayerListener.java

@@ -1,11 +1,10 @@
-package fr.xephi.authmebungee.bungeecord.listeners;
+package fr.xephi.authmebungee.listeners;
 
 import ch.jalu.configme.SettingsManager;
-import fr.xephi.authmebungee.bungeecord.config.BungeeConfigProperties;
-import fr.xephi.authmebungee.bungeecord.data.AuthPlayer;
-import fr.xephi.authmebungee.bungeecord.services.AuthPlayerManager;
-import fr.xephi.authmebungee.bungeecord.services.BungeeMessageSender;
-import fr.xephi.authmebungee.common.config.SettingsDependent;
+import fr.xephi.authmebungee.config.BungeeConfigProperties;
+import fr.xephi.authmebungee.config.SettingsDependent;
+import fr.xephi.authmebungee.data.AuthPlayer;
+import fr.xephi.authmebungee.services.AuthPlayerManager;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -24,7 +23,6 @@ public class BungeePlayerListener implements Listener, SettingsDependent {
 
     // Services
     private AuthPlayerManager authPlayerManager;
-    private BungeeMessageSender pluginMessageSender;
 
     // Settings
     private boolean isAutoLogin;
@@ -36,9 +34,8 @@ public class BungeePlayerListener implements Listener, SettingsDependent {
     private boolean chatRequiresAuth;
 
     @Inject
-    public BungeePlayerListener(SettingsManager settings, AuthPlayerManager authPlayerManager, BungeeMessageSender pluginMessageSender) {
+    public BungeePlayerListener(SettingsManager settings, AuthPlayerManager authPlayerManager) {
         this.authPlayerManager = authPlayerManager;
-        this.pluginMessageSender = pluginMessageSender;
         reload(settings);
     }
 
@@ -122,7 +119,7 @@ public void onServerConnect(ServerConnectEvent event) {
 
     @EventHandler
     public void onServerSwitch(ServerSwitchEvent event) {
-        if(!isAutoLogin) {
+        if (!isAutoLogin) {
             return;
         }
 
@@ -136,12 +133,11 @@ public void onServerSwitch(ServerSwitchEvent event) {
                 ByteArrayOutputStream bout = new ByteArrayOutputStream();
                 DataOutputStream out = new DataOutputStream(bout);
 
-                out.writeUTF("AuthMeBungee");
+                out.writeUTF("AuthMe");
                 out.writeUTF("AutoLogin");
                 out.writeUTF(authPlayer.getName());
 
-                // Not using async as bungeecord already use multiple threads for player connections
-                pluginMessageSender.sendData(event.getPlayer().getServer(), bout.toByteArray(), false);
+                event.getPlayer().getServer().sendData("BungeeCord", bout.toByteArray());
             } catch (IOException e) {
                 e.printStackTrace();
             }

src/main/java/fr/xephi/authmebungee/bungeecord/services/AuthPlayerManager.java → src/main/java/fr/xephi/authmebungee/services/AuthPlayerManager.java

@@ -1,6 +1,6 @@
-package fr.xephi.authmebungee.bungeecord.services;
+package fr.xephi.authmebungee.services;
 
-import fr.xephi.authmebungee.bungeecord.data.AuthPlayer;
+import fr.xephi.authmebungee.data.AuthPlayer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.util.HashMap;
@@ -21,19 +21,19 @@ public void addAuthPlayer(AuthPlayer player) {
     }
 
     public void addAuthPlayer(ProxiedPlayer player) {
-        addAuthPlayer(new AuthPlayer(player.getName()));
+        addAuthPlayer(new AuthPlayer(player.getName().toLowerCase()));
     }
 
     public void removeAuthPlayer(String name) {
-        players.remove(name);
+        players.remove(name.toLowerCase());
     }
 
     public void removeAuthPlayer(ProxiedPlayer player) {
         removeAuthPlayer(player.getName());
     }
 
     public AuthPlayer getAuthPlayer(String name) {
-        return players.get(name);
+        return players.get(name.toLowerCase());
     }
 
     public AuthPlayer getAuthPlayer(ProxiedPlayer player) {