beet-observer 0.7.0__tar.gz → 0.7.1__tar.gz

{beet_observer-0.7.0 → beet_observer-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: beet-observer
-Version: 0.7.0
+Version: 0.7.1
 Summary: A beet plugin to automatically generate overlays from previous datapacks
 License: MIT
 Author: BPR02

{beet_observer-0.7.0 → beet_observer-0.7.1}/beet_observer/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 
 from .plugin import *

{beet_observer-0.7.0 → beet_observer-0.7.1}/beet_observer/data_pack.py

@@ -110,9 +110,6 @@ def gen_dp_overlays(
     for registry, registry_overlay in file_types:
         check_registry(ctx, ctx_overlay, overlay_dir, registry, registry_overlay)
 
-    # add current overlays to pack
-    ctx.data.overlays.merge(ctx_overlay.data.overlays)
-
     # get pack.mcmeta overlay entries
     mcmeta: dict[str, dict[str, list[dict[str, Any]]]] = ctx.data.mcmeta.data.copy()
     if "overlays" not in mcmeta:
@@ -147,6 +144,11 @@ def gen_dp_overlays(
             }
         )
 
+    # add current overlays to pack
+    ctx.data.overlays.merge(ctx_overlay.data.overlays)
+    if "overlays" in ctx_overlay.data.mcmeta.data:
+        entries.extend(ctx_overlay.data.mcmeta.data["overlays"]["entries"])
+
     # save overlay entries in pack.mcmeta
     if len(entries) > 0:
         ctx.data.mcmeta.data.update({"overlays": {"entries": entries}})

{beet_observer-0.7.0 → beet_observer-0.7.1}/beet_observer/resource_pack.py

@@ -38,9 +38,6 @@ def gen_rp_overlays(
     for registry, registry_overlay in file_types:
         check_registry(ctx, ctx_overlay, overlay_dir, registry, registry_overlay)
 
-    # add current overlays to pack
-    ctx.assets.overlays.merge(ctx_overlay.assets.overlays)
-
     # get pack.mcmeta overlay entries
     mcmeta: dict[str, dict[str, list[dict[str, Any]]]] = ctx.assets.mcmeta.data.copy()
     if "overlays" not in mcmeta:
@@ -75,6 +72,11 @@ def gen_rp_overlays(
             }
         )
 
+    # add current overlays to pack
+    ctx.assets.overlays.merge(ctx_overlay.assets.overlays)
+    if "overlays" in ctx_overlay.assets.mcmeta.data:
+        entries.extend(ctx_overlay.assets.mcmeta.data["overlays"]["entries"])
+
     # save overlay entries in pack.mcmeta
     if len(entries) > 0:
         ctx.assets.mcmeta.data.update({"overlays": {"entries": entries}})

{beet_observer-0.7.0 → beet_observer-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beet-observer"
-version = "0.7.0"
+version = "0.7.1"
 description = "A beet plugin to automatically generate overlays from previous datapacks"
 authors = ["BPR02 <dev@bpr02.com>"]
 license = "MIT"