Fixed versions with patch version 0 being different from ones without…

… one.
JakeGBLP · Jan 17, 2025 · 53c71b0 · 53c71b0
1 parent 5e76ffa
commit 53c71b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/it/jakegblp/lusk/elements/version/types/VersionClassInfos.java b/src/main/java/it/jakegblp/lusk/elements/version/types/VersionClassInfos.java
@@ -49,7 +49,9 @@ public boolean canParse(final @NotNull ParseContext context) {
 
                         @Override
                         public @NotNull String toVariableNameString(final Semver v) {
-                            return v.toString();
+                            String s = v.toString();
+                            if (s.endsWith(".0")) s = s.substring(0, s.length() - 2);
+                            return s;
                         }
 
                         @Override

diff --git a/src/main/java/it/jakegblp/lusk/utils/Constants.java b/src/main/java/it/jakegblp/lusk/utils/Constants.java
@@ -162,23 +162,23 @@ public class Constants {
         put(109, parseVersion("1.9.2"));
         put(110, parseVersion("1.9.4"));
         put(210, parseVersion("1.10.2"));
-        put(315, parseVersion("1.11.0"));
+        put(315, parseVersion("1.11"));
         put(316, parseVersion("1.11.2"));
         put(335, parseVersion("1.12.0"));
         put(338, parseVersion("1.12.1"));
         put(340, parseVersion("1.12.2"));
         put(393, parseVersion("1.13"));
         put(401, parseVersion("1.13.1"));
         put(404, parseVersion("1.13.2"));
-        put(477, parseVersion("1.14.0"));
+        put(477, parseVersion("1.14"));
         put(480, parseVersion("1.14.1"));
         put(485, parseVersion("1.14.2"));
         put(490, parseVersion("1.14.3"));
         put(498, parseVersion("1.14.4"));
         put(573, parseVersion("1.15"));
         put(575, parseVersion("1.15.1"));
         put(577, parseVersion("1.15.2"));
-        put(735, parseVersion("1.16.0"));
+        put(735, parseVersion("1.16"));
         put(736, parseVersion("1.16.1"));
         put(751, parseVersion("1.16.2"));
         put(753, parseVersion("1.16.3"));

diff --git a/src/main/java/it/jakegblp/lusk/utils/LuskUtils.java b/src/main/java/it/jakegblp/lusk/utils/LuskUtils.java
@@ -19,6 +19,7 @@
 public class LuskUtils {
 
     public static Semver parseVersion(String s) {
+        if (s.matches("^\\d+.\\d+$")) s += ".0";
         return new Semver(s, Semver.SemverType.LOOSE);
     }