Merge pull request #4 from tildejustin/mcsr

get loader from fabric api

Author: tildejustin

Diff for: clean.py

@@ -0,0 +1,5 @@
+import os.path
+import shutil
+
+if os.path.exists("out"):
+    shutil.rmtree("out")

Diff for: generate.py

@@ -3,6 +3,8 @@
 from enum import StrEnum
 from typing import Optional
 
+from requests import request
+
 
 class IntermediaryType(StrEnum):
     LegacyFabric = "net.fabricmc.intermediary.json"
@@ -27,7 +29,7 @@ def __init__(self, minecraft_version: str, lwjgl_version: str, intermediary_type
         self.minecraft_version_additions = self.fix_version(version)
 
     def process(self, subject: str) -> str:
-        subject = subject.replace("${loader_version}", LOADER_VERSION)
+        subject = subject.replace("${loader_version}", loader_version)
         subject = subject.replace("${minecraft_version}", self.minecraft_version + self.minecraft_version_additions)
         subject = subject.replace("${lwjgl_version}", self.lwjgl_version)
         subject = subject.replace("${lwjgl_name}", "LWJGL 3" if self.lwjgl_version.startswith("3") else "LWJGL 2")
@@ -40,7 +42,7 @@ def prepare_skeleton(self):
         self.process_file(f"patches/{self.intermediary_type}", out="patches/net.fabricmc.intermediary.json")
 
     def create_zip(self):
-        with zipfile.ZipFile(f"out/{self.minecraft_version}+loader.{LOADER_VERSION}.zip", "w") as z:
+        with zipfile.ZipFile(f"out/{self.minecraft_version}+loader.{loader_version}.zip", "w") as z:
             z.write("temp/mmc-pack.json", "mmc-pack.json")
             z.write("temp/instance.cfg", "instance.cfg")
             z.write("temp/patches/net.fabricmc.intermediary.json", "patches/net.fabricmc.intermediary.json")
@@ -61,12 +63,14 @@ def process_file(self, *files: str, out: Optional[str] = None):
                     t.write(self.process(f.read()))
 
     @staticmethod
-    def fix_version(version: str) -> str:
+    def fix_version(candidate: str) -> str:
+        if candidate.count(".") < 2:
+            return ""
         # accounts for the ornithe naming convention
         addition = ""
-        if version == "1.0":
+        if candidate == "1.0":
             addition += ".0"
-        if int(version.split(".")[1]) < 3:
+        if int(candidate.split(".")[1]) < 3:
             addition += "-client"
         return addition
 
@@ -76,6 +80,7 @@ def fix_version(version: str) -> str:
     ("1.12.2", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
     ("1.12", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabricV2),
     ("1.11.2", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
+    ("1.10.2", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
     ("1.9.4", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
     ("1.8.9", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
     ("1.8", "2.9.1", IntermediaryType.LegacyFabric),
@@ -84,11 +89,21 @@ def fix_version(version: str) -> str:
     ("1.7.4", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
     ("1.7.2", "2.9.0", IntermediaryType.LegacyFabric),
     ("1.6.4", "2.9.0", IntermediaryType.LegacyFabricNoApplet),
-    ("1.3.2", "2.9.0", IntermediaryType.LegacyFabricNoAppletOldArgs),
-    ("1.0", "2.9.0", IntermediaryType.Ornithe)
+    ("1.5.2", "2.9.0", IntermediaryType.LegacyFabricNoAppletOldArgs),
+    ("1.4.2", "2.9.0", IntermediaryType.LegacyFabricNoAppletOldArgs),
+    ("1.3.1", "2.9.0", IntermediaryType.LegacyFabricNoAppletOldArgs),
+    ("15w14a", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabric),
+    ("1.RV-Pre1", "2.9.4-nightly-20150209", IntermediaryType.LegacyFabricV2)
+    # ("1.2.5", "2.9.0", IntermediaryType.Ornithe),
+    # ("1.1", "2.9.0", IntermediaryType.Ornithe),
+    # ("1.0", "2.9.0", IntermediaryType.Ornithe)
 ]
 
-LOADER_VERSION = "0.15.0"
+loader_version = "0.15.3"
+try:
+    loader_version = request("GET", "https://meta.fabricmc.net/v2/versions/loader").json()[0].get("version")
+except ConnectionError:
+    pass
 mkdirs("out")
 
 for version, lwjgl, intermediary in versions: