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

beet_observer/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.2.1"
+__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/resource_pack.py

@@ -1,5 +1,151 @@
-from beet import Context
+from typing import Any
 
+from beet import Context, NamespaceProxy
 
-def gen_rp_overlays(ctx: Context, ctx_overlay: Context, directory: str):
-    return
+
+def gen_rp_overlays(ctx: Context, ctx_overlay: Context, overlay_dir: str) -> None:
+    """
+    Generates overlays between two resource packs.
+
+    Keyword arguments:</br>
+    `ctx` -- the build context</br>
+    `ctx_overlay` -- the overlay context</br>
+    `overlay_dir` -- the directory of the overlay</br>
+    """
+    # create list of all resource pack file types
+    file_types: list[tuple[NamespaceProxy[Any], NamespaceProxy[Any]]] = [
+        (ctx.assets.blockstates, ctx_overlay.assets.blockstates),
+        (ctx.assets.models, ctx_overlay.assets.models),
+        (ctx.assets.languages, ctx_overlay.assets.languages),
+        (ctx.assets.fonts, ctx_overlay.assets.fonts),
+        (ctx.assets.glyph_sizes, ctx_overlay.assets.glyph_sizes),
+        (ctx.assets.true_type_fonts, ctx_overlay.assets.true_type_fonts),
+        (ctx.assets.shader_posts, ctx_overlay.assets.shader_posts),
+        (ctx.assets.shaders, ctx_overlay.assets.shaders),
+        (ctx.assets.fragment_shaders, ctx_overlay.assets.fragment_shaders),
+        (ctx.assets.vertex_shaders, ctx_overlay.assets.vertex_shaders),
+        (ctx.assets.glsl_shaders, ctx_overlay.assets.glsl_shaders),
+        (ctx.assets.texts, ctx_overlay.assets.texts),
+        (ctx.assets.textures_mcmeta, ctx_overlay.assets.textures_mcmeta),
+        (ctx.assets.textures, ctx_overlay.assets.textures),
+        (ctx.assets.sounds, ctx_overlay.assets.sounds),
+        (ctx.assets.particles, ctx_overlay.assets.particles),
+        (ctx.assets.atlases, ctx_overlay.assets.atlases),
+    ]
+    # for each file type, check for required overlays
+    for registry, registry_overlay in file_types:
+        check_registry(ctx, ctx_overlay, overlay_dir, registry, registry_overlay)
+
+    # get pack.mcmeta overlay entries
+    mcmeta: dict[str, dict[str, list[dict[str, Any]]]] = ctx.assets.mcmeta.data.copy()
+    if "overlays" not in mcmeta:
+        mcmeta["overlays"] = {}
+    if "entries" not in mcmeta["overlays"]:
+        mcmeta["overlays"]["entries"] = []
+    entries = mcmeta["overlays"]["entries"]
+
+    # add overlays to pack.mcmeta
+    for overlay in ctx.assets.overlays:
+        # check if it's the top-level overlay
+        if overlay == ctx.meta["observer"]["default_dir_rp"]:
+            # delete pack.mcmeta from overlay (required for tests)
+            default_dir = ctx.meta["observer"]["default_dir_rp"]
+            if ctx.assets.overlays[default_dir].mcmeta:
+                del ctx.assets.overlays[default_dir].mcmeta
+
+            # get pack format from build context
+            if "default_format" in ctx.meta["observer"]:
+                formats = ctx.meta["observer"]["default_format"]
+            else:
+                formats = ctx.assets.mcmeta.data["pack"]["pack_format"]
+        else:
+            # get formats from overlay pack
+            if "supported_formats" in ctx_overlay.assets.mcmeta.data["pack"]:
+                formats = ctx_overlay.assets.mcmeta.data["pack"]["supported_formats"]
+            else:
+                formats = ctx_overlay.assets.mcmeta.data["pack"]["pack_format"]
+
+        # update pack.mcmeta overlay entries
+        entries.append(
+            {
+                "formats": formats,
+                "directory": overlay,
+            }
+        )
+
+    # save overlay entries in pack.mcmeta
+    if len(entries) > 0:
+        ctx.assets.mcmeta.data.update({"overlays": {"entries": entries}})
+
+
+def check_registry(
+    ctx: Context,
+    ctx_overlay: Context,
+    overlay_dir: str,
+    registry: NamespaceProxy[Any],
+    registry_overlay: NamespaceProxy[Any],
+) -> None:
+    """
+    Generates overlays for each namespace proxy.
+
+    Keyword arguments:</br>
+    `ctx` -- the build context</br>
+    `ctx_overlay` -- the overlay context</br>
+    `overlay_dir` -- the directory of the overlay</br>
+    `registry` -- the namespace proxy from the build context</br>
+    `registry_overlay` -- the namespace proxy from the overlay context</br>
+    """
+    # check each file in the build pack
+    for name in list(registry):
+        if name in registry_overlay:
+            # exists in both, so check if an overlay is needed
+            gen_registry_overlay(ctx, overlay_dir, name, registry, registry_overlay)
+        else:
+            # exists only in overlay, so create a deletion overlay
+            gen_registry_overlay(
+                ctx, overlay_dir, name, registry, registry_overlay, "deletion"
+            )
+
+    # for all remaining files (of this type) in the overlay pack, add to build pack as an overlay
+    for name in list(registry_overlay):
+        gen_registry_overlay(
+            ctx, overlay_dir, name, registry, registry_overlay, "addition"
+        )
+
+
+def gen_registry_overlay(
+    ctx: Context,
+    overlay_dir: str,
+    name: str,
+    registry: NamespaceProxy[Any],
+    registry_overlay: NamespaceProxy[Any],
+    type: str = "",
+) -> None:
+    """
+    Checks if two functions have the same contents and generate an overlay if they don't.
+
+    Keyword arguments:</br>
+    `ctx` -- the build context</br>
+    `overlay_dir` -- the directory of the generated overlay</br>
+    `name` -- the name of the file</br>
+    `registry` -- the namespace proxy from the build context</br>
+    `registry_overlay` -- the namespace proxy from the overlay context</br>
+    `type` -- either "deletion" or "addition" (default: `""`)</br>
+    """
+    if type == "deletion":
+        # move file from build pack to overlay in build pack
+        default_dir = ctx.meta["observer"]["default_dir_rp"]
+        ctx.assets.overlays[default_dir][name] = registry[name]
+        del registry[name]
+    elif type == "addition":
+        # move function from overlay pack to overlay in build pack
+        ctx.assets.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.assets.overlays[overlay_dir][name] = registry_overlay[name]
+
+    # remove file from overlay pack
+    if name in registry_overlay:
+        del registry_overlay[name]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: beet-observer
-Version: 0.2.1
+Version: 0.4.0
 Summary: A beet plugin to automatically generate overlays from previous datapacks
 License: MIT
 Author: BPR02
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: beet (>=0.108.5)
+Requires-Dist: pillow (>=11.0.0,<12.0.0)
 Description-Content-Type: text/markdown
 
 # Observer

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

@@ -1,8 +0,0 @@
-beet_observer/__init__.py,sha256=wrNZq4cbCCTtIPOQhShOufEQmAhkL5Ww1yOOzF74DTw,45
-beet_observer/data_pack.py,sha256=OYGy9vDePpWyDhVpTl2Y-P49UEhsivihOqo17dfNKTM,7166
-beet_observer/plugin.py,sha256=DGpWvV2q6yeJ_EyBLShigZl4dutN2yCFDKzzcCGiu8o,1808
-beet_observer/resource_pack.py,sha256=ePNdQjeMrEKEkLdDBsnHcMdrne8g505Cd8vfzX5S_cc,111
-beet_observer-0.2.1.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
-beet_observer-0.2.1.dist-info/METADATA,sha256=WUsicEsv5Vs3qknF4a_rb9KuwQT2QR5WjMPP9lLHnIs,633
-beet_observer-0.2.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-beet_observer-0.2.1.dist-info/RECORD,,