fix: make nested overlays load after generated overlays

BPR02 · Jan 14, 2025 · eea04a7 · eea04a7
1 parent 8e154df
commit eea04a7
Show file tree

Hide file tree

Showing 16 changed files with 207 additions and 30 deletions.
diff --git a/beet_observer/data_pack.py b/beet_observer/data_pack.py
@@ -110,9 +110,6 @@ 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:
@@ -147,6 +144,11 @@ def gen_dp_overlays(
             }
         )
 
+    # add current overlays to pack
+    ctx.data.overlays.merge(ctx_overlay.data.overlays)
+    if "overlays" in ctx_overlay.data.mcmeta.data:
+        entries.extend(ctx_overlay.data.mcmeta.data["overlays"]["entries"])
+
     # save overlay entries in pack.mcmeta
     if len(entries) > 0:
         ctx.data.mcmeta.data.update({"overlays": {"entries": entries}})

diff --git a/beet_observer/resource_pack.py b/beet_observer/resource_pack.py
@@ -38,9 +38,6 @@ 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:
@@ -75,6 +72,11 @@ def gen_rp_overlays(
             }
         )
 
+    # add current overlays to pack
+    ctx.assets.overlays.merge(ctx_overlay.assets.overlays)
+    if "overlays" in ctx_overlay.assets.mcmeta.data:
+        entries.extend(ctx_overlay.assets.mcmeta.data["overlays"]["entries"])
+
     # save overlay entries in pack.mcmeta
     if len(entries) > 0:
         ctx.assets.mcmeta.data.update({"overlays": {"entries": entries}})

diff --git a/examples/existing_overlay2/beet.yaml b/examples/existing_overlay2/beet.yaml
@@ -1,22 +1,12 @@
 data_pack:
   load: src
   pack_format: 57
-  supported_formats: [48,57]
-  overlays:
-    - formats:
-        min_inclusive: 47
-        max_inclusive: 47
-      directory: overlay_47
+  supported_formats: [47,57]
 
 resource_pack:
   load: src
   pack_format: 57
-  supported_formats: [48,57]
-  overlays:
-    - formats:
-        min_inclusive: 47
-        max_inclusive: 47
-      directory: overlay_47
+  supported_formats: [47,57]
 
 pipeline:
   - beet_observer

diff --git a/examples/existing_overlay2/proc/pack.mcmeta b/examples/existing_overlay2/proc/pack.mcmeta
@@ -1,6 +1,18 @@
 {
   "pack": {
     "pack_format": 48,
-    "description": ""
+    "description": "",
+    "supported_formats": [
+      47,
+      48
+    ]
+  },
+  "overlays": {
+    "entries": [
+      {
+        "formats": 47,
+        "directory": "overlay_47"
+      }
+    ]
   }
 }
