[1.10.2] Fixed ordering of Forge versions

3arthqu4ke · Jul 17, 2024 · a4632d5 · a4632d5
1 parent ff2ddb1
commit a4632d5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/...mc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeIndexCache.java b/...mc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeIndexCache.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 import static me.earth.headlessmc.launcher.util.URLs.url;
@@ -31,6 +32,7 @@ protected List<ForgeVersion> read(JsonElement element) throws IOException {
             result.add(version);
         }
 
+        result.sort(Comparator.reverseOrder());
         return result;
     }
 

diff --git a/...essmc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeVersion.java b/...essmc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeVersion.java
@@ -7,20 +7,35 @@
 import java.util.List;
 
 @Data
-public class ForgeVersion implements HasName {
+public class ForgeVersion implements HasName, Comparable<ForgeVersion> {
     @SerializedName("requires")
     private List<Requires> requires;
 
     @SerializedName("version")
     private String name;
 
-    @Data
-    public static class Requires {
-        @SerializedName("equals")
-        private String equals;
-
-        // @SerializedName("uid") <- check this
-        // private String netMinecraft; seems to always be "net.minecraft"
+    @Override
+    public int compareTo(ForgeVersion other) {
+        if (this.name.equals(other.getName())) {
+            return 0;
+        }
+
+        String[] version1 = this.name.split("[-.]");
+        String[] version2 = other.getName().split("[-.]");
+        for (int i = 0; i < version1.length && i < version2.length; i++) {
+            int compare;
+            try {
+                compare = Integer.compare(Integer.parseInt(version1[i]), Integer.parseInt(version2[i]));
+            } catch (NumberFormatException e) {
+                compare = String.CASE_INSENSITIVE_ORDER.compare(version1[i], version2[i]);
+            }
+
+            if (compare != 0) {
+                return compare;
+            }
+        }
+
+        return Integer.compare(version2.length, version1.length);
     }
 
     public String getVersion() {
@@ -31,4 +46,13 @@ public String getFullName() {
         return getVersion() + "-" + getName();
     }
 
+    @Data
+    public static class Requires {
+        @SerializedName("equals")
+        private String equals;
+
+        // @SerializedName("uid") <- check this
+        // private String netMinecraft; seems to always be "net.minecraft"
+    }
+
 }