Update SkriptParticle.java

Author: sovdeeth

src/main/java/com/sovdee/skriptparticles/SkriptParticle.java

@@ -3,7 +3,11 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
 import ch.njol.skript.bstats.bukkit.Metrics;
+import ch.njol.skript.util.Version;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -25,46 +29,73 @@ public class SkriptParticle extends JavaPlugin {
     // text rendering
     // animation?
 
+    @Nullable
     public static SkriptParticle getInstance() {
         return instance;
     }
 
+    @Nullable
     public static SkriptAddon getAddonInstance() {
         return addon;
     }
 
     public static void info(String message) {
+        if (logger == null)
+            return;
         logger.info(message);
     }
 
     public static void warning(String message) {
+        if (logger == null)
+            return;
         logger.warning(message);
     }
 
     public static void severe(String message) {
+        if (logger == null)
+            return;
         logger.severe(message);
     }
 
     public static void debug(String message) {
+        if (logger == null)
+            return;
         if (Skript.debug()) {
             logger.info(message);
         }
     }
 
     @Override
     public void onEnable() {
+        final PluginManager manager = this.getServer().getPluginManager();
+        final Plugin skript = manager.getPlugin("Skript");
+        logger = this.getLogger();
+        if (skript == null || !skript.isEnabled()) {
+            SkriptParticle.severe("Could not find Skript! Make sure you have it installed and that it properly loaded. Disabling...");
+            manager.disablePlugin(this);
+            return;
+        } else if (!Skript.getVersion().isLargerThan(new Version(2, 7, 0))) {
+            SkriptParticle.severe("You are running an unsupported version of Skript. Please update to at least Skript 2.7.0. Disabling...");
+            manager.disablePlugin(this);
+            return;
+        }
         instance = this;
         addon = Skript.registerAddon(this);
         addon.setLanguageFileDirectory("lang");
-        logger = this.getLogger();
         try {
             addon.loadClasses("com.sovdee.skriptparticles");
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (IOException error) {
+            error.printStackTrace();
+            manager.disablePlugin(this);
+            return;
         }
-        int pluginId = 18457;
-        Metrics metrics = new Metrics(this, pluginId);
-        SkriptParticle.info("Skript-Particle has been enabled.");
+        new Metrics(this, 18457);
+        SkriptParticle.info("Successfully enabled skript-particle.");
+    }
 
+    @Override
+    public void onDisable() {
+        instance = null;
+        addon = null;
     }
 }