AstralTransRocketries/meta-unmojang
1
0
Fork 0
mirror of https://github.com/unmojang/meta.git synced 2025-09-24 03:31:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix forge update logic to pull from new places

Browse Source
This commit is contained in:
Petr Mrázek 2021-04-23 17:20:15 +02:00
parent 6843a65588
commit 17748ad819
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
update.sh
View File

@ -39,7 +39,7 @@ git checkout ${BRANCH} || exit 1
cd "${BASEDIR}"
./updateMojang.py || fail_in
# ./updateForge.py || fail_in
./updateForge.py || fail_in
./updateFabric.py || fail_in
./updateLiteloader.py || fail_in
@ -62,7 +62,7 @@ git checkout ${BRANCH} || exit 1
cd "${BASEDIR}"
./generateMojang.py || fail_out
# ./generateForge.py || fail_out
./generateForge.py || fail_out
./generateFabric.py || fail_in
./generateLiteloader.py || fail_out
./index.py || fail_out

8
updateForge.py
View File

@ -36,17 +36,17 @@ forever_cache = FileCache('http_cache', forever=True)
sess = CacheControl(requests.Session(), forever_cache)
# get the remote version list fragments
r = sess.get('https://files.minecraftforge.net/maven/net/minecraftforge/forge/maven-metadata.json')
r = sess.get('https://files.minecraftforge.net/net/minecraftforge/forge/maven-metadata.json')
r.raise_for_status()
main_json = r.json()
assert type(main_json) == dict
r = sess.get('https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json')
r = sess.get('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json')
r.raise_for_status()
promotions_json = r.json()
assert type(promotions_json) == dict
promotedKeyExpression = re.compile("((?P<mc>[0-9\\.]+)-)?(?P<promotion>(latest)|(recommended))(-(?P<branch>[a-zA-Z0-9\\.]+))?")
promotedKeyExpression = re.compile("(?P<mc>[^-]+)-(?P<promotion>(latest)|(recommended))(-(?P<branch>[a-zA-Z0-9\\.]+))?")
recommendedSet = set()
@ -88,7 +88,7 @@ def getSingleForgeFilesManifest(longversion):
files_json=json.load(f)
from_file = True
else:
fileUrl = 'https://files.minecraftforge.net/maven/net/minecraftforge/forge/%s/meta.json' % longversion
fileUrl = 'https://files.minecraftforge.net/net/minecraftforge/forge/%s/meta.json' % longversion
r = sess.get(fileUrl)
r.raise_for_status()
files_json = r.json()