Skip to content

Commit b5a49e8

Browse files
committed
feat: missing data pack resources
1 parent ec2cf49 commit b5a49e8

File tree

2 files changed

+69
-35
lines changed

2 files changed

+69
-35
lines changed

beet/contrib/worldgen.py

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88
"WorldgenBiome",
99
"WorldgenConfiguredCarver",
1010
"WorldgenConfiguredFeature",
11-
"WorldgenStructure",
12-
"WorldgenConfiguredSurfaceBuilder",
1311
"WorldgenDensityFunction",
1412
"WorldgenNoise",
1513
"WorldgenNoiseSettings",
1614
"WorldgenPlacedFeature",
1715
"WorldgenProcessorList",
18-
"WorldgenTemplatePool",
16+
"WorldgenStructure",
1917
"WorldgenStructureSet",
18+
"WorldgenConfiguredSurfaceBuilder",
19+
"WorldgenTemplatePool",
20+
"WorldgenWorldPreset",
21+
"WorldgenFlatLevelGeneratorPreset",
2022
"WorldgenBiomeTag",
2123
"WorldgenStructureSetTag",
2224
"WorldgenStructureTag",
@@ -44,15 +46,17 @@ def worldgen(pack: Union[Context, DataPack]):
4446
WorldgenBiome,
4547
WorldgenConfiguredCarver,
4648
WorldgenConfiguredFeature,
47-
WorldgenStructure,
48-
WorldgenConfiguredSurfaceBuilder,
4949
WorldgenDensityFunction,
5050
WorldgenNoise,
5151
WorldgenNoiseSettings,
5252
WorldgenPlacedFeature,
5353
WorldgenProcessorList,
54-
WorldgenTemplatePool,
54+
WorldgenStructure,
5555
WorldgenStructureSet,
56+
WorldgenConfiguredSurfaceBuilder,
57+
WorldgenTemplatePool,
58+
WorldgenWorldPreset,
59+
WorldgenFlatLevelGeneratorPreset,
5660
WorldgenBiomeTag,
5761
WorldgenStructureSetTag,
5862
WorldgenStructureTag,
@@ -96,20 +100,6 @@ class WorldgenConfiguredFeature(JsonFile):
96100
extension: ClassVar[str] = ".json"
97101

98102

99-
class WorldgenStructure(JsonFile):
100-
"""Class representing a worldgen structure feature."""
101-
102-
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "structure")
103-
extension: ClassVar[str] = ".json"
104-
105-
106-
class WorldgenConfiguredSurfaceBuilder(JsonFile):
107-
"""Class representing a worldgen surface builder."""
108-
109-
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "configured_surface_builder")
110-
extension: ClassVar[str] = ".json"
111-
112-
113103
class WorldgenDensityFunction(JsonFile):
114104
"""Class representing a density function."""
115105

@@ -145,10 +135,10 @@ class WorldgenProcessorList(JsonFile):
145135
extension: ClassVar[str] = ".json"
146136

147137

148-
class WorldgenTemplatePool(JsonFile):
149-
"""Class representing a worldgen template pool."""
138+
class WorldgenStructure(JsonFile):
139+
"""Class representing a worldgen structure feature."""
150140

151-
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "template_pool")
141+
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "structure")
152142
extension: ClassVar[str] = ".json"
153143

154144

@@ -159,16 +149,38 @@ class WorldgenStructureSet(JsonFile):
159149
extension: ClassVar[str] = ".json"
160150

161151

162-
class WorldgenBiomeTag(TagFile):
163-
"""Class representing a biome tag."""
152+
class WorldgenConfiguredSurfaceBuilder(JsonFile):
153+
"""Class representing a worldgen surface builder."""
164154

165-
scope: ClassVar[Tuple[str, ...]] = ("tags", "worldgen", "biome")
155+
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "configured_surface_builder")
156+
extension: ClassVar[str] = ".json"
166157

167158

168-
class WorldgenStructureSetTag(TagFile):
169-
"""Class representing a worldgen structure set tag."""
159+
class WorldgenTemplatePool(JsonFile):
160+
"""Class representing a worldgen template pool."""
170161

171-
scope: ClassVar[Tuple[str, ...]] = ("tags", "worldgen", "structure_set")
162+
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "template_pool")
163+
extension: ClassVar[str] = ".json"
164+
165+
166+
class WorldgenWorldPreset(JsonFile):
167+
"""Class representing a worldgen world preset."""
168+
169+
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "world_preset")
170+
extension: ClassVar[str] = ".json"
171+
172+
173+
class WorldgenFlatLevelGeneratorPreset(JsonFile):
174+
"""Class representing a worldgen flat level generator preset."""
175+
176+
scope: ClassVar[Tuple[str, ...]] = ("worldgen", "flat_level_generator_preset")
177+
extension: ClassVar[str] = ".json"
178+
179+
180+
class WorldgenBiomeTag(TagFile):
181+
"""Class representing a biome tag."""
182+
183+
scope: ClassVar[Tuple[str, ...]] = ("tags", "worldgen", "biome")
172184

173185

174186
class WorldgenStructureTag(TagFile):
@@ -177,6 +189,12 @@ class WorldgenStructureTag(TagFile):
177189
scope: ClassVar[Tuple[str, ...]] = ("tags", "worldgen", "structure")
178190

179191

192+
class WorldgenStructureSetTag(TagFile):
193+
"""Class representing a worldgen structure set tag."""
194+
195+
scope: ClassVar[Tuple[str, ...]] = ("tags", "worldgen", "structure_set")
196+
197+
180198
class WorldgenConfiguredCarverTag(TagFile):
181199
"""Class representing a worldgen carver tag."""
182200

