Merge pull request #21 from Dev-LotusStudio/commands-refactoring

Commands refactoring

Author: Referix

src/main/java/dev/lotus/studio/Main.java

@@ -2,6 +2,7 @@
 
 import dev.lotus.studio.database.DatabaseInitializer;
 import dev.lotus.studio.database.playerdata.PlayerDataService;
+import dev.lotus.studio.safezone.SafeZonePreloaded;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -15,6 +16,9 @@
 import dev.lotus.studio.playerdata.PlayerManager;
 import dev.lotus.studio.safezone.SafeZoneManager;
 
+import java.util.Optional;
+import java.util.logging.Level;
+
 public final class Main extends JavaPlugin {
 
     private static Main instance;
@@ -27,35 +31,49 @@ public final class Main extends JavaPlugin {
     @Override
     public void onEnable() {
         metric();
-        instance = this;
-        PlayerManager.getInstance().startGlobalTask();
-        //cfg
-        itemManager = new CustomItemManager();
-        databaseInitializer = new DatabaseInitializer(this);
-        playerDataBase = databaseInitializer.getPlayerDataBase();
-        safeZoneDataService = databaseInitializer.getSaveZoneDataService();
+        if (initialize()){
+            getLogger().log(Level.INFO, "Plugin has been enabled!");
+        }
+    }
 
 
+    public boolean initialize() {
+        try {
+            instance = this;
+            PlayerManager.getInstance().startGlobalTask();
+            //cfg
+            itemManager = new CustomItemManager();
+            databaseInitializer = new DatabaseInitializer(this);
+            playerDataBase = databaseInitializer.getPlayerDataBase();
+            safeZoneDataService = databaseInitializer.getSaveZoneDataService();
 
-        itemManager.loadItems();
-        getServer().getPluginManager().registerEvents(new ArmorEvent(itemManager),this);
-        getServer().getPluginManager().registerEvents(new EatEvent(itemManager),this);
-        getServer().getPluginManager().registerEvents(new JoinLeaveEvent(playerDataBase),this);
-        getLogger().info("Предметы загружены из items.yml.");
 
-        new PlayerBar(this,itemManager);
 
+            itemManager.loadItems();
+            getServer().getPluginManager().registerEvents(new ArmorEvent(itemManager),this);
+            getServer().getPluginManager().registerEvents(new EatEvent(itemManager),this);
+            getServer().getPluginManager().registerEvents(new JoinLeaveEvent(playerDataBase),this);
+            getLogger().info("Предметы загружены из items.yml.");
 
-        new MainCommand("lotus", itemManager);
+            new PlayerBar(this,itemManager);
 
-        SafeZoneManager.getInstance().initialize(safeZoneDataService);
 
+            new MainCommand("lotus", itemManager, SafeZoneManager.getInstance());
+
+            SafeZoneManager.getInstance().initialize(safeZoneDataService);
+        } catch (Exception e) {
+            getLogger().severe("Exeption Initialize plugin:  " + e.getMessage());
+            return false;
+        }
+        return true;
     }
 
     @Override
     public void onDisable() {
        PlayerManager.getInstance().getGlobalTask().cancel();
-       SafeZoneManager.getInstance().getPreloaded().stopTask();
+        Optional.ofNullable(SafeZoneManager.getInstance().getPreloaded())
+                .ifPresent(SafeZonePreloaded::stopTask);
+
         // Закриття DataBase
         if (databaseInitializer != null) {
             databaseInitializer.closeConnection();