beet-observer 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

Sign up to get free protection for your applications and to get access to all the features.
beet_observer/__init__.py CHANGED
@@ -1,3 +1,3 @@
1
- __version__ = "0.7.0"
1
+ __version__ = "0.7.1"
2
2
 
3
3
  from .plugin import *
@@ -110,9 +110,6 @@ def gen_dp_overlays(
110
110
  for registry, registry_overlay in file_types:
111
111
  check_registry(ctx, ctx_overlay, overlay_dir, registry, registry_overlay)
112
112
 
113
- # add current overlays to pack
114
- ctx.data.overlays.merge(ctx_overlay.data.overlays)
115
-
116
113
  # get pack.mcmeta overlay entries
117
114
  mcmeta: dict[str, dict[str, list[dict[str, Any]]]] = ctx.data.mcmeta.data.copy()
118
115
  if "overlays" not in mcmeta:
@@ -147,6 +144,11 @@ def gen_dp_overlays(
147
144
  }
148
145
  )
149
146
 
147
+ # add current overlays to pack
148
+ ctx.data.overlays.merge(ctx_overlay.data.overlays)
149
+ if "overlays" in ctx_overlay.data.mcmeta.data:
150
+ entries.extend(ctx_overlay.data.mcmeta.data["overlays"]["entries"])
151
+
150
152
  # save overlay entries in pack.mcmeta
151
153
  if len(entries) > 0:
152
154
  ctx.data.mcmeta.data.update({"overlays": {"entries": entries}})
@@ -38,9 +38,6 @@ def gen_rp_overlays(
38
38
  for registry, registry_overlay in file_types:
39
39
  check_registry(ctx, ctx_overlay, overlay_dir, registry, registry_overlay)
40
40
 
41
- # add current overlays to pack
42
- ctx.assets.overlays.merge(ctx_overlay.assets.overlays)
43
-
44
41
  # get pack.mcmeta overlay entries
45
42
  mcmeta: dict[str, dict[str, list[dict[str, Any]]]] = ctx.assets.mcmeta.data.copy()
46
43
  if "overlays" not in mcmeta:
@@ -75,6 +72,11 @@ def gen_rp_overlays(
75
72
  }
76
73
  )
77
74
 
75
+ # add current overlays to pack
76
+ ctx.assets.overlays.merge(ctx_overlay.assets.overlays)
77
+ if "overlays" in ctx_overlay.assets.mcmeta.data:
78
+ entries.extend(ctx_overlay.assets.mcmeta.data["overlays"]["entries"])
79
+
78
80
  # save overlay entries in pack.mcmeta
79
81
  if len(entries) > 0:
80
82
  ctx.assets.mcmeta.data.update({"overlays": {"entries": entries}})
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: beet-observer
3
- Version: 0.7.0
3
+ Version: 0.7.1
4
4
  Summary: A beet plugin to automatically generate overlays from previous datapacks
5
5
  License: MIT
6
6
  Author: BPR02
@@ -0,0 +1,8 @@
1
+ beet_observer/__init__.py,sha256=1XpNKUm-Hk_yCgkuoqDBACiacdZ1uf9I3C1WAHMucuE,45
2
+ beet_observer/data_pack.py,sha256=YIkMDaR1j6FU-ukC5UibCaweRQ-TEvd_w1sZZTbE5Ww,9972
3
+ beet_observer/plugin.py,sha256=mtGBtJNCiUHkSGiAoRl7li0oIlZBQ-cuDS91bubDaPs,2835
4
+ beet_observer/resource_pack.py,sha256=anQw0EdCF780j9rVMM1ycQAqQzEFpg_8I_h6T5Xoguo,6210
5
+ beet_observer-0.7.1.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
6
+ beet_observer-0.7.1.dist-info/METADATA,sha256=_c2AXX_DL1MmeoqYuYMHpg4xWWTkhKkRuwtlid4-2zc,674
7
+ beet_observer-0.7.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
8
+ beet_observer-0.7.1.dist-info/RECORD,,
@@ -1,8 +0,0 @@
1
- beet_observer/__init__.py,sha256=Y1gc4glC_mLy4ZYlXwD5eO0bATwzqnv2s7PuK_Rwnxc,45
2
- beet_observer/data_pack.py,sha256=oTq2jRNer7bE9lGgva98ubZ5TTIF65cSkOUSBQNWIac,9845
3
- beet_observer/plugin.py,sha256=mtGBtJNCiUHkSGiAoRl7li0oIlZBQ-cuDS91bubDaPs,2835
4
- beet_observer/resource_pack.py,sha256=BtVu0sGO20vUwOOnBrQdXvVATv2iV3ubEc0LCB8DqfQ,6079
5
- beet_observer-0.7.0.dist-info/LICENSE,sha256=oBbP6j7sgG9darFSRZxV7iO8yPR1aZiDspSK3mcLpXI,1062
6
- beet_observer-0.7.0.dist-info/METADATA,sha256=p2qCjgtHHomeWkbvnQw0ZbGhKlPQdkERq6e8Ycai94c,674
7
- beet_observer-0.7.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
8
- beet_observer-0.7.0.dist-info/RECORD,,