update forge version and fix arclight

This commit is contained in:
Joey Eamigh
2023-06-22 23:19:57 +00:00
parent 519e2c8f6d
commit 560217cd38
3 changed files with 7 additions and 9 deletions

View File

@@ -3,7 +3,7 @@
"version": "1.16.5", "version": "1.16.5",
"modLoaders": [ "modLoaders": [
{ {
"id": "forge-36.2.34", "id": "forge-36.2.39",
"primary": true "primary": true
} }
] ]

View File

@@ -29,10 +29,10 @@
"uid": "net.minecraft" "uid": "net.minecraft"
} }
], ],
"cachedVersion": "36.2.34", "cachedVersion": "36.2.39",
"uid": "net.minecraftforge", "uid": "net.minecraftforge",
"version": "36.2.34" "version": "36.2.39"
} }
], ],
"formatVersion": 1 "formatVersion": 1
} }

View File

@@ -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" 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_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") INSTANCE_DIR = os.path.join(str(os.getenv("HOME")), "pixelmon")
@@ -45,7 +46,7 @@ def launch():
"-Xmx30720M", "-Xmx30720M",
"-Xms1024M", "-Xms1024M",
"-jar", "-jar",
FORGE_JAR, ARCLIGHT_JAR,
"--nogui", "--nogui",
] ]
) )
@@ -60,11 +61,8 @@ def arclight():
return return
cprint("arclight.jar not found - downloading", "yellow") 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) 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 = open("eula.txt", "w")
f.write("eula=true") f.write("eula=true")