KnarCraft/Minecraft-Server-Launcher
KnarCraft/Minecraft-Server-Launcher
1
0
Fork 0
Code Issues 3 Pull Requests Releases 12 Wiki Activity

Makes the version comparator more generic

Browse Source
This commit is contained in:
Kristian Knarvik 2021-08-03 12:14:59 +02:00
parent 85febdf41b
commit 73faa4408e
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/knarcraft/minecraftserverlauncher/utility/Updater.java
View File

@ -87,17 +87,14 @@ public final class Updater {
public static boolean isVersionHigher(String oldVersion, String newVersion) { public static boolean isVersionHigher(String oldVersion, String newVersion) {
String[] oldVersionParts = oldVersion.split("\\."); String[] oldVersionParts = oldVersion.split("\\.");
String[] newVersionParts = newVersion.split("\\."); String[] newVersionParts = newVersion.split("\\.");
int[] oldVersionInts = new int[]{Integer.parseInt(oldVersionParts[0]), Integer.parseInt(oldVersionParts[1]), for (int i = 0; i < Math.max(oldVersionParts.length, newVersionParts.length); i++) {
Integer.parseInt(oldVersionParts[2])}; int oldVersionNumber = oldVersionParts.length > i ? Integer.parseInt(oldVersionParts[i]) : 0;
int[] newVersionInts = new int[]{Integer.parseInt(newVersionParts[0]), Integer.parseInt(newVersionParts[1]), int newVersionNumber = newVersionParts.length > i ? Integer.parseInt(newVersionParts[i]) : 0;
Integer.parseInt(newVersionParts[2])}; if (newVersionNumber > oldVersionNumber) {
if (newVersionInts[0] > oldVersionInts[0]) {
return true;
} else if (newVersionInts[0] == oldVersionInts[0]) {
if (newVersionInts[1] > oldVersionInts[1]) {
return true; return true;
} else if (newVersionNumber < oldVersionNumber) {
return false;
} }
return newVersionInts[1] == oldVersionInts[1] && newVersionInts[2] > oldVersionInts[2];
} }
return false; return false;
} }

2
src/test/java/net/knarcraft/minecraftserverlauncher/utility/UpdaterTest.java
View File

@ -16,6 +16,8 @@ public class UpdaterTest {
assertFalse(Updater.isVersionHigher("1.2.1", "1.1.6")); assertFalse(Updater.isVersionHigher("1.2.1", "1.1.6"));
assertTrue(Updater.isVersionHigher("1.2.1", "2.1.6")); assertTrue(Updater.isVersionHigher("1.2.1", "2.1.6"));
assertTrue(Updater.isVersionHigher("1.2.1", "2.0.0")); assertTrue(Updater.isVersionHigher("1.2.1", "2.0.0"));
assertTrue(Updater.isVersionHigher("1.2", "1.2.1"));
assertTrue(Updater.isVersionHigher("1.1.2", "1.2"));
} }
} }