Skip to content

Commit 4b13cd5

Browse files
committed
🐛 Allow any item as decorated pot sherd
1 parent 8ad3850 commit 4b13cd5

File tree

2 files changed

+5
-34
lines changed

2 files changed

+5
-34
lines changed

java/world/block/decorated_pot.mcdoc

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ use ::java::world::item::ItemStack
33
#[since="1.19.4"]
44
dispatch minecraft:block_entity[decorated_pot] to struct DecoratedPot {
55
...super::BlockEntity,
6-
/// Item ID of what was used for each side of the pot.
7-
sherds?: [#[id] Sherd] @ 4,
6+
/// Item ID of what was used for each side of the pot. \
7+
/// Only vanilla pottery sherds have hardcoded decoration textures.
8+
/// Other items are treated like brick.
9+
sherds?: [#[id="item"] string] @ 4,
810
/// Loot table that will populate this container.
911
#[since="1.20.3"]
1012
LootTable?: #[id(registry="loot_table",empty="allowed")] string,
@@ -16,33 +18,3 @@ dispatch minecraft:block_entity[decorated_pot] to struct DecoratedPot {
1618
}
1719

1820
dispatch minecraft:block[decorated_pot] to minecraft:block_entity[decorated_pot]
19-
20-
enum(string) Sherd {
21-
Angler = "angler_pottery_sherd",
22-
Archer = "archer_pottery_sherd",
23-
ArmsUp = "arms_up_pottery_sherd",
24-
Blade = "blade_pottery_sherd",
25-
Brewer = "brewer_pottery_sherd",
26-
Brick = "brick",
27-
Burn = "burn_pottery_sherd",
28-
Danger = "danger_pottery_sherd",
29-
Explorer = "explorer_pottery_sherd",
30-
Friend = "friend_pottery_sherd",
31-
Heart = "heart_pottery_sherd",
32-
Heartbreak = "heartbreak_pottery_sherd",
33-
Howl = "howl_pottery_sherd",
34-
Miner = "miner_pottery_sherd",
35-
Mourner = "mourner_pottery_sherd",
36-
Plenty = "plenty_pottery_sherd",
37-
Prize = "prize_pottery_sherd",
38-
Sheaf = "sheaf_pottery_sherd",
39-
Shelter = "shelter_pottery_sherd",
40-
Skull = "skull_pottery_sherd",
41-
Snort = "snort_pottery_sherd",
42-
#[since="1.20.5"]
43-
Flow = "flow_pottery_sherd",
44-
#[since="1.20.5"]
45-
Guster = "guster_pottery_sherd",
46-
#[since="1.20.5"]
47-
Scrape = "scrape_pottery_sherd",
48-
}

java/world/component/block.mcdoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use ::java::data::advancement::predicate::ItemPredicate
22
use ::java::world::block::BlockEntityData
33
use ::java::world::block::banner::BannerPatternLayer
4-
use ::java::world::block::decorated_pot::Sherd
54
use ::java::world::component::item::AdventureModePredicate
65
use ::java::world::entity::AnyEntity
76
use ::java::world::item::ItemStackTemplate
@@ -51,4 +50,4 @@ dispatch minecraft:data_component[lock] to (
5150
#[since="1.21.2"] ItemPredicate |
5251
)
5352

54-
dispatch minecraft:data_component[pot_decorations] to [#[id] Sherd] @ ..4
53+
dispatch minecraft:data_component[pot_decorations] to [#[id="item"] string] @ ..4

0 commit comments

Comments
 (0)