diff --git a/examples/existing_overlay3/beet.yaml b/examples/existing_overlay3/beet.yaml
@@ -0,0 +1,22 @@
+data_pack:
+  load: src
+  pack_format: 57
+  supported_formats: [44,57]
+  overlays:
+    - formats:
+        min_inclusive: 44
+        max_inclusive: 44
+      directory: overlay_44
+
+resource_pack:
+  load: src
+  pack_format: 57
+  supported_formats: [44,57]
+
+pipeline:
+  - beet_observer
+
+meta:
+  observer:
+    overlays:
+      - process: proc
diff --git a/examples/existing_overlay3/proc/assets/demo/textures/foo.png b/examples/existing_overlay3/proc/assets/demo/textures/foo.png
diff --git a/examples/existing_overlay3/proc/data/demo/function/demo.mcfunction b/examples/existing_overlay3/proc/data/demo/function/demo.mcfunction
@@ -0,0 +1 @@
+say this only exists in the overlay
diff --git a/examples/existing_overlay3/proc/data/demo/function/foo.mcfunction b/examples/existing_overlay3/proc/data/demo/function/foo.mcfunction
@@ -0,0 +1 @@
+say this is the same in both
diff --git a/examples/existing_overlay3/proc/overlay_47/assets/demo/textures/demo.png b/examples/existing_overlay3/proc/overlay_47/assets/demo/textures/demo.png
diff --git a/examples/existing_overlay3/proc/overlay_47/data/demo/function/foo.mcfunction b/examples/existing_overlay3/proc/overlay_47/data/demo/function/foo.mcfunction
@@ -0,0 +1 @@
+say this is in an overlay that exists already
diff --git a/examples/existing_overlay3/proc/pack.mcmeta b/examples/existing_overlay3/proc/pack.mcmeta
@@ -0,0 +1,18 @@
+{
+  "pack": {
+    "pack_format": 48,
+    "description": "",
+    "supported_formats": [
+      47,
+      48
+    ]
+  },
+  "overlays": {
+    "entries": [
+      {
+        "formats": 47,
+        "directory": "overlay_47"
+      }
+    ]
+  }
+}
diff --git a/examples/existing_overlay3/src/assets/demo/textures/foo.png b/examples/existing_overlay3/src/assets/demo/textures/foo.png
diff --git a/examples/existing_overlay3/src/data/demo/function/foo.mcfunction b/examples/existing_overlay3/src/data/demo/function/foo.mcfunction
@@ -0,0 +1 @@
+say this is the same in both
diff --git a/examples/existing_overlay3/src/overlay_44/data/demo/function/foo.mcfunction b/examples/existing_overlay3/src/overlay_44/data/demo/function/foo.mcfunction
@@ -0,0 +1 @@
+say this is in an overlay that exists already
diff --git a/tests/snapshots/examples__build_existing_overlay2__0.pack.md b/tests/snapshots/examples__build_existing_overlay2__0.pack.md
@@ -10,21 +10,21 @@
     "pack_format": 57,
     "description": "",
     "supported_formats": [
-      48,
+      47,
       57
     ]
   },
   "overlays": {
     "entries": [
       {
-        "formats": 48,
+        "formats": [
+          47,
+          48
+        ],
         "directory": "overlay_48"
       },
       {
-        "formats": {
-          "min_inclusive": 47,
-          "max_inclusive": 47
-        },
+        "formats": 47,
         "directory": "overlay_47"
       }
     ]
@@ -76,17 +76,14 @@ say this is in an overlay that exists already
     "pack_format": 57,
     "description": "",
     "supported_formats": [
-      48,
+      47,
       57
     ]
   },
   "overlays": {
     "entries": [
       {
-        "formats": {
-          "min_inclusive": 47,
-          "max_inclusive": 47
-        },
+        "formats": 47,
         "directory": "overlay_47"
       }
     ]

diff --git a/tests/snapshots/examples__build_existing_overlay3__0.pack.md b/tests/snapshots/examples__build_existing_overlay3__0.pack.md
@@ -0,0 +1,129 @@
+# Lectern snapshot
+
+## Data pack
+
+`@data_pack pack.mcmeta`
+
+```json
+{
+  "pack": {
+    "pack_format": 57,
+    "description": "",
+    "supported_formats": [
+      44,
+      57
+    ]
+  },
+  "overlays": {
+    "entries": [
+      {
+        "formats": [
+          47,
+          48
+        ],
+        "directory": "overlay_48"
+      },
+      {
+        "formats": 47,
+        "directory": "overlay_47"
+      },
+      {
+        "formats": {
+          "min_inclusive": 44,
+          "max_inclusive": 44
+        },
+        "directory": "overlay_44"
+      }
+    ]
+  }
+}
+```
+
+### demo
+
+`@function demo:foo`
+
+```mcfunction
+say this is the same in both
+```
+
+## Overlay `overlay_44`
+
+`@overlay overlay_44`
+
+### demo
+
+`@function demo:foo`
+
+```mcfunction
+say this is in an overlay that exists already
+```
+
+## Overlay `overlay_48`
+
+`@overlay overlay_48`
+
+### demo
+
+`@function demo:demo`
+
+```mcfunction
+say this only exists in the overlay
+```
+
+## Overlay `overlay_47`
+
+`@overlay overlay_47`
+
+### demo
+
+`@function demo:foo`
+
+```mcfunction
+say this is in an overlay that exists already
+```
+
+`@endoverlay`
+
+## Resource pack
+
+`@resource_pack pack.mcmeta`
+
+```json
+{
+  "pack": {
+    "pack_format": 57,
+    "description": "",
+    "supported_formats": [
+      44,
+      57
+    ]
+  },
+  "overlays": {
+    "entries": [
+      {
+        "formats": 47,
+        "directory": "overlay_47"
+      }
+    ]
+  }
+}
+```
+
+### demo
+
+`@texture demo:foo`
+
+![texture.png](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAACZElEQVR4Ae1Yi2rDMAxsxv7/l7fd4MohpNrRTOQ1ChTbku70sBycHl8/z+PGz8eNc/9NvQvQHXDzCvQRuHkDPLoDugNuXoE+AjdvgH4Jfs50wHEcrhm+o6jTbyqV6RwkXFtCxVud4miX5bHcl74DoqBtUKP1Kh74meoAW3WuR4FG+r/iybuCZ6oAdPhqPLMrnm0mmRU8ywrwqjjUeUl6SdA+GlfxgH9ZATSoKKlIHiUayVfxgP/Sl2CUkBYvspmRZ3iOH1D/JzhT3Xe12eIIVBa3C1BZ/R18dwfssAuVMXQHVFZ/B9/Pq3B0vcQ9iTq9M6mMcy8hxXh6yCI8sZ7e6rhWPsg8LOOAvvwIvApQk2HQHC2Oa460G43PDmAFScD1iED1GQzxI6zqGSOxHCM59IqnPcZnAVQYzV85AEb1kcMz3Mqh3B4HbGHD0dooXnlPFcCS2rUSW1209jAabITz5B4X7SLdqQIoiRekJ1MMg9HRw6iec+WZxRCL0cOAs/wlqEHqXBNW+ep5/x+wuqL/jW/bI3BVIbsAV1V6Vz/dAbvuzFVxdQdcVeld/dy+A4bfArxD42qqc+6oJ6NOR9qpDHO98no21Hs64qmjLeSeDHL7pDqA5JYssyYXR8sRya1ddj3sgIgYgWnFIzsrV4yXXKSnnBiuLf/ZdaoAcI5AGMwZpxazKhHEYLln4kodARBnAweOP/BkggZu1ZPqADpHImcTGNmP9PTtjbopszzpDvACyMgYNEfLEcmtXXbdf4hkK/cuuPIjUF3ILkD1DlT77w6o3oFq/90B1TtQ7b87oHoHqv1/A4i35Y8io2pYAAAAAElFTkSuQmCC)
+
+## Overlay `overlay_47`
+
+`@overlay overlay_47`
+
+### demo
+
+`@texture demo:demo`
+
+![texture.png](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAADkklEQVR4Ae2WiY4cMQhEM9H+/y8ny0RPKiGw8ZXpVfdIu9hAFWV8qF9/vn+/bvz7feO1v5f+NODuJ+DLGvB6vcI+2PNATJ8K9em4xxUWSepTz/NrjUyf1vF4P996BSBXAb1xhvF+P+/xVuPvE9DqdpVI8+BTX2+smGyx5te8HqfGM853AzQxG2cEUX6UOyscfsMbb8RNTmTBaUy1lBugBNlYickZFQwustFiojzvU5zXWG6AArNFZX4vKJpXsboY5Ynwqllzdbz1EVRiHbeEZLHMr7w7xq/vQs+n8I5O/lSO/3IFrtyc8iOoi4geHOJ2o4jr7VKfjg3HHA6scuHDwt3CktuyR08A4rCRkFYsylffChaeqRMAmF1gjtWdU5FZvuGyGH54mFOrhdWcbLzUAERFIkxoK+4FaS6xaLHE1K5glxrQEuhF2TzKj3weq4vV8QoWnqUGREJNlPp1HjVBcxFVtStYahx9BNkhLEUrdgYD7wj2+RKka3e1R6/AT2jqlkfQ7hwPkt6/yBc1hTwfq/BmWONSLZ6b+fYT0BJE0SvZpROQLcSaUOk+eHJpHnPiFTuDMd7tDTAhthAWUxFfyenxaXykGdsbYIuhCZWF7coZWbTWPNIAK7C7CbpA3W0WE/kUQ5632x9BX+Dq8+dL8Oo7dFrf7a/A0CPIQ6OPi/cx150jP4pZno8ztxgYfMwtxs/HmBNv2akTEImwIqN+hHkcc2yW1/MTb9mhE6BEJi7rtPr9IoyjF7ecCGd++1Xw/zL7/6caYAJMYEtkq3QPBz/Wc/XwPr81n7oCRqi70CpQiUVcka/CNZozdQIoMrtDujhOkvrgz6zmRqch8ilGeadPgJIwzopkfnCftM+X4Ce7f4XaW6/AFRY0qmHpEdRi0cNjcb3/UQ7xKKb4KA5WdYyOj58AhGO9wMyveVlO5ldsb7ztBFBIdyUSmMXxg2EOr1n1kafxmfH2BvRErAhfwWa6jl+BrPBV/NtPQG+XVo7xCjZr+PEToKIzEZ/0P1+Cn+z+FWofvwJXWGRLQ/kRbD1u3PMox8eYe1ER1nLIz+LkZHHwvh7zbScgE5D5EdCzp/HlE4DQXkc1PiO+h9c4mtRqvFJ/uAFKqsVUxMlxr77GKzqGG1AhPZkz2vRe/nADeoS9HYjiyhnFtaFRXPE6tlz7U59y2XjbI5gVyfxeSDZfxWe8+J8vQTpxV7vtCvzUBv4FVue6zIipvs8AAAAASUVORK5CYII=)
+
+`@endoverlay`