Merge pull request #5 from XXLuigiMario/master

Bugfixes
AuthMe · Aug 22, 2017 · 2de4c37 · 2de4c37
2 parents 28c37e3 + 3597d1c
commit 2de4c37
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 28 deletions.
diff --git a/src/main/java/fr/xephi/authmebungee/bungeecord/AuthMeBungee.java b/src/main/java/fr/xephi/authmebungee/bungeecord/AuthMeBungee.java
@@ -58,7 +58,7 @@ public void onDisable() {
 
     private void setupInjector() {
         // Setup injector
-        injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authmebungee.bungee").create();
+        injector = new InjectorBuilder().addDefaultHandlers("").create();
         injector.register(AuthMeBungee.class, this);
         injector.register(ProxyServer.class, getProxy());
         injector.register(PluginManager.class, getProxy().getPluginManager());

diff --git a/src/main/java/fr/xephi/authmebungee/bungeecord/commands/BungeeReloadCommand.java b/src/main/java/fr/xephi/authmebungee/bungeecord/commands/BungeeReloadCommand.java
@@ -14,7 +14,7 @@ public class BungeeReloadCommand extends Command {
     private SettingsManager settings;
 
     public BungeeReloadCommand() {
-        super("abreload", "authmebungee.reload");
+        super("abreloadproxy", "authmebungee.reload");
     }
 
     @Override

diff --git a/src/main/java/fr/xephi/authmebungee/bungeecord/config/BungeeSettingsProvider.java b/src/main/java/fr/xephi/authmebungee/bungeecord/config/BungeeSettingsProvider.java
@@ -1,10 +1,14 @@
 package fr.xephi.authmebungee.bungeecord.config;
 
+import fr.xephi.authmebungee.common.annotations.DataFolder;
 import fr.xephi.authmebungee.common.config.SettingsProvider;
+import java.io.File;
+import javax.inject.Inject;
 
 public class BungeeSettingsProvider extends SettingsProvider {
 
-    BungeeSettingsProvider() {
-        super(BungeeConfigProperties.class);
+    @Inject
+    public BungeeSettingsProvider(@DataFolder File dataFolder) {
+        super(dataFolder, BungeeConfigProperties.class);
     }
 }
diff --git a/src/main/java/fr/xephi/authmebungee/bungeecord/listeners/BungeeMessageListener.java b/src/main/java/fr/xephi/authmebungee/bungeecord/listeners/BungeeMessageListener.java
@@ -13,11 +13,10 @@
 
 public class BungeeMessageListener implements Listener {
 
-    @Inject
     private AuthPlayerManager authPlayerManager;
 
     @Inject
-    BungeeMessageListener(AuthPlayerManager authPlayerManager) {
+    public BungeeMessageListener(AuthPlayerManager authPlayerManager) {
         this.authPlayerManager = authPlayerManager;
     }
 
@@ -37,9 +36,6 @@ public void onPluginMessage(PluginMessageEvent event) {
             return;
         }
 
-        // Now that's sure, it's for us, so let's go
-        event.setCancelled(true);
-
         try {
             // Read the plugin message
             DataInputStream in = new DataInputStream(new ByteArrayInputStream(event.getData()));
@@ -48,14 +44,17 @@ public void onPluginMessage(PluginMessageEvent event) {
                 return;
             }
 
+            // Now that's sure, it's for us, so let's go
+            event.setCancelled(true);
+
             // For now that's the only type of message the server is able to receive
             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;
             }

diff --git a/src/main/java/fr/xephi/authmebungee/bungeecord/listeners/BungeePlayerListener.java b/src/main/java/fr/xephi/authmebungee/bungeecord/listeners/BungeePlayerListener.java
@@ -36,7 +36,7 @@ public class BungeePlayerListener implements Listener, SettingsDependent {
     private boolean chatRequiresAuth;
 
     @Inject
-    BungeePlayerListener(SettingsManager settings, AuthPlayerManager authPlayerManager, BungeeMessageSender pluginMessageSender) {
+    public BungeePlayerListener(SettingsManager settings, AuthPlayerManager authPlayerManager, BungeeMessageSender pluginMessageSender) {
         this.authPlayerManager = authPlayerManager;
         this.pluginMessageSender = pluginMessageSender;
         reload(settings);

diff --git a/src/main/java/fr/xephi/authmebungee/bungeecord/services/BungeeMessageSender.java b/src/main/java/fr/xephi/authmebungee/bungeecord/services/BungeeMessageSender.java
@@ -13,7 +13,7 @@ public class BungeeMessageSender {
     private TaskScheduler scheduler;
 
     @Inject
-    BungeeMessageSender(AuthMeBungee plugin, TaskScheduler scheduler) {
+    public BungeeMessageSender(AuthMeBungee plugin, TaskScheduler scheduler) {
         this.plugin = plugin;
         this.scheduler = scheduler;
     }

diff --git a/src/main/java/fr/xephi/authmebungee/common/config/SettingsProvider.java b/src/main/java/fr/xephi/authmebungee/common/config/SettingsProvider.java
@@ -5,10 +5,8 @@
 import ch.jalu.configme.migration.PlainMigrationService;
 import ch.jalu.configme.resource.PropertyResource;
 import ch.jalu.configme.resource.YamlFileResource;
-import fr.xephi.authmebungee.common.annotations.DataFolder;
 import fr.xephi.authmebungee.common.utils.FileUtils;
 
-import javax.inject.Inject;
 import javax.inject.Provider;
 import java.io.File;
 
@@ -17,13 +15,12 @@
  */
 public abstract class SettingsProvider implements Provider<SettingsManager> {
 
-    @Inject
-    @DataFolder
     private File dataFolder;
 
     private Class<? extends SettingsHolder> properties;
 
-    protected SettingsProvider(Class<? extends SettingsHolder> properties) {
+    protected SettingsProvider(File dataFolder, Class<? extends SettingsHolder> properties) {
+        this.dataFolder = dataFolder;
         this.properties = properties;
     }
 

diff --git a/src/main/java/fr/xephi/authmebungee/spigot/AuthMeBungeeSpigot.java b/src/main/java/fr/xephi/authmebungee/spigot/AuthMeBungeeSpigot.java
@@ -45,7 +45,7 @@ public void onEnable() {
 
     private void setupInjector() {
         // Setup injector
-        injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authmebungee.spigot").create();
+        injector = new InjectorBuilder().addDefaultHandlers("").create();
         injector.register(AuthMeBungeeSpigot.class, this);
         injector.register(Server.class, getServer());
         injector.register(PluginManager.class, getServer().getPluginManager());

diff --git a/src/main/java/fr/xephi/authmebungee/spigot/config/SpigotSettingsProvider.java b/src/main/java/fr/xephi/authmebungee/spigot/config/SpigotSettingsProvider.java
@@ -1,10 +1,14 @@
 package fr.xephi.authmebungee.spigot.config;
 
+import fr.xephi.authmebungee.common.annotations.DataFolder;
 import fr.xephi.authmebungee.common.config.SettingsProvider;
+import java.io.File;
+import javax.inject.Inject;
 
 public class SpigotSettingsProvider extends SettingsProvider {
 
-    SpigotSettingsProvider() {
-        super(SpigotConfigProperties.class);
+    @Inject
+    SpigotSettingsProvider(@DataFolder File dataFolder) {
+        super(dataFolder, SpigotConfigProperties.class);
     }
 }
diff --git a/src/main/java/fr/xephi/authmebungee/spigot/listeners/SpigotAuthMeListener.java b/src/main/java/fr/xephi/authmebungee/spigot/listeners/SpigotAuthMeListener.java
@@ -26,7 +26,8 @@ public SpigotAuthMeListener(SpigotMessageSender messageSender) {
     public void onAuthMeLogin(LoginEvent event) {
         final Player player = event.getPlayer();
         try (ByteArrayOutputStream bout = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(bout)) {
-            out.writeUTF("LOGIN:");
+            out.writeUTF("AuthMeBungee");
+            out.writeUTF("Login");
             out.writeUTF(player.getName());
             messageSender.sendData(bout.toByteArray(), true);
         } catch (IOException e) {
@@ -38,7 +39,8 @@ public void onAuthMeLogin(LoginEvent event) {
     public void onAuthMeLogout(LogoutEvent event) {
         final Player player = event.getPlayer();
         try (ByteArrayOutputStream bout = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(bout)) {
-            out.writeUTF("LOGOUT:");
+            out.writeUTF("AuthMeBungee");
+            out.writeUTF("Logout");
             out.writeUTF(player.getName());
             messageSender.sendData(bout.toByteArray(), true);
         } catch (IOException e) {

diff --git a/src/main/java/fr/xephi/authmebungee/spigot/listeners/SpigotMessageListener.java b/src/main/java/fr/xephi/authmebungee/spigot/listeners/SpigotMessageListener.java
@@ -21,7 +21,7 @@ public class SpigotMessageListener implements PluginMessageListener, SettingsDep
     private String autoLoginMessage;
 
     @Inject
-    SpigotMessageListener(Server server, SettingsManager settings, AuthMeApi authMeApi) {
+    public SpigotMessageListener(Server server, SettingsManager settings, AuthMeApi authMeApi) {
         this.server = server;
         this.authMeApi = authMeApi;
         reload(settings);
@@ -39,8 +39,7 @@ public void onPluginMessageReceived(String channel, Player connection, byte[] me
         }
         ByteArrayDataInput in = ByteStreams.newDataInput(message);
 
-        String type = in.readUTF();
-        if (!type.equals("AUTOLOGIN:")) {
+        if (!(in.readUTF().equals("AuthMeBungee") && in.readUTF().equals("AutoLogin"))) {
             return;
         }
 

diff --git a/src/main/java/fr/xephi/authmebungee/spigot/services/SpigotMessageSender.java b/src/main/java/fr/xephi/authmebungee/spigot/services/SpigotMessageSender.java
@@ -12,7 +12,7 @@ public class SpigotMessageSender {
     private Server server;
 
     @Inject
-    SpigotMessageSender(AuthMeBungeeSpigot plugin, Server server) {
+    public SpigotMessageSender(AuthMeBungeeSpigot plugin, Server server) {
         this.plugin = plugin;
         this.server = server;
     }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: ${project.name}
-main: fr.xephi.authmebungee.spigot.AuthMeBungee
+main: fr.xephi.authmebungee.spigot.AuthMeBungeeSpigot
 version: ${project.version}
 authors: [CryLegend, AuthMeTeam]
 depend: [AuthMe]