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

beet_observer/__init__.py

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

beet_observer/data_pack.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import beet.contrib.worldgen as wg
-from beet import Context, NamespaceProxy
+from beet import Context, NamespaceProxy, Structure
 
 
 def gen_dp_overlays(
@@ -110,6 +110,9 @@ 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:
@@ -214,6 +217,10 @@ def gen_registry_overlay(
     else:
         # check if files are exactly the same
         try:
+            if isinstance(registry[name], Structure):
+                registry_overlay[name].data["DataVersion"] = registry[name].data[
+                    "DataVersion"
+                ]
             if registry[name].data != registry_overlay[name].data:
                 # move file from overlay pack to overlay in build pack
                 ctx.data.overlays[overlay_dir][name] = registry_overlay[name]

beet_observer/resource_pack.py

@@ -38,6 +38,9 @@ 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:

{beet_observer-0.6.1.dist-info → beet_observer-0.7.0.dist-info}/METADATA

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

beet_observer-0.7.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+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,,

beet_observer-0.6.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-beet_observer/__init__.py,sha256=L6JbkcXu2b4CMzeLNR5y21RMc46RINFYzzWYK5vgJNc,45
-beet_observer/data_pack.py,sha256=JonYeQgjQGP5j6QWH0rTHRckrKAmEqnp1ajiOr1K9BY,9555
-beet_observer/plugin.py,sha256=mtGBtJNCiUHkSGiAoRl7li0oIlZBQ-cuDS91bubDaPs,2835
-beet_observer/resource_pack.py,sha256=ZO6Ye-_17IAx5rvsht6Gd3IY10ZtevoOX20mZwxzWnk,5984
-beet_observer-0.6.1.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
-beet_observer-0.6.1.dist-info/METADATA,sha256=CZ-tu7EjlToxxmbi0loJZt8t-g2ViZRXr1eRx5wLY4g,674
-beet_observer-0.6.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-beet_observer-0.6.1.dist-info/RECORD,,