beet-observer 0.3.0__tar.gz → 0.5.0__tar.gz

{beet_observer-0.3.0 → beet_observer-0.5.0}/PKG-INFO

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

{beet_observer-0.3.0 → beet_observer-0.5.0}/beet_observer/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.3.0"
+__version__ = "0.5.0"
 
 from .plugin import *

{beet_observer-0.3.0 → beet_observer-0.5.0}/beet_observer/data_pack.py

@@ -1,9 +1,12 @@
 from typing import Any
 
+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.
 
@@ -48,6 +51,60 @@ def gen_dp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> Non
             ctx.data.point_of_interest_type_tags,
             ctx_overlay.data.point_of_interest_type_tags,
         ),
+        (ctx.data[wg.Dimension], ctx_overlay.data[wg.Dimension]),
+        (ctx.data[wg.DimensionType], ctx_overlay.data[wg.DimensionType]),
+        (ctx.data[wg.WorldgenBiome], ctx_overlay.data[wg.WorldgenBiome]),
+        (
+            ctx.data[wg.WorldgenConfiguredCarver],
+            ctx_overlay.data[wg.WorldgenConfiguredCarver],
+        ),
+        (
+            ctx.data[wg.WorldgenConfiguredFeature],
+            ctx_overlay.data[wg.WorldgenConfiguredFeature],
+        ),
+        (
+            ctx.data[wg.WorldgenDensityFunction],
+            ctx_overlay.data[wg.WorldgenDensityFunction],
+        ),
+        (ctx.data[wg.WorldgenNoise], ctx_overlay.data[wg.WorldgenNoise]),
+        (
+            ctx.data[wg.WorldgenNoiseSettings],
+            ctx_overlay.data[wg.WorldgenNoiseSettings],
+        ),
+        (
+            ctx.data[wg.WorldgenPlacedFeature],
+            ctx_overlay.data[wg.WorldgenPlacedFeature],
+        ),
+        (
+            ctx.data[wg.WorldgenProcessorList],
+            ctx_overlay.data[wg.WorldgenProcessorList],
+        ),
+        (ctx.data[wg.WorldgenStructure], ctx_overlay.data[wg.WorldgenStructure]),
+        (ctx.data[wg.WorldgenStructureSet], ctx_overlay.data[wg.WorldgenStructureSet]),
+        (
+            ctx.data[wg.WorldgenConfiguredSurfaceBuilder],
+            ctx_overlay.data[wg.WorldgenConfiguredSurfaceBuilder],
+        ),
+        (ctx.data[wg.WorldgenTemplatePool], ctx_overlay.data[wg.WorldgenTemplatePool]),
+        (ctx.data[wg.WorldgenWorldPreset], ctx_overlay.data[wg.WorldgenWorldPreset]),
+        (
+            ctx.data[wg.WorldgenFlatLevelGeneratorPreset],
+            ctx_overlay.data[wg.WorldgenFlatLevelGeneratorPreset],
+        ),
+        (ctx.data[wg.WorldgenBiomeTag], ctx_overlay.data[wg.WorldgenBiomeTag]),
+        (
+            ctx.data[wg.WorldgenStructureSetTag],
+            ctx_overlay.data[wg.WorldgenStructureSetTag],
+        ),
+        (ctx.data[wg.WorldgenStructureTag], ctx_overlay.data[wg.WorldgenStructureTag]),
+        (
+            ctx.data[wg.WorldgenConfiguredCarverTag],
+            ctx_overlay.data[wg.WorldgenConfiguredCarverTag],
+        ),
+        (
+            ctx.data[wg.WorldgenPlacedFeatureTag],
+            ctx_overlay.data[wg.WorldgenPlacedFeatureTag],
+        ),
     ]
     # for each file type, check for required overlays
     for registry, registry_overlay in file_types:
@@ -63,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)
@@ -155,13 +214,18 @@ def gen_registry_overlay(
         ctx.data.overlays[default_dir][name] = registry[name]
         del registry[name]
     elif type == "addition":
-        # move function from overlay pack to overlay in build pack
+        # move file from overlay pack to overlay in build pack
         ctx.data.overlays[overlay_dir][name] = registry_overlay[name]
     else:
         # check if files are exactly the same
-        if registry[name] != registry_overlay[name]:
-            # move function from overlay pack to overlay in build pack
-            ctx.data.overlays[overlay_dir][name] = registry_overlay[name]
+        try:
+            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]
+        except AttributeError:
+            if registry[name] != registry_overlay[name]:
+                # move file from overlay pack to overlay in build pack
+                ctx.data.overlays[overlay_dir][name] = registry_overlay[name]
 
     # remove file from overlay pack
     if name in registry_overlay:

{beet_observer-0.3.0 → beet_observer-0.5.0}/beet_observer/plugin.py

@@ -24,6 +24,10 @@ 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
@@ -40,5 +44,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-0.3.0 → beet_observer-0.5.0}/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.3.0 → beet_observer-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beet-observer"
-version = "0.3.0"
+version = "0.5.0"
 description = "A beet plugin to automatically generate overlays from previous datapacks"
 authors = ["BPR02 <dev@bpr02.com>"]
 license = "MIT"
@@ -38,6 +38,7 @@ typeCheckingMode = "strict"
 [tool.poe.tasks]
 format = {shell = "isort beet_observer & black beet_observer"}
 check = {shell = "isort --check-only beet_observer & black --check beet_observer"}
+typing = {shell = "pyright"}
 
 [build-system]
 requires = ["poetry-core"]