beet-observer 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

beet_observer/__init__.py

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

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/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.dist-info → beet_observer-0.7.1.dist-info}/METADATA

@@ -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.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+beet_observer/__init__.py,sha256=1XpNKUm-Hk_yCgkuoqDBACiacdZ1uf9I3C1WAHMucuE,45
+beet_observer/data_pack.py,sha256=YIkMDaR1j6FU-ukC5UibCaweRQ-TEvd_w1sZZTbE5Ww,9972
+beet_observer/plugin.py,sha256=mtGBtJNCiUHkSGiAoRl7li0oIlZBQ-cuDS91bubDaPs,2835
+beet_observer/resource_pack.py,sha256=anQw0EdCF780j9rVMM1ycQAqQzEFpg_8I_h6T5Xoguo,6210
+beet_observer-0.7.1.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
+beet_observer-0.7.1.dist-info/METADATA,sha256=_c2AXX_DL1MmeoqYuYMHpg4xWWTkhKkRuwtlid4-2zc,674
+beet_observer-0.7.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+beet_observer-0.7.1.dist-info/RECORD,,

beet_observer-0.7.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-beet_observer/__init__.py,sha256=Y1gc4glC_mLy4ZYlXwD5eO0bATwzqnv2s7PuK_Rwnxc,45
-beet_observer/data_pack.py,sha256=oTq2jRNer7bE9lGgva98ubZ5TTIF65cSkOUSBQNWIac,9845
-beet_observer/plugin.py,sha256=mtGBtJNCiUHkSGiAoRl7li0oIlZBQ-cuDS91bubDaPs,2835
-beet_observer/resource_pack.py,sha256=BtVu0sGO20vUwOOnBrQdXvVATv2iV3ubEc0LCB8DqfQ,6079
-beet_observer-0.7.0.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
-beet_observer-0.7.0.dist-info/METADATA,sha256=p2qCjgtHHomeWkbvnQw0ZbGhKlPQdkERq6e8Ycai94c,674
-beet_observer-0.7.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-beet_observer-0.7.0.dist-info/RECORD,,