Added 1.14 support and metrics

Author: biscuut

GenBucketPlugin/pom.xml

@@ -9,7 +9,7 @@
     <artifactId>GenBucketPlugin</artifactId>
     <packaging>jar</packaging>
     <name>GenBucketPlugin</name>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 
     <repositories>
         <repository>
@@ -27,6 +27,18 @@
     </repositories>
 
     <dependencies>
+        <!--<dependency>-->
+        <!--<groupId>org.spigotmc</groupId>-->
+        <!--<artifactId>spigot-api</artifactId>-->
+        <!--<version>1.14.1-R0.1-SNAPSHOT</version>-->
+        <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+        <!--<groupId>org.spigotmc</groupId>-->
+        <!--<artifactId>spigot</artifactId>-->
+        <!--<version>1.14.1-R0.1-SNAPSHOT</version>-->
+        <!--<scope>provided</scope>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/GenBucket.java

@@ -2,21 +2,24 @@
 
 import codes.biscuit.genbucket.commands.GenBucketAdminCommand;
 import codes.biscuit.genbucket.commands.GenBucketCommand;
-import codes.biscuit.genbucket.listeners.PlayerListener;
 import codes.biscuit.genbucket.hooks.HookUtils;
+import codes.biscuit.genbucket.hooks.MetricsLite;
+import codes.biscuit.genbucket.listeners.PlayerListener;
 import codes.biscuit.genbucket.utils.BucketManager;
 import codes.biscuit.genbucket.utils.ConfigValues;
 import codes.biscuit.genbucket.utils.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.regex.Pattern;
+
 public class GenBucket extends JavaPlugin {
 
     private ConfigValues configValues;
     private Utils utils;
     private HookUtils hookUtils;
     private BucketManager bucketManager;
-    private boolean underOneThirteen = false;
+    private int minecraftVersion = -1;
 
     @Override
     public void onEnable() {
@@ -33,11 +36,10 @@ public void onEnable() {
         utils.registerRecipes();
         utils.updateConfig();
         configValues.loadBuckets();
-        String bukkitVersion = Bukkit.getVersion();
-        bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
-        if (!bukkitVersion.equals("1.13")) {
-            underOneThirteen = true;
+        if (minecraftVersion == -1) {
+            minecraftVersion = Integer.valueOf(Bukkit.getBukkitVersion().split(Pattern.quote("-"))[0].split(Pattern.quote("."))[1]);
         }
+        new MetricsLite(this);
     }
 
     public ConfigValues getConfigValues() {
@@ -56,7 +58,8 @@ public BucketManager getBucketManager() {
         return bucketManager;
     }
 
-    public boolean isUnderOneThirteen() {
-        return underOneThirteen;
+    // using mc 1.8 to 1.12
+    public boolean usingOldAPI() {
+        return minecraftVersion < 13;
     }
 }

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/hooks/HookUtils.java

@@ -48,8 +48,8 @@ public HookUtils(GenBucket main) {
             main.getLogger().info("Hooked into CoreProtect");
             enabledHooks.put(Hooks.COREPROTECT, new CoreProtectHook());
         }
-        if (main.isUnderOneThirteen()) {
-            main.getLogger().info("Hooked into Minecraft < 1.13");
+        if (main.usingOldAPI()) {
+            main.getLogger().info("Hooked into Minecraft 1.8-1.12");
             enabledHooks.put(Hooks.MINECRAFTONEEIGHT, new Minecraft_1_8());
         }
     }