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

beet_observer/__init__.py

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

beet_observer/data_pack.py

@@ -1,5 +1,6 @@
 from typing import Any
 
+import beet.contrib.worldgen as wg
 from beet import Context, NamespaceProxy
 
 
@@ -48,6 +49,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:
@@ -155,13 +210,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.dist-info → beet_observer-0.4.0.dist-info}/METADATA

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

beet_observer-0.4.0.dist-info/RECORD

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

beet_observer-0.3.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-beet_observer/__init__.py,sha256=waPdRKRwse3ZVuODN7-e1CQMESC4jLtlCYNxSXcho2I,45
-beet_observer/data_pack.py,sha256=OYGy9vDePpWyDhVpTl2Y-P49UEhsivihOqo17dfNKTM,7166
-beet_observer/plugin.py,sha256=DGpWvV2q6yeJ_EyBLShigZl4dutN2yCFDKzzcCGiu8o,1808
-beet_observer/resource_pack.py,sha256=9dAeZXlJrcaEiIJcPYnJhU7e0qMUqYNcxhIEhLDHUF4,6157
-beet_observer-0.3.0.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
-beet_observer-0.3.0.dist-info/METADATA,sha256=o3LRXTGTXd_oqjPbENKtvrGH2UPrGobHUVRh0z2NAgM,674
-beet_observer-0.3.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-beet_observer-0.3.0.dist-info/RECORD,,