Merge pull request #37 from DeathsGun/bugs/forge_versions

Fixed forge version of mods showing up

Author: DeathsGun

src/main/java/xyz/deathsgun/modmanager/providers/modrinth/Modrinth.java

@@ -42,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class Modrinth implements IModProvider {
 
@@ -146,7 +147,9 @@ public List<ModVersion> getVersionsForMod(String id) throws Exception {
         if (response.statusCode() != 200) {
             throw new Exception(response.body());
         }
-        return Version.toModVersion(gson.fromJson(response.body(), new TypeToken<ArrayList<Version>>() {
-        }.getType()));
+        List<Version> versions = gson.fromJson(response.body(), new TypeToken<ArrayList<Version>>() {
+        }.getType());
+        versions = versions.stream().filter(v -> v.getLoaders().contains("fabric")).collect(Collectors.toList());
+        return Version.toModVersion(versions);
     }
 }

src/main/java/xyz/deathsgun/modmanager/providers/modrinth/model/Version.java

@@ -37,15 +37,20 @@ public class Version {
     @SerializedName("game_versions")
     private List<String> gameVersions;
     private List<File> files;
+    private List<String> loaders;
 
-    public static ArrayList<ModVersion> toModVersion(ArrayList<Version> versions) {
+    public static ArrayList<ModVersion> toModVersion(List<Version> versions) {
         ArrayList<ModVersion> result = new ArrayList<>();
         for (Version version : versions) {
             result.add(new ModVersion(version.version, version.changelog, VersionType.fromString(version.version), version.releaseDate, version.gameVersions, File.toFiles(version.files)));
         }
         return result;
     }
 
+    public List<String> getLoaders() {
+        return loaders;
+    }
+
     private static class File {
         private String url;
         private String filename;

src/main/java/xyz/deathsgun/modmanager/util/FabricMods.java

@@ -19,6 +19,7 @@
 import com.google.gson.Gson;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
+import org.apache.logging.log4j.LogManager;
 import xyz.deathsgun.modmanager.api.mod.SummarizedMod;
 import xyz.deathsgun.modmanager.model.ReducedModMetadata;
 
@@ -47,6 +48,10 @@ public static Path getJarFromModContainer(String id, String name) throws Excepti
         for (Path path : jars) {
             ZipFile zipFile = new ZipFile(path.toFile());
             ZipEntry entry = zipFile.getEntry("fabric.mod.json");
+            if (entry == null) {
+                LogManager.getLogger().warn("No fabric.mod.json found in {}", path);
+                continue;
+            }
             ReducedModMetadata metadata = gson.fromJson(new InputStreamReader(zipFile.getInputStream(entry)), ReducedModMetadata.class);
             zipFile.close();
             if (metadata.getId().equals(id) || metadata.getName().equals(name)) {