beet/library/data_pack.py

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,27 +264,41 @@ class ItemTag(TagFile):
264264
scope: ClassVar[Tuple[str, ...]] = ("tags", "items")
265265

266266

267+
class ChatTypeTag(TagFile):
268+
"""Class representing a chat type tag."""
269+
270+
scope: ClassVar[Tuple[str, ...]] = ("tags", "chat_type")
271+
272+
273+
class DamageTypeTag(TagFile):
274+
"""Class representing a damage type tag."""
275+
276+
scope: ClassVar[Tuple[str, ...]] = ("tags", "damage_type")
277+
278+
267279
class DataPackNamespace(Namespace):
268280
"""Class representing a data pack namespace."""
269281

270282
directory = "data"
271283

272284
# fmt: off
273285
advancements: NamespacePin[Advancement] = NamespacePin(Advancement)
274-
damage_type: NamespacePin[DamageType] = NamespacePin(DamageType)
275-
chat_type: NamespacePin[ChatType] = NamespacePin(ChatType)
276286
functions: NamespacePin[Function] = NamespacePin(Function)
287+
item_modifiers: NamespacePin[ItemModifier] = NamespacePin(ItemModifier)
277288
loot_tables: NamespacePin[LootTable] = NamespacePin(LootTable)
278289
predicates: NamespacePin[Predicate] = NamespacePin(Predicate)
279290
recipes: NamespacePin[Recipe] = NamespacePin(Recipe)
280291
structures: NamespacePin[Structure] = NamespacePin(Structure)
292+
chat_type: NamespacePin[ChatType] = NamespacePin(ChatType)
293+
damage_type: NamespacePin[DamageType] = NamespacePin(DamageType)
281294
block_tags: NamespacePin[BlockTag] = NamespacePin(BlockTag)
282295
entity_type_tags: NamespacePin[EntityTypeTag] = NamespacePin(EntityTypeTag)
283296
fluid_tags: NamespacePin[FluidTag] = NamespacePin(FluidTag)
284297
function_tags: NamespacePin[FunctionTag] = NamespacePin(FunctionTag)
285298
game_event_tags: NamespacePin[GameEventTag] = NamespacePin(GameEventTag)
286299
item_tags: NamespacePin[ItemTag] = NamespacePin(ItemTag)
287-
item_modifiers: NamespacePin[ItemModifier] = NamespacePin(ItemModifier)
300+
chat_type_tags: NamespacePin[ChatTypeTag] = NamespacePin(ChatTypeTag)
301+
damage_type_tags: NamespacePin[DamageTypeTag] = NamespacePin(DamageTypeTag)
288302
# fmt: on
289303

290304

@@ -307,18 +321,20 @@ class DataPack(Pack[DataPackNamespace]):
307321

308322
# fmt: off
309323
advancements: NamespaceProxyDescriptor[Advancement] = NamespaceProxyDescriptor(Advancement)
310-
damage_type: NamespaceProxyDescriptor[DamageType] = NamespaceProxyDescriptor(DamageType)
311-
chat_type: NamespaceProxyDescriptor[ChatType] = NamespaceProxyDescriptor(ChatType)
312324
functions: NamespaceProxyDescriptor[Function] = NamespaceProxyDescriptor(Function)
325+
item_modifiers: NamespaceProxyDescriptor[ItemModifier] = NamespaceProxyDescriptor(ItemModifier)
313326
loot_tables: NamespaceProxyDescriptor[LootTable] = NamespaceProxyDescriptor(LootTable)
314327
predicates: NamespaceProxyDescriptor[Predicate] = NamespaceProxyDescriptor(Predicate)
315328
recipes: NamespaceProxyDescriptor[Recipe] = NamespaceProxyDescriptor(Recipe)
316329
structures: NamespaceProxyDescriptor[Structure] = NamespaceProxyDescriptor(Structure)
330+
chat_type: NamespaceProxyDescriptor[ChatType] = NamespaceProxyDescriptor(ChatType)
331+
damage_type: NamespaceProxyDescriptor[DamageType] = NamespaceProxyDescriptor(DamageType)
317332
block_tags: NamespaceProxyDescriptor[BlockTag] = NamespaceProxyDescriptor(BlockTag)
318333
entity_type_tags: NamespaceProxyDescriptor[EntityTypeTag] = NamespaceProxyDescriptor(EntityTypeTag)
319334
fluid_tags: NamespaceProxyDescriptor[FluidTag] = NamespaceProxyDescriptor(FluidTag)
320335
function_tags: NamespaceProxyDescriptor[FunctionTag] = NamespaceProxyDescriptor(FunctionTag)
321336
game_event_tags: NamespaceProxyDescriptor[GameEventTag] = NamespaceProxyDescriptor(GameEventTag)
322337
item_tags: NamespaceProxyDescriptor[ItemTag] = NamespaceProxyDescriptor(ItemTag)
323-
item_modifiers: NamespaceProxyDescriptor[ItemModifier] = NamespaceProxyDescriptor(ItemModifier)
338+
chat_type_tags: NamespaceProxyDescriptor[ChatTypeTag] = NamespaceProxyDescriptor(ChatTypeTag)
339+
damage_type_tags: NamespaceProxyDescriptor[DamageTypeTag] = NamespaceProxyDescriptor(DamageTypeTag)
324340
# fmt: on

0 commit comments

Comments
 (0)