fix: 1.20.4 and beet v100+ (#38)

* chore: update deps * fix: select to query * fix: select to query * fix(crafter): version as meta argument * fix: void query * fix: lock file --------- Co-authored-by: RitikShah <[email protected]>
Smithed-MC · Jan 3, 2024 · b1fdbf6 · b1fdbf6
1 parent db8b2be
commit b1fdbf6
Show file tree

Hide file tree

Showing 6 changed files with 502 additions and 436 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,11 +8,11 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-mecha = "^0.73.0"
-bolt = "^0.36.0"
+mecha = "^0.86.0"
+bolt = "^0.44.0"
 bolt-expressions = "^0.12.2"
-beet = "^0.100.0"
-pydantic = "^2.5.3"
+beet = ">=0.100.0"
+pydantic = "^2.5.2"
 
 [tool.poetry.group.dev.dependencies]
 black = "^22.8.0"

diff --git a/smithed_libraries/packs/crafter/beet.yaml b/smithed_libraries/packs/crafter/beet.yaml
@@ -31,3 +31,4 @@ pipeline:
 meta:
   depends_on: # used for metadata
     custom-block: "0.1.0"
+  minecraft_version: "1.20.4"
diff --git a/smithed_libraries/plugins/crafter.py b/smithed_libraries/plugins/crafter.py
@@ -2,9 +2,10 @@
 
 
 def beet_default(ctx: Context):
+    minecraft_version = ctx.meta["minecraft_version"]
     cache = ctx.cache["smithed_crafter"]
 
-    all_items_url = f"https://raw.githubusercontent.com/misode/mcmeta/{ctx.minecraft_version}-registries/item/data.json"
+    all_items_url = f"https://raw.githubusercontent.com/misode/mcmeta/{minecraft_version}-registries/item/data.json"
     all_items = ItemTag(source_path=cache.download(all_items_url))
     all_items.data = {"values": all_items.data}
 

diff --git a/smithed_libraries/plugins/versioning/api.py b/smithed_libraries/plugins/versioning/api.py
@@ -38,6 +38,9 @@ def generate_api(ctx: Context):
 
     opts = ctx.inject(Versioning).opts
 
-    for func, (_, path) in ctx.select(match=opts.api.match, extend=Function).items():
+    query = ctx.query(match=opts.api.match, extend=Function)
+    if not Function in query:
+        return
+    for (path, func) in query[Function].keys():
         if func.lines and path is not None and PUBLIC_PAT.match(func.lines[0]):
             generate_call(ctx, opts, path)
diff --git a/smithed_libraries/plugins/versioning/load.py b/smithed_libraries/plugins/versioning/load.py
@@ -77,8 +77,11 @@ def set_version(generate: Generator, opts: VersioningOptions):
 
 def resolve_advancements(ctx: Context, opts: VersioningOptions):
     """Select packs that match refactor statement"""
-
-    for advancement in ctx.select(match=opts.refactor.match, extend=Advancement):
+
+    query = ctx.query(match=opts.refactor.match, extend=Advancement)
+    if not Advancement in query:
+        return
+    for (path, advancement) in query[Advancement].keys():
         resolve_advancement(advancement, opts)