fix: only show new updates for your current version

src/main/java/net/asodev/islandutils/IslandUtils.java

@@ -11,6 +11,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +22,8 @@ public class IslandUtils implements ModInitializer {
     public static UpdateManager updater;
     public static ResourcePackUpdater packUpdater;
 
-    public static String version = "";
+    public static Version version;
+    public static String versionString;
     public static AvailableUpdate availableUpdate;
     private static boolean isPreRelease = false;
 
@@ -31,11 +33,14 @@ public void onInitialize() {
         FriendsInGame.init();
 
         Optional<ModContainer> container = FabricLoader.getInstance().getModContainer("islandutils");
-        container.ifPresent(modContainer -> version = modContainer.getMetadata().getVersion().getFriendlyString());
+        container.ifPresent(modContainer -> {
+            version = modContainer.getMetadata().getVersion();
+            versionString = version.getFriendlyString();
+        });
 
         updater = new UpdateManager();
-        isPreRelease = version.contains("-pre") || FabricLoader.getInstance().isDevelopmentEnvironment();
-        if (!version.contains("-pre")) {
+        isPreRelease = versionString.contains("-pre") || FabricLoader.getInstance().isDevelopmentEnvironment();
+        if (!versionString.contains("-pre")) {
             updater.runUpdateCheck();
         }
 

src/main/java/net/asodev/islandutils/util/updater/UpdateManager.java

@@ -1,18 +1,28 @@
 package net.asodev.islandutils.util.updater;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.terraformersmc.modmenu.util.mod.Mod;
 import net.asodev.islandutils.IslandUtils;
 import net.asodev.islandutils.util.updater.schema.AvailableUpdate;
-import net.asodev.islandutils.util.updater.schema.GithubRelease;
+import net.asodev.islandutils.util.updater.schema.ModrinthVersion;
+import net.fabricmc.loader.api.Version;
+import net.fabricmc.loader.api.VersionParsingException;
+import net.minecraft.SharedConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URI;
+import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public class UpdateManager {
-
+    private static final Logger logger = LoggerFactory.getLogger(UpdateManager.class);
     HttpClient client;
     Gson gson;
 
@@ -21,14 +31,22 @@ public UpdateManager() {
         gson = new Gson();
     }
 
-    public CompletableFuture<GithubRelease> checkForUpdates() throws Exception {
-        CompletableFuture<GithubRelease> f = new CompletableFuture<>();
+    public CompletableFuture<List<ModrinthVersion>> checkForUpdates() throws Exception {
+        CompletableFuture<List<ModrinthVersion>> f = new CompletableFuture<>();
+        String version = "[\"" + SharedConstants.getCurrentVersion().getName() + "\"]";
+        String url = String.format(
+                "https://api.modrinth.com/v2/project/island-utils/version?game_versions=%s&loaders=%s",
+                URLEncoder.encode(version, StandardCharsets.UTF_8),
+                URLEncoder.encode("[\"fabric\"]", StandardCharsets.UTF_8)
+        );
 
-        URI updatorURI = new URI("https://api.github.com/repos/AsoDesu/IslandUtils/releases/latest");
+        URI updatorURI = new URI(url);
         HttpRequest req = HttpRequest.newBuilder(updatorURI).GET().build();
 
         client.sendAsync(req, HttpResponse.BodyHandlers.ofString()).thenAccept(res -> {
-            f.complete(gson.fromJson(res.body(), GithubRelease.class));
+            TypeToken<?> type = TypeToken.getParameterized(List.class, ModrinthVersion.class);
+            List<ModrinthVersion> json = (List<ModrinthVersion>) gson.fromJson(res.body(), type);
+            f.complete(json);
         });
 
         return f;
@@ -38,13 +56,26 @@ public void runUpdateCheck() {
         try {
             checkForUpdates().thenAccept(res -> {
                 if (res == null) return;
-                if (!IslandUtils.version.equals(res.getTagName())) {
+                ModrinthVersion newVersion = null;
+                for (ModrinthVersion version : res) {
+                    try {
+                        Version updateVersion = Version.parse(version.version_number());
+                        if (IslandUtils.version.compareTo(updateVersion) < 0) {
+                            newVersion = version;
+                            break;
+                        }
+                    } catch (VersionParsingException e) {
+                        logger.error("Unable to parse version: '" + version.version_number() + "'");
+                    }
+                }
+                if (newVersion != null) {
+                    String version = newVersion.version_number();
                     IslandUtils.availableUpdate =
-                            new AvailableUpdate(res.getName(), res.getTagName(), "https://modrinth.com/mod/island-utils/version/" + res.getTagName());
+                            new AvailableUpdate(newVersion.name(), version, "https://modrinth.com/mod/island-utils/version/" + version);
                 }
             });
         } catch (Exception e) {
-            System.err.println("Failed to get IslandUtils Update!");
+            logger.error("Failed to get IslandUtils Update!");
         }
     }