deploy: 34a0a61

Author: RedLime

ModFileLoader/ModFileLoader-1.0-SNAPSHOT-all.jar

@@ -17,16 +17,14 @@
 public class MCSRModLoader {
 
     public static final String VERSION = "v4";
-    private static final Path MODPACKS_PATH = Paths.get("./modpacks/" + VERSION);
+    private static final Path MODPACKS_PATH = Paths.get("modpacks/" + VERSION);
     public static final Gson GSON = new GsonBuilder().serializeNulls().disableHtmlEscaping().create();
-    public static String GITHUB_TOKEN = "none";
 
     public static void main(String[] args) throws Throwable {
-        GITHUB_TOKEN = args[0];
         List<ModInfo> modInfoList = new ArrayList<>();
         FabricLoader fabricLoader = null;
 
-        mod: for (JsonElement jsonElement : HttpRequestHelper.getJsonFromUrl("https://raw.githubusercontent.com/tildejustin/mcsr-meta/schema-6/mods.json").getAsJsonObject().getAsJsonArray("mods")) {
+        mod: for (JsonElement jsonElement : HttpRequestHelper.getJsonFromUrl("https://raw.githubusercontent.com/tildejustin/mcsr-meta/schema-7/mods.json").getAsJsonObject().getAsJsonArray("mods")) {
             ModInfo modInfo = GSON.fromJson(jsonElement, ModInfo.class);
             for (ModInfo.ModVersion version : modInfo.versions()) {
                 for (String s : version.target_version()) {
@@ -66,12 +64,12 @@ public static void main(String[] args) throws Throwable {
         Set<String> osSet = Set.of("Windows", "OSX", "Linux");
 
         for (String os : osSet) {
-            Set<String> whitelist = Sets.newHashSet("antigone", "fast_reset", "krypton", "lazydfu", "lazystronghold", "lithium", "starlight", "voyager", "speedrunapi", "state-output");
+            Set<String> whitelist = Sets.newHashSet("antigone", "antiresourcereload", "boundlesswindow", "fast_reset", "krypton", "lazydfu", "lazystronghold", "lithium", "speedrunapi", "starlight", "state-output", "voyager");
             whitelist.add("OSX".equals(os) ? "sodiummac" : "sodium");
 
-            Set<String> proWhitelist = Sets.newHashSet("standardsettings", "antiresourcereload");
+            Set<String> proWhitelist = Sets.newHashSet("standardsettings");
             proWhitelist.addAll(whitelist);
-            Set<String> allWhitelist = Sets.newHashSet("atum", "state-output", "worldpreview", "forceport", "sleepbackground", "speedrunigt");
+            Set<String> allWhitelist = Sets.newHashSet("atum", "chunkumulator", "forceport", "mcsrfairplay", "seedqueue", "sleepbackground", "speedrunigt", "worldpreview");
             allWhitelist.addAll(proWhitelist);
             Set<String> rankedOptions = Set.of("", "Pro", "All");
 

ModFileLoader/src/main/java/com/redlimerl/mcsr/MCSRModLoader.java

@@ -1,20 +1,17 @@
 package com.redlimerl.mcsr.helper;
 
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.redlimerl.mcsr.MCSRModLoader;
 import com.redlimerl.mcsr.mod.FabricLoader;
 import com.redlimerl.mcsr.mod.ModInfo;
 
-import java.io.ByteArrayInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
+import java.nio.file.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -36,12 +33,7 @@ public static JsonObject convertPack(String name, String gameVersion, FabricLoad
             for (ModInfo.ModVersion version : mod.versions()) {
                 for (String s : version.target_version()) {
                     if (s.equals("1.16.1")) {
-                        if (version.url().startsWith("https://github.com")) {
-                            jsonArray.add(getGithubMeta(version.url()));
-                        }
-                        if (version.url().startsWith("https://cdn.modrinth.com")) {
-                            jsonArray.add(getModrinthMeta(version.hash()));
-                        }
+                        jsonArray.add(getFileObject(version.url().substring(version.url().lastIndexOf("/") + 1), version.sha1(), version.sha512(), version.url(), version.size()));
                         continue mod;
                     }
                 }
@@ -76,49 +68,11 @@ public static JsonObject getFileObject(String fileName, String sha1, String sha5
     }
 
     public static void writeZipFile(Path path, String packData) throws IOException {
+        Files.createDirectories(path.getParent());
         ZipOutputStream out = new ZipOutputStream(new FileOutputStream(path.toFile()));
         out.putNextEntry(new ZipEntry("modrinth.index.json"));
         out.write(packData.getBytes(StandardCharsets.UTF_8));
         out.closeEntry();
         out.close();
     }
-
-    private static final Map<String, JsonElement> cachedApi = new HashMap<>();
-    private static final Map<String, String> cachedSha1 = new HashMap<>();
-    private static final Map<String, String> cachedSha512 = new HashMap<>();
-    public static JsonObject getGithubMeta(String url) throws IOException {
-        Map.Entry<String, String> apiVersion = Map.entry("X-GitHub-Api-Version", "2022-11-28");
-        Map.Entry<String, String> githubToken = Map.entry("Authorization", "token " + MCSRModLoader.GITHUB_TOKEN);
-
-        url = url.replaceAll("https://github.com/Minecraft-Java-Edition-Speedrunning/legal-mods/raw/(\\w*)/", "https://api.github.com/repos/Minecraft-Java-Edition-Speedrunning/legal-mods/contents/");
-        url = Arrays.stream(url.split("/")).filter(path -> !path.endsWith(".jar")).collect(Collectors.joining("/")) + "?ref=main";
-        JsonArray jsonArray = cachedApi.containsKey(url) ? cachedApi.get(url).getAsJsonArray() : HttpRequestHelper.getJsonFromUrl(url, apiVersion, githubToken).getAsJsonArray();
-        cachedApi.putIfAbsent(url, jsonArray);
-
-        for (JsonElement jsonElement : jsonArray) {
-            JsonObject data = jsonElement.getAsJsonObject();
-            String download = data.get("download_url").getAsString();
-            ByteArrayInputStream fileInputStream = HttpRequestHelper.getInputStreamFromUrl(download);
-            String sha1 = cachedSha1.containsKey(download) ? cachedSha1.get(download) : ShaHelper.getSha1FromInputStream(fileInputStream);
-            fileInputStream.reset();
-            cachedSha1.putIfAbsent(download, sha1);
-            String sha512 = cachedSha512.containsKey(download) ? cachedSha512.get(download) : ShaHelper.getSha512FromInputStream(fileInputStream);
-            cachedSha512.putIfAbsent(download, sha512);
-            return getFileObject(data.get("name").getAsString(), sha1, sha512, data.get("download_url").getAsString(), data.get("size").getAsInt());
-        }
-
-        return null;
-    }
-    public static JsonObject getModrinthMeta(String sha512) throws IOException {
-        String url = "https://api.modrinth.com/v2/version_file/" + sha512 + "?algorithm=sha512";
-        JsonObject jsonObject = cachedApi.containsKey(url) ? cachedApi.get(url).getAsJsonObject() : HttpRequestHelper.getJsonFromUrl(url).getAsJsonObject();
-        cachedApi.putIfAbsent(url, jsonObject);
-
-        for (JsonElement jsonElement : jsonObject.getAsJsonArray("files")) {
-            JsonObject data = jsonElement.getAsJsonObject();
-            return getFileObject(data.get("filename").getAsString(), data.getAsJsonObject("hashes").get("sha1").getAsString(), sha512, data.get("url").getAsString(), data.get("size").getAsInt());
-        }
-
-        return null;
-    }
 }

ModFileLoader/src/main/java/com/redlimerl/mcsr/helper/MRPackHelper.java

@@ -52,12 +52,16 @@ public String toString() {
     public static final class ModVersion {
         private List<String> target_version;
         private String url;
-        private String hash;
+        private String sha1;
+        private String sha512;
+        private int size;
 
-        public ModVersion(List<String> target_version, String url, String hash) {
+        public ModVersion(List<String> target_version, String url, String sha1, String sha512, int size) {
             this.target_version = target_version;
             this.url = url;
-            this.hash = hash;
+            this.sha1 = sha1;
+            this.sha512 = sha512;
+            this.size = size;
         }
 
         public List<String> target_version() {
@@ -68,8 +72,16 @@ public String url() {
             return url;
         }
 
-        public String hash() {
-            return hash;
+        public String sha1() {
+            return sha1;
+        }
+
+        public String sha512() {
+            return sha512;
+        }
+
+        public int size() {
+            return size;
         }
 
         @Override
@@ -79,20 +91,24 @@ public boolean equals(Object obj) {
             var that = (ModVersion) obj;
             return Objects.equals(this.target_version, that.target_version) &&
                     Objects.equals(this.url, that.url) &&
-                    Objects.equals(this.hash, that.hash);
+                    Objects.equals(this.sha1, that.sha1) &&
+                    Objects.equals(this.sha512, that.sha512) &&
+                    this.size == that.size;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(target_version, url, hash);
+            return Objects.hash(target_version, url, sha1, sha512, size);
         }
 
         @Override
         public String toString() {
             return "ModVersion[" +
                     "target_version=" + target_version + ", " +
                     "url=" + url + ", " +
-                    "hash=" + hash + ']';
+                    "sha1=" + sha1 + ", " +
+                    "sha512=" + sha512 + ", " +
+                    "size=" + size + ']';
         }
 
         }