beet-observer 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

beet_observer/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.4.0"
+__version__ = "0.6.0"
 
 from .plugin import *

beet_observer/data_pack.py

@@ -4,7 +4,9 @@ import beet.contrib.worldgen as wg
 from beet import Context, NamespaceProxy
 
 
-def gen_dp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> None:
+def gen_dp_overlays(
+    ctx: Context, ctx_overlay: Context, overlay_dir: str, ignore: list[str]
+) -> None:
     """
     Generates overlays between two datapacks.
 
@@ -118,6 +120,8 @@ def gen_dp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> Non
 
     # add overlays to pack.mcmeta
     for overlay in ctx.data.overlays:
+        if overlay in ignore:
+            continue
         # check if it's the top-level overlay
         if overlay == ctx.meta["observer"]["default_dir_dp"]:
             # delete pack.mcmeta from overlay (required for tests)

beet_observer/plugin.py

@@ -24,14 +24,20 @@ def beet_default(ctx: Context):
         ctx.meta["observer"]["default_dir_rp"] = ctx.meta["observer"]["default_dir"][
             "rp"
         ]
+    # save current overlays
+    save: list[str] = []
+    for overlay in ctx.data.overlays:
+        save.append(overlay)
     # loop through all overlays
     for overlay in ctx.meta["observer"]["overlays"]:
-        # create relative path
-        path = f"{ctx.directory}/{overlay['process']}"
+        # get pack
+        if overlay["process"].startswith("https://"):
+            load = overlay["process"]
+        else:
+            load = f"{ctx.directory}/{overlay['process']}"
         # generate context for overlay pack
         with run_beet(
-            config={"data_pack": {"load": "."}, "resource_pack": {"load": "."}},
-            directory=path,
+            config={"data_pack": {"load": load}, "resource_pack": {"load": load}}
         ) as ctx_overlay:
             if "directory" not in overlay:
                 dp_dir = f"overlay_{ctx_overlay.data.pack_format}"
@@ -40,5 +46,5 @@ def beet_default(ctx: Context):
                 dp_dir = overlay["directory"]
                 rp_dir = overlay["directory"]
             # compare build pack and overlay pack
-            gen_dp_overlays(ctx, ctx_overlay, dp_dir)
-            gen_rp_overlays(ctx, ctx_overlay, rp_dir)
+            gen_dp_overlays(ctx, ctx_overlay, dp_dir, save)
+            gen_rp_overlays(ctx, ctx_overlay, rp_dir, save)

beet_observer/resource_pack.py

@@ -3,7 +3,9 @@ from typing import Any
 from beet import Context, NamespaceProxy
 
 
-def gen_rp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> None:
+def gen_rp_overlays(
+    ctx: Context, ctx_overlay: Context, overlay_dir: str, ignore: list[str]
+) -> None:
     """
     Generates overlays between two resource packs.
 
@@ -46,6 +48,8 @@ def gen_rp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> Non
 
     # add overlays to pack.mcmeta
     for overlay in ctx.assets.overlays:
+        if overlay in ignore:
+            continue
         # check if it's the top-level overlay
         if overlay == ctx.meta["observer"]["default_dir_rp"]:
             # delete pack.mcmeta from overlay (required for tests)

{beet_observer-0.4.0.dist-info → beet_observer-0.6.0.dist-info}/METADATA

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

beet_observer-0.6.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+beet_observer/__init__.py,sha256=1Bu06DCGzyW6_EOuOSqpm31Fvkl_thjvyH54vN4XjZ4,45
+beet_observer/data_pack.py,sha256=QqoyQYiCBpqioaKYSUKANgd3dxJJFLGka92G3Tyz_Js,9800
+beet_observer/plugin.py,sha256=YBxXXzWGGVKqJHTuYi9a3KQO6-E841OS3iHcTnKXg_s,2011
+beet_observer/resource_pack.py,sha256=_a4Ubx8fO7HMnIbfQlsnYEIM_Vjo3o_QjarirqbWdkc,6233
+beet_observer-0.6.0.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
+beet_observer-0.6.0.dist-info/METADATA,sha256=kgd3ISGBKRueQuQvvapeouk5auWa2FB4oldNV4vKW3w,674
+beet_observer-0.6.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+beet_observer-0.6.0.dist-info/RECORD,,

beet_observer-0.4.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-beet_observer/__init__.py,sha256=N7xZKu7fP_rwtJSXJ8tHQgq_qJDbu7yWOKOXnldjr04,45
-beet_observer/data_pack.py,sha256=CMTZ2DdBEIj15wC_prAQv3I-0Eptk0usTP237KuxfLk,9724
-beet_observer/plugin.py,sha256=DGpWvV2q6yeJ_EyBLShigZl4dutN2yCFDKzzcCGiu8o,1808
-beet_observer/resource_pack.py,sha256=9dAeZXlJrcaEiIJcPYnJhU7e0qMUqYNcxhIEhLDHUF4,6157
-beet_observer-0.4.0.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
-beet_observer-0.4.0.dist-info/METADATA,sha256=B2ehMsXlmntYVO4SwaAjjJChjPumJUFMUT2a5fzSJ2k,674
-beet_observer-0.4.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-beet_observer-0.4.0.dist-info/RECORD,,