2.6.4

Author: Ajneb97

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>svar.ajneb97</groupId>
     <artifactId>ServerVariables</artifactId>
-    <version>2.6.3</version>
+    <version>2.6.4</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -27,14 +27,14 @@
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
+            <artifactId>spigot-api</artifactId>
             <version>1.21.7-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/svar/ajneb97/config/CustomConfig.java

@@ -1,6 +1,5 @@
 package svar.ajneb97.config;
 
-import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -100,8 +99,6 @@ public boolean reloadConfig() {
     }
 
     public static YamlConfiguration loadConfiguration(@NotNull File file) {
-        Validate.notNull(file, "File cannot be null");
-
         YamlConfiguration config = new YamlConfiguration();
 
         try {

src/main/java/svar/ajneb97/managers/PlayerVariablesManager.java

@@ -1,6 +1,5 @@
 package svar.ajneb97.managers;
 
-import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
@@ -118,7 +117,7 @@ public VariableResult modifyVariable(String playerName, String variableName, Str
         }
 
         //Value must be a number
-        if(!NumberUtils.isNumber(value)){
+        if(!MathUtils.isParsable(value)){
             return VariableResult.error(config.getString("messages.invalidValue"));
         }
 

src/main/java/svar/ajneb97/managers/ServerVariablesManager.java

@@ -1,6 +1,5 @@
 package svar.ajneb97.managers;
 
-import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.configuration.file.FileConfiguration;
 import svar.ajneb97.ServerVariables;
 import svar.ajneb97.api.VariableChangeEvent;
@@ -51,7 +50,7 @@ public VariableResult modifyVariable(String variableName, String value, boolean
             return VariableResult.error(result.getErrorMessage());
         }
 
-        if(!NumberUtils.isNumber(value)){
+        if(!MathUtils.isParsable(value)){
             return VariableResult.error(config.getString("messages.invalidValue"));
         }
 

src/main/java/svar/ajneb97/utils/MathUtils.java

@@ -6,4 +6,39 @@ public static double getDoubleSum(String value1,String value2,boolean add){
         double numericValue = Double.parseDouble(value1);
         return add ? Double.parseDouble(value2)+numericValue : Double.parseDouble(value2)-numericValue;
     }
+
+    // org.apache.commons.lang3.math.NumberUtils
+    public static boolean isParsable(String str) {
+        if (str == null || str.isEmpty()) {
+            return false;
+        } else if (str.charAt(str.length() - 1) == '.') {
+            return false;
+        } else if (str.charAt(0) == '-') {
+            return str.length() == 1 ? false : withDecimalsParsing(str, 1);
+        } else {
+            return withDecimalsParsing(str, 0);
+        }
+    }
+
+    // org.apache.commons.lang3.math.NumberUtils
+    private static boolean withDecimalsParsing(String str, int beginIdx) {
+        int decimalPoints = 0;
+
+        for(int i = beginIdx; i < str.length(); ++i) {
+            boolean isDecimalPoint = str.charAt(i) == '.';
+            if (isDecimalPoint) {
+                ++decimalPoints;
+            }
+
+            if (decimalPoints > 1) {
+                return false;
+            }
+
+            if (!isDecimalPoint && !Character.isDigit(str.charAt(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }