Skip to content

Commit 6a1f8b8

Browse files
mammerlamammerla
committed
v1.21.110.23-preview
1 parent 53f9335 commit 6a1f8b8

File tree

522 files changed

+12171
-5052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

522 files changed

+12171
-5052
lines changed

‎behavior_pack/entities/boat.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,14 @@
138138
"position": [ 0.2, -0.2, 0.0 ],
139139
"min_rider_count": 2,
140140
"max_rider_count": 2,
141-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast') ? -90 : 0",
141+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
142142
"lock_rider_rotation": 90
143143
},
144144
{
145145
"position": [ -0.6, -0.2, 0.0 ],
146146
"min_rider_count": 2,
147147
"max_rider_count": 2,
148-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast') ? -90 : 0",
148+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
149149
"lock_rider_rotation": 90
150150
}
151151
]
@@ -184,14 +184,14 @@
184184
"position": [ 0.2, -0.2, 0.0 ],
185185
"min_rider_count": 2,
186186
"max_rider_count": 2,
187-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast') ? -90 : 0",
187+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
188188
"lock_rider_rotation": 90
189189
},
190190
{
191191
"position": [ -0.6, -0.2, 0.0 ],
192192
"min_rider_count": 2,
193193
"max_rider_count": 2,
194-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast') ? -90 : 0",
194+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
195195
"lock_rider_rotation": 90
196196
}
197197
]
@@ -215,14 +215,14 @@
215215
"position": [ 0.2, 0.1, 0.0 ],
216216
"min_rider_count": 2,
217217
"max_rider_count": 2,
218-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast') ? -90 : 0",
218+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
219219
"lock_rider_rotation": 90
220220
},
221221
{
222222
"position": [ -0.6, 0.1, 0.0 ],
223223
"min_rider_count": 2,
224224
"max_rider_count": 2,
225-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast') ? -90 : 0",
225+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
226226
"lock_rider_rotation": 90
227227
}
228228
]

‎behavior_pack/entities/chest_boat.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"position": [ 0.2, -0.2, 0.0 ],
134134
"min_rider_count": 0,
135135
"max_rider_count": 1,
136-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman') ? -90 : 0",
136+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
137137
"lock_rider_rotation": 90
138138
}
139139
]
@@ -165,7 +165,7 @@
165165
"position": [ 0.2, -0.2, 0.0 ],
166166
"min_rider_count": 0,
167167
"max_rider_count": 1,
168-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman') ? -90 : 0",
168+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
169169
"lock_rider_rotation": 90
170170
}
171171
]
@@ -182,7 +182,7 @@
182182
"position": [ 0.2, 0.1, 0.0 ],
183183
"min_rider_count": 0,
184184
"max_rider_count": 1,
185-
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman') ? -90 : 0",
185+
"rotate_rider_by": "query.has_any_family('blaze', 'creeper', 'enderman', 'illager', 'magmacube', 'piglin', 'player', 'skeleton', 'slime', 'villager', 'wandering_trader', 'witch', 'zombie', 'zombie_pigman', 'happy_ghast', 'copper_golem') ? -90 : 0",
186186
"lock_rider_rotation": 90
187187
}
188188
]

‎behavior_pack/entities/copper_golem.json

Lines changed: 100 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"is_spawnable": true,
77
"is_summonable": true,
88
"properties": {
9+
"minecraft:is_becoming_statue": {
10+
"type": "bool",
11+
"default": false
12+
},
913
"minecraft:is_waxed": {
1014
"type": "bool",
1115
"default": false
@@ -32,6 +36,11 @@
3236
],
3337
"default": "none",
3438
"client_sync": true
39+
},
40+
"minecraft:has_flower": {
41+
"type": "bool",
42+
"default": false,
43+
"client_sync": true
3544
}
3645
}
3746
},
@@ -45,7 +54,7 @@
4554
},
4655
"minecraft:nameable": {},
4756
"minecraft:collision_box": {
48-
"width": 0.875,
57+
"width": 0.6,
4958
"height": 1
5059
},
5160
"minecraft:loot": {
@@ -72,6 +81,7 @@
7281
"can_pass_doors": true,
7382
"can_open_doors": true
7483
},
84+
"minecraft:annotation.open_door": {},
7585
"minecraft:movement.basic": {},
7686
"minecraft:jump.static": {},
7787
"minecraft:can_climb": {},
@@ -93,13 +103,8 @@
93103
]
94104
},
95105
"minecraft:leashable": {
96-
"presets": [
97-
{
98-
"soft_distance": 4.0,
99-
"hard_distance": 6.0,
100-
"max_distance": 10.0
101-
}
102-
]
106+
},
107+
"minecraft:leashable_to": {
103108
},
104109
"minecraft:balloonable": {},
105110
"minecraft:behavior.panic": {
@@ -123,23 +128,42 @@
123128
"interaction_time": 3.0,
124129
"allow_simultaneous_interaction": false,
125130
"search_strategy": "nearest",
126-
"search_distance": [32, 8],
131+
"search_distance": [ 32, 8 ],
127132
"max_visited_containers": 10,
128133
"initial_cooldown": 3,
129134
"idle_cooldown": 7,
130135
"place_strategy": "with_matching_or_empty"
131136
},
132-
"minecraft:behavior.random_stroll": {
137+
"minecraft:behavior.take_flower": {
133138
"priority": 4,
139+
"filters": {
140+
"all_of": [
141+
{
142+
"test": "is_daytime",
143+
"value": true
144+
},
145+
{
146+
"test": "bool_property",
147+
"domain": "minecraft:has_flower",
148+
"value": false
149+
}
150+
]
151+
},
152+
"on_take_flower": {
153+
"event": "minecraft:on_take_flower"
154+
}
155+
},
156+
"minecraft:behavior.random_stroll": {
157+
"priority": 5,
134158
"xz_dist": 3
135159
},
136160
"minecraft:behavior.look_at_player": {
137-
"priority": 5,
161+
"priority": 6,
138162
"look_distance": 6.0,
139163
"probability": 0.02
140164
},
141165
"minecraft:behavior.random_look_around": {
142-
"priority": 6
166+
"priority": 7
143167
},
144168
"minecraft:persistent": {},
145169
"minecraft:physics": {},
@@ -307,6 +331,39 @@
307331
"drop_item_slot": "slot.weapon.mainhand",
308332
"swing": true,
309333
"interact_text": "action.interact.drop_item"
334+
},
335+
// Shear flower
336+
{
337+
"cooldown": 2.5,
338+
"use_item": false,
339+
"hurt_item": 1,
340+
"play_sounds": "shear",
341+
"interact_text": "action.interact.shear",
342+
"vibration": "shear",
343+
"on_interact": {
344+
"filters": {
345+
"all_of": [
346+
{
347+
"test": "bool_property",
348+
"domain": "minecraft:has_flower",
349+
"value": true
350+
},
351+
{
352+
"test": "is_family",
353+
"subject": "other",
354+
"value": "player"
355+
},
356+
{
357+
"test": "has_equipment",
358+
"subject": "other",
359+
"domain": "hand",
360+
"value": "shears"
361+
}
362+
]
363+
},
364+
"event": "minecraft:on_sheared",
365+
"target": "self"
366+
}
310367
}
311368
]
312369
}
@@ -335,6 +392,11 @@
335392
"xz_range": 0,
336393
"y_range": 0,
337394
"chance": 0.0058,
395+
"can_place": {
396+
"test": "bool_property",
397+
"domain": "minecraft:is_becoming_statue",
398+
"value": false
399+
},
338400
"randomly_placeable_blocks": [
339401
{
340402
// North
@@ -409,8 +471,8 @@
409471
],
410472
"affected_by_griefing_rule": false,
411473
"on_place": {
412-
"event": "minecraft:serialize_entity",
413-
"target": "block"
474+
"event": "minecraft:become_statue",
475+
"target": "self"
414476
}
415477
}
416478
},
@@ -457,7 +519,8 @@
457519
"minecraft:from_serialized_entity": {
458520
"trigger": "minecraft:restart_oxidation_timer",
459521
"set_property": {
460-
"minecraft:oxidation_level": "unoxidized"
522+
"minecraft:oxidation_level": "unoxidized",
523+
"minecraft:is_becoming_statue": false
461524
}
462525
},
463526
"minecraft:wax_on": {
@@ -655,6 +718,18 @@
655718
"minecraft:chest_interaction": "none"
656719
}
657720
},
721+
"minecraft:become_statue": {
722+
"drop_item": {
723+
"slot": "slot.weapon.mainhand"
724+
},
725+
"set_property": {
726+
"minecraft:is_becoming_statue": true
727+
},
728+
"trigger": {
729+
"event": "minecraft:serialize_entity",
730+
"target": "block"
731+
}
732+
},
658733
"minecraft:serialize_entity_succeeded": {
659734
"add": {
660735
"component_groups": [
@@ -664,13 +739,20 @@
664739
"play_sound": {
665740
"sound": "deactivate"
666741
},
667-
"drop_item": {
668-
"slot": "slot.weapon.mainhand"
669-
},
670742
"trigger": {
671743
"event": "minecraft:randomize_pose",
672744
"target": "block"
673745
}
746+
},
747+
"minecraft:on_take_flower": {
748+
"set_property": {
749+
"minecraft:has_flower": true
750+
}
751+
},
752+
"minecraft:on_sheared": {
753+
"set_property": {
754+
"minecraft:has_flower": false
755+
}
674756
}
675757
}
676758
}

‎behavior_pack/entities/fox.json

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -469,46 +469,9 @@
469469
"all_items": true,
470470
"all_items_max_amount": 1,
471471
"items": [
472-
{ "item": "minecraft:apple", "priority": 0, "max_amount": 1 },
473-
{ "item": "minecraft:appleEnchanted", "priority": 0, "max_amount": 1 },
474-
{ "item": "minecraft:baked_potato", "priority": 0, "max_amount": 1 },
475-
{ "item": "minecraft:beef", "priority": 0, "max_amount": 1 },
476-
{ "item": "minecraft:beetroot", "priority": 0, "max_amount": 1 },
477-
{ "item": "minecraft:beetroot_soup", "priority": 0, "max_amount": 1 },
478-
{ "item": "minecraft:bread", "priority": 0, "max_amount": 1 },
479-
{ "item": "minecraft:bundle", "priority": 1, "max_amount": 1 },
480-
{ "item": "minecraft:carrot", "priority": 0, "max_amount": 1 },
481-
{ "item": "minecraft:chicken", "priority": 0, "max_amount": 1 },
482-
{ "item": "minecraft:chorus_fruit", "priority": 0, "max_amount": 1 },
483-
{ "item": "minecraft:clownfish", "priority": 0, "max_amount": 1 },
484-
{ "item": "minecraft:cooked_beef", "priority": 0, "max_amount": 1 },
485-
{ "item": "minecraft:cooked_chicken", "priority": 0, "max_amount": 1 },
486-
{ "item": "minecraft:cooked_fish", "priority": 0, "max_amount": 1 },
487-
{ "item": "minecraft:cooked_porkchop", "priority": 0, "max_amount": 1 },
488-
{ "item": "minecraft:cooked_rabbit", "priority": 0, "max_amount": 1 },
489-
{ "item": "minecraft:cooked_salmon", "priority": 0, "max_amount": 1 },
490-
{ "item": "minecraft:cookie", "priority": 0, "max_amount": 1 },
491-
{ "item": "minecraft:dried_kelp", "priority": 0, "max_amount": 1 },
492-
{ "item": "minecraft:fish", "priority": 0, "max_amount": 1 },
493-
{ "item": "minecraft:golden_apple", "priority": 0, "max_amount": 1 },
494-
{ "item": "minecraft:golden_carrot", "priority": 0, "max_amount": 1 },
495-
{ "item": "minecraft:melon", "priority": 0, "max_amount": 1 },
496-
{ "item": "minecraft:mushroom_stew", "priority": 0, "max_amount": 1 },
497-
{ "item": "minecraft:muttonCooked", "priority": 0, "max_amount": 1 },
498-
{ "item": "minecraft:muttonRaw", "priority": 0, "max_amount": 1 },
499-
{ "item": "minecraft:poisonous_potato", "priority": 0, "max_amount": 1 },
500-
{ "item": "minecraft:porkchop", "priority": 0, "max_amount": 1 },
501-
{ "item": "minecraft:potato", "priority": 0, "max_amount": 1 },
502-
{ "item": "minecraft:pufferfish", "priority": 0, "max_amount": 1 },
503-
{ "item": "minecraft:pumpkin_pie", "priority": 0, "max_amount": 1 },
504-
{ "item": "minecraft:rabbit", "priority": 0, "max_amount": 1 },
505-
{ "item": "minecraft:rabbit_stew", "priority": 0, "max_amount": 1 },
506-
{ "item": "minecraft:rotten_flesh", "priority": 0, "max_amount": 1 },
507-
{ "item": "minecraft:salmon", "priority": 0, "max_amount": 1 },
508-
{ "item": "minecraft:spider_eye", "priority": 0, "max_amount": 1 },
509-
{ "item": "minecraft:sweet_berries", "priority": 0, "max_amount": 1 },
472+
{ "item": "minecraft:is_food", "priority": 0, "max_amount": 1 },
510473
{ "item": "minecraft:glow_berries", "priority": 0, "max_amount": 1 },
511-
{ "item": "minecraft:suspicious_stew", "priority": 0, "max_amount": 1 }
474+
{ "item": "minecraft:bundle", "priority": 1, "max_amount": 1 }
512475
]
513476
},
514477
"minecraft:damage_sensor": {

‎behavior_pack/loot_tables/chests/village/village_weaponsmith.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
},
146146
{
147147
"type": "item",
148-
"name": "minecraft:copper_horse_armor",
148+
"name": "minecraft:copper_horse_armor"
149149
},
150150
{
151151
"type": "item",

‎behavior_pack/recipes/copper_bars.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"format_version": "1.20.10",
3+
"minecraft:recipe_shaped": {
4+
"description": {
5+
"identifier": "minecraft:copper_bars"
6+
},
7+
"tags": [
8+
"crafting_table"
9+
],
10+
"pattern": [
11+
"###",
12+
"###"
13+
],
14+
"key": {
15+
"#": {
16+
"item": "minecraft:copper_ingot"
17+
}
18+
},
19+
"unlock": [
20+
{
21+
"item": "minecraft:copper_ingot"
22+
}
23+
],
24+
"result": {
25+
"item": "minecraft:copper_bars",
26+
"count": 16
27+
}
28+
}
29+
}

0 commit comments

Comments
 (0)