#421 Create SpawnLoader

- Non-static service class which handles the spawnpoints used in AuthMe

src/main/java/fr/xephi/authme/command/CommandInitializer.java

@@ -159,7 +159,7 @@ public final class CommandInitializer {
             .labels("getip", "ip")
             .description("Get player's IP")
             .detailedDescription("Get the IP address of the specified online player.")
-            .withArgument("player", "Player Name", false)
+            .withArgument("player", "Player name", false)
             .permissions(OP_ONLY, AdminPermission.GET_IP)
             .executableCommand(new GetIpCommand())
             .build();
@@ -170,7 +170,6 @@ public final class CommandInitializer {
             .labels("spawn", "home")
             .description("Teleport to spawn")
             .detailedDescription("Teleport to the spawn.")
-            .withArgument("player", "Player Name", false)
             .permissions(OP_ONLY, AdminPermission.SPAWN)
             .executableCommand(new SpawnCommand())
             .build();

src/main/java/fr/xephi/authme/command/CommandService.java

@@ -12,6 +12,7 @@ import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.domain.Property;
 import org.bukkit.command.CommandSender;
 
@@ -32,6 +33,7 @@ public class CommandService {
     private final NewSetting settings;
     private final IpAddressManager ipAddressManager;
     private final PluginHooks pluginHooks;
+    private final SpawnLoader spawnLoader;
 
     /**
      * Constructor.
@@ -47,7 +49,7 @@ public class CommandService {
      */
     public CommandService(AuthMe authMe, CommandMapper commandMapper, HelpProvider helpProvider, Messages messages,
                           PasswordSecurity passwordSecurity, PermissionsManager permissionsManager, NewSetting settings,
-                          IpAddressManager ipAddressManager, PluginHooks pluginHooks) {
+                          IpAddressManager ipAddressManager, PluginHooks pluginHooks, SpawnLoader spawnLoader) {
         this.authMe = authMe;
         this.messages = messages;
         this.helpProvider = helpProvider;
@@ -57,6 +59,7 @@ public class CommandService {
         this.settings = settings;
         this.ipAddressManager = ipAddressManager;
         this.pluginHooks = pluginHooks;
+        this.spawnLoader = spawnLoader;
     }
 
     /**
@@ -202,4 +205,8 @@ public class CommandService {
         return pluginHooks;
     }
 
+    public SpawnLoader getSpawnLoader() {
+        return spawnLoader;
+    }
+
 }

src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java

@@ -1,9 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.settings.Spawn;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -12,16 +10,10 @@ public class FirstSpawnCommand extends PlayerCommand {
 
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        // Make sure the command executor is a player
-        try {
-            if (Spawn.getInstance().getFirstSpawn() != null) {
-                player.teleport(Spawn.getInstance().getFirstSpawn());
-            } else {
-                player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
-            }
-        } catch (NullPointerException ex) {
-            // TODO ljacqu 20151119: Catching NullPointerException is never a good idea. Find what can cause one instead
-            ConsoleLogger.showError(ex.getMessage());
+        if (commandService.getSpawnLoader().getFirstSpawn() != null) {
+            player.teleport(commandService.getSpawnLoader().getFirstSpawn());
+        } else {
+            player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
         }
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java

@@ -1,9 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.settings.Spawn;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -12,14 +10,10 @@ public class SetFirstSpawnCommand extends PlayerCommand {
 
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        try {
-            if (Spawn.getInstance().setFirstSpawn(player.getLocation())) {
-                player.sendMessage("[AuthMe] Correctly defined new first spawn point");
-            } else {
-                player.sendMessage("[AuthMe] SetFirstSpawn has failed, please retry");
-            }
-        } catch (NullPointerException ex) {
-            ConsoleLogger.showError(ex.getMessage());
+        if (commandService.getSpawnLoader().setFirstSpawn(player.getLocation())) {
+            player.sendMessage("[AuthMe] Correctly defined new first spawn point");
+        } else {
+            player.sendMessage("[AuthMe] SetFirstSpawn has failed, please retry");
         }
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java

@@ -1,9 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.settings.Spawn;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -12,14 +10,10 @@ public class SetSpawnCommand extends PlayerCommand {
 
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        try {
-            if (Spawn.getInstance().setSpawn(player.getLocation())) {
-                player.sendMessage("[AuthMe] Correctly defined new spawn point");
-            } else {
-                player.sendMessage("[AuthMe] SetSpawn has failed, please retry");
-            }
-        } catch (NullPointerException ex) {
-            ConsoleLogger.showError(ex.getMessage());
+        if (commandService.getSpawnLoader().setSpawn(player.getLocation())) {
+            player.sendMessage("[AuthMe] Correctly defined new spawn point");
+        } else {
+            player.sendMessage("[AuthMe] SetSpawn has failed, please retry");
         }
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java

@@ -1,9 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.settings.Spawn;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -12,14 +10,10 @@ public class SpawnCommand extends PlayerCommand {
 
     @Override
     public void runCommand(Player player, List<String> arguments, CommandService commandService) {
-        try {
-            if (Spawn.getInstance().getSpawn() != null) {
-                player.teleport(Spawn.getInstance().getSpawn());
-            } else {
-                player.sendMessage("[AuthMe] Spawn has failed, please try to define the spawn");
-            }
-        } catch (NullPointerException ex) {
-            ConsoleLogger.showError(ex.getMessage());
+        if (commandService.getSpawnLoader().getSpawn() != null) {
+            player.teleport(commandService.getSpawnLoader().getSpawn());
+        } else {
+            player.sendMessage("[AuthMe] Spawn has failed, please try to define the spawn");
         }
     }
 }