1.0.1 & Finished UpdateChecker

- Bumped version to 1.0.1
- Moved UpdateChecker::hasNewVersion into VersionUtilities
- Fix a bug that would result in lower version being 
detected as a new version in hasNewVersion 
- Added a unit test for VersionUtilities
- Removed uuidToName inside PlayerUtilities
- Code cleanup

Author: Timmi6790

build.gradle

@@ -28,7 +28,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '1.0.0'
+version = '1.0.1'
 group = 'de.timmi6790.mcmod'
 archivesBaseName = 'RandomMineplexMod'
 
@@ -48,6 +48,15 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.12'
 
     implementation 'com.github.Timmi6790:Commons:4e06ba7769'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
+    testImplementation 'org.assertj:assertj-core:3.17.2'
+    testImplementation 'org.mockito:mockito-core:3.5.13'
+    testImplementation 'org.mockito:mockito-inline:3.5.13'
+    testImplementation 'org.mockito:mockito-junit-jupiter:3.5.13'
 }
 
 minecraft {

src/main/java/de/timmi6790/mpmod/Reference.java

@@ -1,9 +1,12 @@
 package de.timmi6790.mpmod;
 
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
 public class Reference {
     public static final String MODID = "RMM";
     public static final String NAME = "RandomMineplexMod";
-    public static final String VERSION = "1.0.0";
+    public static final String VERSION = "1.0.1";
     public static final String VERSION_URL = "https://gist.githubusercontent.com/Timmi6790/2ead90ef6f97baeb689d076094e88c09/raw/RandomMineplexMod-Version";
     public static final String DOWNLOAD_URL = "https://github.com/Timmi6790/RandomMineplexMod/releases";
 }

src/main/java/de/timmi6790/mpmod/command/AbstractCommandGroup.java

@@ -24,6 +24,14 @@ public AbstractCommandGroup(final String commandName) {
         super(commandName);
     }
 
+    public String[][] getTabCompleteOptions() {
+        return this.tabCompleteOptions.clone();
+    }
+
+    public void setTabCompleteOptions(final String[][] tabCompleteOptions) {
+        this.tabCompleteOptions = tabCompleteOptions.clone();
+    }
+
     protected Optional<AbstractCommand> getSubCommand(final String name) {
         for (final AbstractCommand command : this.subCommands) {
             if (command.getCommandName().equalsIgnoreCase(name)) {

src/main/java/de/timmi6790/mpmod/listeners/UpdateChecker.java

@@ -3,6 +3,7 @@
 import de.timmi6790.mpmod.McMod;
 import de.timmi6790.mpmod.utilities.EventUtilities;
 import de.timmi6790.mpmod.utilities.MessageBuilder;
+import de.timmi6790.mpmod.utilities.VersionUtilities;
 import lombok.AllArgsConstructor;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.util.EnumChatFormatting;
@@ -13,52 +14,31 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
-import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
-import java.util.StringTokenizer;
 import java.util.concurrent.Executors;
 
 @AllArgsConstructor
 public class UpdateChecker {
     private final McMod mod;
 
-    private boolean hasNewVersion(final String currentVersion, final String otherVersion) {
-        final StringTokenizer currentVersionToken = new StringTokenizer(currentVersion, ".");
-        final StringTokenizer otherVersionToken = new StringTokenizer(otherVersion, ".");
-
-        while (currentVersionToken.hasMoreTokens() || otherVersionToken.hasMoreElements()) {
-            String currentPart = "0";
-            if (currentVersionToken.hasMoreTokens()) {
-                currentPart = currentVersionToken.nextToken();
-            }
-
-            String otherPart = "0";
-            if (otherVersionToken.hasMoreTokens()) {
-                otherPart = otherVersionToken.nextToken();
-            }
-
-            if (otherPart.compareTo(currentPart) > 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     @SubscribeEvent
     public void onServerJoin(final FMLNetworkEvent.ClientConnectedToServerEvent event) {
         // Only run this once
         EventUtilities.unRegisterEvents(this);
 
+        // Only check if we have both a version url and also a download url
+        if (this.mod.getDownloadUrl().isEmpty() || this.mod.getVersionUrl().isEmpty()) {
+            return;
+        }
+
         Executors.newSingleThreadExecutor().submit(() -> {
-                    try {
-                        final URLConnection connection = new URL(this.mod.getVersionUrl()).openConnection();
-                        final String version = new BufferedReader(new InputStreamReader(
-                                connection.getInputStream(),
-                                StandardCharsets.UTF_8
-                        )).readLine();
+                    try (final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(
+                            new URL(this.mod.getVersionUrl()).openConnection().getInputStream(),
+                            StandardCharsets.UTF_8
+                    ))) {
+                        final String version = bufferedReader.readLine();
 
-                        if (!this.mod.getDownloadUrl().isEmpty() && this.hasNewVersion(this.mod.getVersion(), version)) {
+                        if (VersionUtilities.hasNewVersion(this.mod.getVersion(), version)) {
                             new MessageBuilder(this.mod.getModName(), EnumChatFormatting.YELLOW)
                                     .addMessage("\n\nA new version is available!", EnumChatFormatting.GRAY)
                                     .addMessage("\nCurrent version: ", EnumChatFormatting.GRAY)

src/main/java/de/timmi6790/mpmod/utilities/DataUtilities.java

@@ -11,29 +11,41 @@
 
 @UtilityClass
 public class DataUtilities {
-    private final Pattern INTEGER_PATTERN = Pattern.compile("^-?\\d+$");
-    private final Pattern FLOAT_PATTERN = Pattern.compile("[+-]?(\\d+|\\d+\\.\\d+|\\.\\d+|\\d+\\.)([eE]\\d+)?");
-    private final Pattern DOUBLE_PATTERN = Pattern.compile("[\\x00-\\x20]*[+-]?(((((\\p{Digit}+)(\\.)?((\\p{Digit}+)?)([eE][+-]?(\\p{Digit}+))?)|(\\.((\\p{Digit}+))([eE][+-]?(\\p{Digit}+))?)|(((0[xX](\\p{XDigit}+)(\\.)?)|(0[xX](\\p{XDigit}+)?(\\.)(\\p{XDigit}+)))[pP][+-]?(\\p{Digit}+)))[fFdD]?))[\\x00-\\x20]*");
     private final Pattern BOOLEAN_PATTERN = Pattern.compile("true|false", Pattern.CASE_INSENSITIVE);
 
     public boolean isInt(final Object value) {
-        return INTEGER_PATTERN.matcher(String.valueOf(value)).matches();
+        try {
+            Integer.parseInt(String.valueOf(value));
+            return true;
+        } catch (final NumberFormatException ignore) {
+            return false;
+        }
     }
 
     public boolean isDouble(final Object value) {
-        return DOUBLE_PATTERN.matcher(String.valueOf(value)).matches();
+        try {
+            Double.parseDouble(String.valueOf(value));
+            return true;
+        } catch (final NumberFormatException ignore) {
+            return false;
+        }
     }
 
     public boolean isFloat(final Object value) {
-        return FLOAT_PATTERN.matcher(String.valueOf(value)).matches();
+        try {
+            Float.parseFloat(String.valueOf(value));
+            return true;
+        } catch (final NumberFormatException ignore) {
+            return false;
+        }
     }
 
     public boolean isBoolean(final Object value) {
         return BOOLEAN_PATTERN.matcher(String.valueOf(value)).matches();
     }
 
     public boolean hasEmptyArg(final String[] args, final int position) {
-        return (args.length == position + 1 && args[position].length() == 0);
+        return args.length == position + 1 && args[position].length() == 0;
     }
 
     public List<String> getStartWithIgnoreCase(final Collection<String> options, final String start) {

src/main/java/de/timmi6790/mpmod/utilities/PlayerUtilities.java

@@ -1,62 +1,14 @@
 package de.timmi6790.mpmod.utilities;
 
-import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
 
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 @UtilityClass
 public class PlayerUtilities {
-    private final AsyncLoadingCache<UUID, Optional<String>> playerNameCache = Caffeine.newBuilder()
-            .maximumSize(1000)
-            .expireAfterWrite(20, TimeUnit.MINUTES)
-            .buildAsync(uuid -> {
-                try {
-                    final URL url = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + PlayerUtilities.uuidShorter(uuid));
-                    final URLConnection con = url.openConnection();
-
-                    final JsonElement element = new JsonParser().parse(new InputStreamReader(
-                            con.getInputStream(),
-                            StandardCharsets.UTF_8
-                    ));
-
-                    return Optional.of(element.getAsJsonObject().get("name").getAsString());
-                } catch (final Exception ignore) {
-                    return Optional.empty();
-                }
-            });
-
-    @SneakyThrows
-    public Optional<String> uuidToName(final UUID uuid) {
-        final CompletableFuture<Optional<String>> nameFuture = playerNameCache.get(uuid);
-        try {
-            return nameFuture.get(20, TimeUnit.SECONDS);
-        } catch (final ExecutionException | TimeoutException e) {
-            return Optional.empty();
-        }
-    }
-
-    private String uuidShorter(final UUID uuid) {
-        return uuid.toString().replace("-", "");
-    }
-
     public Set<String> getAllPlayersInLobby() {
         final Set<String> playersInLobby = new HashSet<>();
         // Nethandler Players

src/main/java/de/timmi6790/mpmod/utilities/VersionUtilities.java

@@ -0,0 +1,37 @@
+package de.timmi6790.mpmod.utilities;
+
+import lombok.NonNull;
+import lombok.experimental.UtilityClass;
+
+import java.util.StringTokenizer;
+
+@UtilityClass
+public class VersionUtilities {
+    private String getTokenOrDefault(final StringTokenizer tokenizer, final String defaultValue) {
+        if (tokenizer.hasMoreTokens()) {
+            return tokenizer.nextToken();
+        }
+
+        return defaultValue;
+    }
+
+    public boolean hasNewVersion(@NonNull final String currentVersion, @NonNull final String newVersion) {
+        final StringTokenizer currentVersionToken = new StringTokenizer(currentVersion, ".");
+        final StringTokenizer newVersionToken = new StringTokenizer(newVersion, ".");
+
+        while (currentVersionToken.hasMoreTokens() || newVersionToken.hasMoreElements()) {
+            final String currentPart = getTokenOrDefault(currentVersionToken, "0");
+            final String newPart = getTokenOrDefault(newVersionToken, "0");
+
+            final int compareValue = newPart.compareTo(currentPart);
+            if (compareValue > 0) {
+                return true;
+            } else if (compareValue < 0) {
+                return false;
+            }
+        }
+
+        // Equal versions
+        return false;
+    }
+}

src/test/java/de/timmi6790/mpmod/utilities/VersionUtilitiesTest.java

@@ -0,0 +1,26 @@
+package de.timmi6790.mpmod.utilities;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class VersionUtilitiesTest {
+    @ParameterizedTest
+    @ValueSource(strings = {"2", "200000", "1.1.1", "1.0.0.1", "10.0.0", "1.0.1", "1.0.a"})
+    void hasNewVersionHigherVersion(final String higherVersion) {
+        assertThat(VersionUtilities.hasNewVersion("1.0.0", higherVersion)).isTrue();
+    }
+
+    @Test
+    void hasNewVersionEqual() {
+        assertThat(VersionUtilities.hasNewVersion("1.0.0.", "1.0.0")).isFalse();
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"0", "0.9.9", "0.0.0.0.0.0.0.1"})
+    void hasNewVersionLowerVersion(final String lowerVersion) {
+        assertThat(VersionUtilities.hasNewVersion("1.0.0", lowerVersion)).isFalse();
+    }
+}