Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-goode committed Jan 31, 2025
2 parents c0e0885 + b95b599 commit 898f5d2
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 66 deletions.
47 changes: 31 additions & 16 deletions meta/run/generate_quilt.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import os
import sys

from meta.common import (
ensure_component_dir,
Expand Down Expand Up @@ -27,6 +28,10 @@
ensure_component_dir(INTERMEDIARY_COMPONENT)


def eprint(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs)


def load_jar_info(artifact_key) -> FabricJarInfo:
return FabricJarInfo.parse_file(
os.path.join(UPSTREAM_DIR, JARS_DIR, f"{artifact_key}.json")
Expand Down Expand Up @@ -106,15 +111,21 @@ def main():
for entry in loader_version_index:
version = entry["version"]
print(f"Processing loader {version}")
try:
v, should_recommend = process_loader_version(entry)

v, should_recommend = process_loader_version(entry)
if (
not recommended_loader_versions and should_recommend
): # newest stable loader is recommended
recommended_loader_versions.append(version)

if (
not recommended_loader_versions and should_recommend
): # newest stable loader is recommended
recommended_loader_versions.append(version)

v.write(os.path.join(LAUNCHER_DIR, LOADER_COMPONENT, f"{v.version}.json"))
v.write(
os.path.join(LAUNCHER_DIR, LOADER_COMPONENT, f"{v.version}.json")
)
except Exception as e:
eprint("Failed to download %s" % version)
eprint("Error is %s" % e)
continue

if USE_QUILT_MAPPINGS:
with open(
Expand All @@ -125,18 +136,22 @@ def main():
version = entry["version"]
print(f"Processing intermediary {version}")

v = process_intermediary_version(entry)
try:
v = process_intermediary_version(entry)

recommended_intermediary_versions.append(
version
) # all intermediaries are recommended
recommended_intermediary_versions.append(
version
) # all intermediaries are recommended

v.write(
os.path.join(
LAUNCHER_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json"
v.write(
os.path.join(
LAUNCHER_DIR, INTERMEDIARY_COMPONENT, f"{v.version}.json"
)
)
)

except Exception as e:
eprint("Failed to download %s" % version)
eprint("Error is %s" % e)
continue
package = MetaPackage(uid=LOADER_COMPONENT, name="Quilt Loader")
package.recommended = recommended_loader_versions
package.description = "The Quilt project is an open, community-driven modding toolchain designed primarily for Minecraft."
Expand Down
107 changes: 57 additions & 50 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 898f5d2

Please sign in to comment.