Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/bolt/tests/snapshots/bolt__parse_230__0.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
macro foo:
pass
#>ERROR Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 200 other tokens but got literal 'foo'.
#>ERROR Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 207 other tokens but got literal 'foo'.
# line 3, column 7
# 2 | pass
# 3 | as @p foo
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt/tests/snapshots/bolt__parse_305__0.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#>ERROR Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 217 other tokens but got literal 'foo'.
#>ERROR Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 224 other tokens but got literal 'foo'.
# line 1, column 11
# 1 | as @a run foo = "bar"
# : ^^^
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt/tests/snapshots/bolt__parse_352__0.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
macro hello thing=subcommand:
pass
#>ERROR Expected assignment, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 219 other tokens but got literal 'print(123)'.
#>ERROR Expected assignment, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 226 other tokens but got literal 'print(123)'.
# line 3, column 7
# 2 | pass
# 3 | hello print(123)
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt/tests/snapshots/bolt__parse_358__0.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#>ERROR Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 217 other tokens but got literal '"not'.
#>ERROR Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 224 other tokens but got literal '"not'.
# line 1, column 13
# 1 | execute run "not docstring"
# : ^^^^
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt/tests/snapshots/bolt__parse_48__0.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1 * 2
#>ERROR Expected bracket '[', curly '{', decorator, docstring, ellipsis, false or 230 other tokens but got literal '*'.
#>ERROR Expected bracket '[', curly '{', decorator, docstring, ellipsis, false or 237 other tokens but got literal '*'.
# line 2, column 1
# 1 | 1 * 2
# 2 | * 3
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt/tests/snapshots/bolt__parse_99__0.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#>ERROR Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 200 other tokens but got literal 'for'.
#>ERROR Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 207 other tokens but got literal 'for'.
# line 1, column 7
# 1 | at @s for i in "foo":
# : ^^^
Expand Down
36 changes: 36 additions & 0 deletions packages/bolt/tests/snapshots/spec__prototypes__0.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"append:cat_variant_tag:name:content",
"append:chat_type_tag:name:content",
"append:chicken_variant_tag:name:content",
"append:configured_feature_tag:name:content",
"append:cow_variant_tag:name:content",
"append:damage_type_tag:name:content",
"append:dialog_tag:name:content",
Expand All @@ -33,6 +34,7 @@
"append:item_tag:name:content",
"append:painting_variant_tag:name:content",
"append:point_of_interest_type_tag:name:content",
"append:potion_tag:name:content",
"append:timeline_tag:name:content",
"append:trade_set_tag:name:content",
"append:villager_trade_tag:name:content",
Expand Down Expand Up @@ -98,10 +100,12 @@
"bossbar:set:id:value:value",
"bossbar:set:id:visible:visible",
"break",
"cat_sound_variant:name:content",
"cat_variant:name:content",
"cat_variant_tag:name:content",
"chat_type:name:content",
"chat_type_tag:name:content",
"chicken_sound_variant:name:content",
"chicken_variant:name:content",
"chicken_variant_tag:name:content",
"class:name:bases:body",
Expand Down Expand Up @@ -214,7 +218,9 @@
"clone:from:sourceDimension:begin:end:to:targetDimension:destination:strict:replace:force",
"clone:from:sourceDimension:begin:end:to:targetDimension:destination:strict:replace:move",
"clone:from:sourceDimension:begin:end:to:targetDimension:destination:strict:replace:normal",
"configured_feature_tag:name:content",
"continue",
"cow_sound_variant:name:content",
"cow_variant:name:content",
"cow_variant_tag:name:content",
"damage:target:amount",
Expand Down Expand Up @@ -591,6 +597,7 @@
"execute:append:cat_variant_tag:name:content",
"execute:append:chat_type_tag:name:content",
"execute:append:chicken_variant_tag:name:content",
"execute:append:configured_feature_tag:name:content",
"execute:append:cow_variant_tag:name:content",
"execute:append:damage_type_tag:name:content",
"execute:append:dialog_tag:name:content",
Expand All @@ -605,6 +612,7 @@
"execute:append:item_tag:name:content",
"execute:append:painting_variant_tag:name:content",
"execute:append:point_of_interest_type_tag:name:content",
"execute:append:potion_tag:name:content",
"execute:append:timeline_tag:name:content",
"execute:append:trade_set_tag:name:content",
"execute:append:villager_trade_tag:name:content",
Expand Down Expand Up @@ -668,10 +676,12 @@
"execute:bossbar:set:id:style:progress",
"execute:bossbar:set:id:value:value",
"execute:bossbar:set:id:visible:visible",
"execute:cat_sound_variant:name:content",
"execute:cat_variant:name:content",
"execute:cat_variant_tag:name:content",
"execute:chat_type:name:content",
"execute:chat_type_tag:name:content",
"execute:chicken_sound_variant:name:content",
"execute:chicken_variant:name:content",
"execute:chicken_variant_tag:name:content",
"execute:clear:targets",
Expand Down Expand Up @@ -782,6 +792,8 @@
"execute:clone:from:sourceDimension:begin:end:to:targetDimension:destination:strict:replace:move",
"execute:clone:from:sourceDimension:begin:end:to:targetDimension:destination:strict:replace:normal",
"execute:commands",
"execute:configured_feature_tag:name:content",
"execute:cow_sound_variant:name:content",
"execute:cow_variant:name:content",
"execute:cow_variant_tag:name:content",
"execute:damage:target:amount",
Expand Down Expand Up @@ -1584,12 +1596,16 @@
"execute:merge:banner_pattern_tag:name:content",
"execute:merge:block_tag:name:content",
"execute:merge:blockstate:name:content",
"execute:merge:cat_sound_variant:name:content",
"execute:merge:cat_variant:name:content",
"execute:merge:cat_variant_tag:name:content",
"execute:merge:chat_type:name:content",
"execute:merge:chat_type_tag:name:content",
"execute:merge:chicken_sound_variant:name:content",
"execute:merge:chicken_variant:name:content",
"execute:merge:chicken_variant_tag:name:content",
"execute:merge:configured_feature_tag:name:content",
"execute:merge:cow_sound_variant:name:content",
"execute:merge:cow_variant:name:content",
"execute:merge:cow_variant_tag:name:content",
"execute:merge:damage_type:name:content",
Expand Down Expand Up @@ -1621,13 +1637,16 @@
"execute:merge:painting_variant:name:content",
"execute:merge:painting_variant_tag:name:content",
"execute:merge:particle_file:name:content",
"execute:merge:pig_sound_variant:name:content",
"execute:merge:pig_variant:name:content",
"execute:merge:point_of_interest_type_tag:name:content",
"execute:merge:post_effect:name:content",
"execute:merge:potion_tag:name:content",
"execute:merge:predicate:name:content",
"execute:merge:recipe:name:content",
"execute:merge:shader:name:content",
"execute:merge:shader_post:name:content",
"execute:merge:sulfur_cube_archetype:name:content",
"execute:merge:test_environment:name:content",
"execute:merge:test_instance:name:content",
"execute:merge:texture_mcmeta:name:content",
Expand Down Expand Up @@ -1695,6 +1714,7 @@
"execute:particle_file:name:content",
"execute:perf:start",
"execute:perf:stop",
"execute:pig_sound_variant:name:content",
"execute:pig_variant:name:content",
"execute:place:feature:feature",
"execute:place:feature:feature:pos",
Expand Down Expand Up @@ -1781,12 +1801,14 @@
"execute:positioned:over:heightmap:subcommand",
"execute:positioned:pos:subcommand",
"execute:post_effect:name:content",
"execute:potion_tag:name:content",
"execute:predicate:name:content",
"execute:prepend:banner_pattern_tag:name:content",
"execute:prepend:block_tag:name:content",
"execute:prepend:cat_variant_tag:name:content",
"execute:prepend:chat_type_tag:name:content",
"execute:prepend:chicken_variant_tag:name:content",
"execute:prepend:configured_feature_tag:name:content",
"execute:prepend:cow_variant_tag:name:content",
"execute:prepend:damage_type_tag:name:content",
"execute:prepend:dialog_tag:name:content",
Expand All @@ -1801,6 +1823,7 @@
"execute:prepend:item_tag:name:content",
"execute:prepend:painting_variant_tag:name:content",
"execute:prepend:point_of_interest_type_tag:name:content",
"execute:prepend:potion_tag:name:content",
"execute:prepend:timeline_tag:name:content",
"execute:prepend:trade_set_tag:name:content",
"execute:prepend:villager_trade_tag:name:content",
Expand Down Expand Up @@ -1977,6 +2000,7 @@
"execute:store:success:storage:target:path:long:scale:subcommand",
"execute:store:success:storage:target:path:short:scale:subcommand",
"execute:subcommand",
"execute:sulfur_cube_archetype:name:content",
"execute:summon:entity:subcommand",
"execute:swing:targets",
"execute:swing:targets:mainhand",
Expand Down Expand Up @@ -2720,12 +2744,16 @@
"merge:banner_pattern_tag:name:content",
"merge:block_tag:name:content",
"merge:blockstate:name:content",
"merge:cat_sound_variant:name:content",
"merge:cat_variant:name:content",
"merge:cat_variant_tag:name:content",
"merge:chat_type:name:content",
"merge:chat_type_tag:name:content",
"merge:chicken_sound_variant:name:content",
"merge:chicken_variant:name:content",
"merge:chicken_variant_tag:name:content",
"merge:configured_feature_tag:name:content",
"merge:cow_sound_variant:name:content",
"merge:cow_variant:name:content",
"merge:cow_variant_tag:name:content",
"merge:damage_type:name:content",
Expand Down Expand Up @@ -2757,13 +2785,16 @@
"merge:painting_variant:name:content",
"merge:painting_variant_tag:name:content",
"merge:particle_file:name:content",
"merge:pig_sound_variant:name:content",
"merge:pig_variant:name:content",
"merge:point_of_interest_type_tag:name:content",
"merge:post_effect:name:content",
"merge:potion_tag:name:content",
"merge:predicate:name:content",
"merge:recipe:name:content",
"merge:shader:name:content",
"merge:shader_post:name:content",
"merge:sulfur_cube_archetype:name:content",
"merge:test_environment:name:content",
"merge:test_instance:name:content",
"merge:texture_mcmeta:name:content",
Expand Down Expand Up @@ -2835,6 +2866,7 @@
"pass",
"perf:start",
"perf:stop",
"pig_sound_variant:name:content",
"pig_variant:name:content",
"place:feature:feature",
"place:feature:feature:pos",
Expand Down Expand Up @@ -2921,12 +2953,14 @@
"positioned:over:heightmap:subcommand",
"positioned:pos:subcommand",
"post_effect:name:content",
"potion_tag:name:content",
"predicate:name:content",
"prepend:banner_pattern_tag:name:content",
"prepend:block_tag:name:content",
"prepend:cat_variant_tag:name:content",
"prepend:chat_type_tag:name:content",
"prepend:chicken_variant_tag:name:content",
"prepend:configured_feature_tag:name:content",
"prepend:cow_variant_tag:name:content",
"prepend:damage_type_tag:name:content",
"prepend:dialog_tag:name:content",
Expand All @@ -2941,6 +2975,7 @@
"prepend:item_tag:name:content",
"prepend:painting_variant_tag:name:content",
"prepend:point_of_interest_type_tag:name:content",
"prepend:potion_tag:name:content",
"prepend:timeline_tag:name:content",
"prepend:trade_set_tag:name:content",
"prepend:villager_trade_tag:name:content",
Expand Down Expand Up @@ -3129,6 +3164,7 @@
"store:success:storage:target:path:int:scale:subcommand",
"store:success:storage:target:path:long:scale:subcommand",
"store:success:storage:target:path:short:scale:subcommand",
"sulfur_cube_archetype:name:content",
"summon:entity",
"summon:entity:pos",
"summon:entity:pos:nbt",
Expand Down
8 changes: 8 additions & 0 deletions src/beet/contrib/worldgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"WorldgenPlacedFeatureTag",
"WorldgenFlatLevelGeneratorPresetTag",
"WorldgenWorldPresetTag",
"ConfiguredFeatureTag",
]


Expand Down Expand Up @@ -67,6 +68,7 @@ def worldgen(pack: Union[Context, DataPack]):
WorldgenPlacedFeatureTag,
WorldgenFlatLevelGeneratorPresetTag,
WorldgenWorldPresetTag,
ConfiguredFeatureTag,
]


Expand Down Expand Up @@ -237,3 +239,9 @@ class WorldgenWorldPresetTag(TagFile):
"""Class representing a worldgen world preset tag."""

scope: ClassVar[NamespaceFileScope] = ("tags", "worldgen", "world_preset")


class ConfiguredFeatureTag(TagFile):
"""Class representing a configured feature tag."""

scope: ClassVar[NamespaceFileScope] = ("tags", "worldgen", "configured_feature")
Loading