0.12.7 - Fix version comparator AGAIN

Author: AppleDash

SaneEconomyCore/pom.xml

@@ -9,7 +9,7 @@
         <version>0</version>
     </parent>
     <artifactId>SaneEconomyCore</artifactId>
-    <version>0.12.6-SNAPSHOT</version>
+    <version>0.12.7-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

SaneEconomyCore/src/main/java/org/appledash/saneeconomy/updates/VersionComparer.java

@@ -17,20 +17,16 @@ public static boolean isSemVerGreaterThan(String first, String second) {
         int[] firstParts = intifyParts(first);
         int[] secondParts = intifyParts(second);
 
-        if (secondParts[0] > firstParts[0]) {
-            return true;
-        }
-
-        if (secondParts[1] > firstParts[1]) {
-            return true;
-        }
-
-        return secondParts[2] > firstParts[2];
+        return computeInt(secondParts) > computeInt(firstParts);
     }
 
     private static int[] intifyParts(String version) {
         String[] firstParts = version.split("\\.");
 
         return new int[] { Integer.valueOf(firstParts[0]), Integer.valueOf(firstParts[1]), Integer.valueOf(firstParts[2]) };
     }
+
+    private static int computeInt(int[] parts) {
+        return (parts[0] * 1000000) + (parts[1] * 1000) + parts[2];
+    }
 }

SaneEconomyCore/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: SaneEconomy
 author: AppleDash
 main: org.appledash.saneeconomy.SaneEconomy
-version: 0.12.6
+version: 0.12.7
 load: STARTUP
 softdepend: [Vault]
 commands:

SaneEconomyCore/src/test/java/org/appledash/saneeconomy/test/VersionComparerTest.java

@@ -15,5 +15,6 @@ public void testVersionComparer() {
         Assert.assertFalse(VersionComparer.isSemVerGreaterThan("2.0.0", "1.0.0"));
         Assert.assertTrue(VersionComparer.isSemVerGreaterThan("0.1.0", "0.2.0"));
         Assert.assertTrue(VersionComparer.isSemVerGreaterThan("1.0.0", "2.0.0"));
+        Assert.assertFalse(VersionComparer.isSemVerGreaterThan("0.12.6", "0.5.7"));
     }
 }

SaneEconomyMobKills/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.appledash</groupId>
             <artifactId>SaneEconomyCore</artifactId>
-            <version>0.12.6-SNAPSHOT</version>
+            <version>0.12.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

SaneEconomyOnlineTime/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.appledash</groupId>
             <artifactId>SaneEconomyCore</artifactId>
-            <version>0.12.6-SNAPSHOT</version>
+            <version>0.12.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

SaneEconomySignShop/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.appledash</groupId>
             <artifactId>SaneEconomyCore</artifactId>
-            <version>0.12.6-SNAPSHOT</version>
+            <version>0.12.7-SNAPSHOT</version>
         </dependency>
     </dependencies>