refactor: switch Quilt mappings to hashed MojMap

This commit is contained in:
Sefa Eyeoglu 2022-04-09 14:56:34 +02:00
parent 4d351a2937
commit 623c5fb19d
No known key found for this signature in database
GPG Key ID: C10411294912A422
3 changed files with 4 additions and 6 deletions

View File

@ -45,13 +45,11 @@ def process_loader_version(entry) -> MetaVersion:
def process_intermediary_version(entry) -> MetaVersion:
minecraft_version = entry["version"].split("+", 2)[0] # version format is like 1.18.2-pre1+build.1
jar_info = load_jar_info(transform_maven_key(entry["maven"]))
v = MetaVersion(name="Quilt Intermediary Mappings", uid=INTERMEDIARY_COMPONENT, version=entry["version"])
v.release_time = jar_info.release_time
v.requires = [Dependency(uid='net.minecraft', equals=minecraft_version)]
v.requires = [Dependency(uid='net.minecraft', equals=entry["version"])]
v.order = 11
v.type = "release"
v.libraries = []
@ -80,7 +78,7 @@ def main():
v.write(os.path.join(PMC_DIR, LOADER_COMPONENT, f"{v.version}.json"))
if USE_QUILT_MAPPINGS:
with open(os.path.join(UPSTREAM_DIR, META_DIR, "quilt-mappings.json"), 'r', encoding='utf-8') as f:
with open(os.path.join(UPSTREAM_DIR, META_DIR, "hashed.json"), 'r', encoding='utf-8') as f:
intermediary_version_index = json.load(f)
for entry in intermediary_version_index:
version = entry["version"]

View File

@ -11,7 +11,7 @@ INSTALLER_INFO_DIR = join(BASE_DIR, "loader-installer-json")
META_DIR = join(BASE_DIR, "meta-v3")
LOADER_COMPONENT = "org.quiltmc.quilt-loader"
INTERMEDIARY_COMPONENT = "org.quiltmc.quilt-mappings"
INTERMEDIARY_COMPONENT = "org.quiltmc.hashed"
if not USE_QUILT_MAPPINGS:
INTERMEDIARY_COMPONENT = FABRIC_INTERMEDIARY_COMPONENT

View File

@ -101,7 +101,7 @@ def compute_jar_file(path, url):
def main():
# get the version list for each component we are interested in
for component in ["quilt-mappings", "loader"]:
for component in ["hashed", "loader"]:
index = get_json_file(os.path.join(UPSTREAM_DIR, META_DIR, f"{component}.json"),
"https://meta.quiltmc.org/v3/versions/" + component)
for it in index: