MCVersion should compare MINOR version rather than detailed version!

EverNife · Feb 11, 2023 · 5092083 · 5092083
1 parent 12fdaec
commit 5092083
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/br/com/finalcraft/evernifecore/version/MCDetailedVersion.java b/src/main/java/br/com/finalcraft/evernifecore/version/MCDetailedVersion.java
@@ -50,17 +50,23 @@ public enum MCDetailedVersion {
 
     // Operations
     private int value;
+    private int shortValue;
     private String shortVersion;
 
-    MCDetailedVersion(int value, String ShortVersion) {
+    MCDetailedVersion(int value, String shortVersion) {
         this.value = value;
-        this.shortVersion = ShortVersion;
+        this.shortValue = Integer.parseInt(shortVersion.replace("v", "").replace("_", ""));
+        this.shortVersion = shortVersion;
     }
 
     public int getValue() {
         return value;
     }
 
+    public int getShortValue() {
+        return shortValue;
+    }
+
     public String getShortVersion() {
         return shortVersion;
     }

diff --git a/src/main/java/br/com/finalcraft/evernifecore/version/MCVersion.java b/src/main/java/br/com/finalcraft/evernifecore/version/MCVersion.java
@@ -23,23 +23,23 @@ public MCDetailedVersion getDetailedVersion() {
     }
 
     public static boolean isLower(MCVersion otherVersion) {
-        return MCDetailedVersion.getCurrent().isLower(otherVersion.getDetailedVersion());
+        return MCDetailedVersion.getCurrent().getShortValue() < otherVersion.getDetailedVersion().getShortValue();
     }
 
     public static boolean isLowerEquals(MCVersion otherVersion) {
-        return MCDetailedVersion.getCurrent().isLowerEquals(otherVersion.getDetailedVersion());
+        return MCDetailedVersion.getCurrent().getShortValue() <= otherVersion.getDetailedVersion().getShortValue();
     }
 
     public static boolean isEqual(MCVersion otherVersion) {
-        return MCDetailedVersion.getCurrent().isEqual(otherVersion.getDetailedVersion());
+        return MCDetailedVersion.getCurrent().getShortValue() == otherVersion.getDetailedVersion().getShortValue();
     }
 
     public static boolean isHigher(MCVersion otherVersion) {
-        return MCDetailedVersion.getCurrent().isHigher(otherVersion.getDetailedVersion());
+        return MCDetailedVersion.getCurrent().getShortValue() > otherVersion.getDetailedVersion().getShortValue();
     }
 
     public static boolean isHigherEquals(MCVersion otherVersion) {
-        return MCDetailedVersion.getCurrent().isHigherEquals(otherVersion.getDetailedVersion());
+        return MCDetailedVersion.getCurrent().getShortValue() >= otherVersion.getDetailedVersion().getShortValue();
     }
 
     // -----------------------------------------------------------------------------------------------------------------