Retain cross-version compatibility & cleanup (#374)

src/main/java/com/drtshock/playervaults/PlayerVaults.java

@@ -51,14 +51,14 @@ import java.util.UUID;
 import java.util.logging.Level;
 
 public class PlayerVaults extends JavaPlugin {
-
-    private static PlayerVaults instance;
     public static boolean DEBUG = false;
+    private static PlayerVaults instance;
     private final HashMap<String, SignSetInfo> setSign = new HashMap<>();
     // Player name - VaultViewInfo
     private final HashMap<String, VaultViewInfo> inVault = new HashMap<>();
     // VaultViewInfo - Inventory
     private final HashMap<String, Inventory> openInventories = new HashMap<>();
+    private final Set<Material> blockedMats = new HashSet<>();
     private Economy economy = null;
     private boolean useVault = false;
     private YamlConfiguration signs;
@@ -68,7 +68,24 @@ public class PlayerVaults extends JavaPlugin {
     private File backupsFolder = null;
     private File uuidData;
     private File vaultData;
-    private final Set<Material> blockedMats = new HashSet<>();
+    private String _versionString;
+
+    public static PlayerVaults getInstance() {
+        return instance;
+    }
+
+    public static void debug(String s, long start) {
+        long elapsed = System.currentTimeMillis() - start;
+        if (DEBUG || elapsed > 4) {
+            Bukkit.getLogger().log(Level.INFO, "At {0}. Time since start: {1}ms", new Object[]{s, (elapsed)});
+        }
+    }
+
+    public static void debug(String s) {
+        if (DEBUG) {
+            Bukkit.getLogger().log(Level.INFO, s);
+        }
+    }
 
     @Override
     public void onEnable() {
@@ -144,7 +161,7 @@ public class PlayerVaults extends JavaPlugin {
     }
 
     @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String label, String args[]) {
+    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
         if (cmd.getName().equalsIgnoreCase("pvreload")) {
             reloadConfig();
             loadConfig(); // To update blocked materials.
@@ -362,20 +379,19 @@ public class PlayerVaults extends JavaPlugin {
         return blockedMats.contains(mat);
     }
 
-    public static PlayerVaults getInstance() {
-        return instance;
-    }
-
-    public static void debug(String s, long start) {
-        long elapsed = System.currentTimeMillis() - start;
-        if (DEBUG || elapsed > 4) {
-            Bukkit.getLogger().log(Level.INFO, "At {0}. Time since start: {1}ms", new Object[]{s, (elapsed)});
-        }
-    }
-
-    public static void debug(String s) {
-        if (DEBUG) {
-            Bukkit.getLogger().log(Level.INFO, s);
+    /**
+     * Tries to grab the server version as a string.
+     *
+     * @return Version as raw string
+     */
+    public String getVersion() {
+        if (_versionString == null) {
+            if (Bukkit.getServer() == null) {
+                return null;
+            }
+            final String name = Bukkit.getServer().getClass().getPackage().getName();
+            _versionString = name.substring(name.lastIndexOf(46) + 1) + ".";
         }
+        return _versionString;
     }
 }