diff --git a/modpack/manifest.json b/modpack/manifest.json index ac9ba9c..e950bb0 100644 --- a/modpack/manifest.json +++ b/modpack/manifest.json @@ -3,7 +3,7 @@ "version": "1.16.5", "modLoaders": [ { - "id": "forge-36.2.34", + "id": "forge-36.2.39", "primary": true } ] diff --git a/modpack/mmc-pack.json b/modpack/mmc-pack.json index d548a70..e58f7e6 100644 --- a/modpack/mmc-pack.json +++ b/modpack/mmc-pack.json @@ -29,10 +29,10 @@ "uid": "net.minecraft" } ], - "cachedVersion": "36.2.34", + "cachedVersion": "36.2.39", "uid": "net.minecraftforge", - "version": "36.2.34" + "version": "36.2.39" } ], "formatVersion": 1 -} +} \ No newline at end of file diff --git a/server/server.py b/server/server.py index 094c0b5..fffdada 100644 --- a/server/server.py +++ b/server/server.py @@ -16,6 +16,7 @@ FORGE_JAR = "forge-1.16.5-36.2.34.jar" MODPACK_RELEASES_URL = "https://git.233hfd.com/api/v1/repos/joey/FishPogPixelmon/releases?limit=1" ARCLIGHT_URL = "https://github.com/IzzelAliz/Arclight/releases/download/1.16%2F1.0.24/arclight-forge-1.16.5-1.0.24.jar" +ARCLIGHT_JAR = "arclight.jar" INSTANCE_DIR = os.path.join(str(os.getenv("HOME")), "pixelmon") @@ -45,7 +46,7 @@ def launch(): "-Xmx30720M", "-Xms1024M", "-jar", - FORGE_JAR, + ARCLIGHT_JAR, "--nogui", ] ) @@ -60,11 +61,8 @@ def arclight(): return cprint("arclight.jar not found - downloading", "yellow") - r = requests.get(FORGE_URL, allow_redirects=True) + r = requests.get(ARCLIGHT_URL, allow_redirects=True) open("arclight.jar", "wb").write(r.content) - cprint("installing forge via arclight", "green") - - subprocess.run(["java", "-jar", "arclight.jar", "--installServer"]) f = open("eula.txt", "w") f.write("eula=true")