Skip to content

Commit 8cb28e3

Browse files
mammerlamammerla
committed
v1.21.70.3
1 parent 43ca279 commit 8cb28e3

File tree

744 files changed

+140829
-62441
lines changed

Some content is hidden

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

744 files changed

+140829
-62441
lines changed

‎behavior_pack/entities/axolotl.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.16.0",
2+
"format_version": "1.21.70",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:axolotl",
@@ -133,7 +133,7 @@
133133
"minecraft:is_hidden_when_invisible": {
134134
},
135135
"minecraft:type_family": {
136-
"family": [ "axolotl", "mob" ]
136+
"family": [ "aquatic", "axolotl", "mob" ]
137137
},
138138
"minecraft:collision_box": {
139139
"width": 0.75,
@@ -154,7 +154,7 @@
154154
"minecraft:damage_sensor": {
155155
"triggers": {
156156
"cause": "lightning",
157-
"deals_damage": true,
157+
"deals_damage": "yes",
158158
"damage_multiplier": 2000.0
159159
}
160160
},

‎behavior_pack/entities/bee.json

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.21.50",
2+
"format_version": "1.21.70",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:bee",
@@ -47,7 +47,9 @@
4747
"minecraft:pitcher_plant",
4848
"minecraft:torchflower",
4949
"minecraft:cherry_leaves",
50-
"minecraft:pink_petals"
50+
"minecraft:pink_petals",
51+
"minecraft:wildflowers",
52+
"minecraft:cactus_flower"
5153
],
5254
"grow_up": {
5355
"event": "minecraft:ageable_grow_up",
@@ -102,7 +104,9 @@
102104
"minecraft:pitcher_plant",
103105
"minecraft:torchflower",
104106
"minecraft:cherry_leaves",
105-
"minecraft:pink_petals"
107+
"minecraft:pink_petals",
108+
"minecraft:wildflowers",
109+
"minecraft:cactus_flower"
106110
]
107111
}
108112
},
@@ -244,7 +248,9 @@
244248
"minecraft:torchflower",
245249
"minecraft:cherry_leaves",
246250
"minecraft:pink_petals",
247-
"minecraft:open_eyeblossom"
251+
"minecraft:open_eyeblossom",
252+
"minecraft:wildflowers",
253+
"minecraft:cactus_flower"
248254
],
249255
"on_stay_completed": [
250256
{
@@ -510,7 +516,9 @@
510516
"minecraft:torchflower",
511517
"minecraft:cherry_leaves",
512518
"minecraft:pink_petals",
513-
"minecraft:open_eyeblossom"
519+
"minecraft:open_eyeblossom",
520+
"minecraft:wildflowers",
521+
"minecraft:cactus_flower"
514522
]
515523
},
516524
"minecraft:behavior.move_towards_home_restriction": {

‎behavior_pack/entities/boat.json

Lines changed: 122 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,10 @@
11
{
2-
"format_version": "1.19.80",
2+
"format_version": "1.21.70",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:boat",
66
"is_spawnable": false,
7-
"is_summonable": true,
8-
"is_experimental": false
9-
},
10-
11-
"component_groups": {
12-
"minecraft:floating": {
13-
"minecraft:buoyant": {
14-
"base_buoyancy": 1.0,
15-
"apply_gravity": true,
16-
"simulate_waves": true,
17-
"big_wave_probability": 0.03,
18-
"big_wave_speed": 10.0,
19-
"liquid_blocks": [
20-
"minecraft:water",
21-
"minecraft:flowing_water"
22-
]
23-
}
24-
},
25-
"minecraft:can_ride_default": {
26-
"minecraft:rideable": {
27-
"seat_count": 2,
28-
"passenger_max_width": 1.375,
29-
"interact_text": "action.interact.ride.boat",
30-
"pull_in_entities": true,
31-
"seats": [
32-
{
33-
"position": [ 0.0, -0.2, 0.0 ],
34-
"min_rider_count": 0,
35-
"max_rider_count": 1,
36-
"rotate_rider_by": -90,
37-
"lock_rider_rotation": 90
38-
},
39-
{
40-
"position": [ 0.2, -0.2, 0.0 ],
41-
"min_rider_count": 2,
42-
"max_rider_count": 2,
43-
"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",
44-
"lock_rider_rotation": 90
45-
},
46-
{
47-
"position": [ -0.6, -0.2, 0.0 ],
48-
"min_rider_count": 2,
49-
"max_rider_count": 2,
50-
"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",
51-
"lock_rider_rotation": 90
52-
}
53-
]
54-
}
55-
},
56-
"minecraft:can_ride_bamboo": {
57-
"minecraft:rideable": {
58-
"seat_count": 2,
59-
"passenger_max_width": 1.375,
60-
"interact_text": "action.interact.ride.boat",
61-
"pull_in_entities": true,
62-
"seats": [
63-
{
64-
"position": [ 0.0, 0.1, 0.0 ],
65-
"min_rider_count": 0,
66-
"max_rider_count": 1,
67-
"rotate_rider_by": -90,
68-
"lock_rider_rotation": 90
69-
},
70-
{
71-
"position": [ 0.2, 0.1, 0.0 ],
72-
"min_rider_count": 2,
73-
"max_rider_count": 2,
74-
"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",
75-
"lock_rider_rotation": 90
76-
},
77-
{
78-
"position": [ -0.6, 0.1, 0.0 ],
79-
"min_rider_count": 2,
80-
"max_rider_count": 2,
81-
"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",
82-
"lock_rider_rotation": 90
83-
}
84-
]
85-
}
86-
},
87-
"minecraft:above_bubble_column_down": {
88-
"minecraft:buoyant": {
89-
"base_buoyancy": 1.0,
90-
"apply_gravity": true,
91-
"simulate_waves": false,
92-
"liquid_blocks": [
93-
"minecraft:water",
94-
"minecraft:flowing_water"
95-
],
96-
"drag_down_on_buoyancy_removed": 0.7
97-
},
98-
"minecraft:timer": {
99-
"looping": false,
100-
"time": 3,
101-
"time_down_event": {
102-
"event": "minecraft:sink",
103-
"target": "self"
104-
}
105-
},
106-
"minecraft:out_of_control": {
107-
}
108-
},
109-
"minecraft:above_bubble_column_up": {
110-
"minecraft:buoyant": {
111-
"base_buoyancy": 1.0,
112-
"apply_gravity": true,
113-
"simulate_waves": false,
114-
"liquid_blocks": [
115-
"minecraft:water",
116-
"minecraft:flowing_water"
117-
],
118-
"drag_down_on_buoyancy_removed": 0.7
119-
},
120-
"minecraft:out_of_control": {
121-
}
122-
}
7+
"is_summonable": true
1238
},
1249

12510
"components": {
@@ -134,10 +19,7 @@
13419
"damage_conditions": [
13520
{
13621
"filters": {
137-
"test": "in_lava",
138-
"subject": "self",
139-
"operator": "==",
140-
"value": true
22+
"test": "in_lava", "subject": "self"
14123
},
14224
"cause": "lava",
14325
"damage_per_tick": 4
@@ -156,6 +38,8 @@
15638
},
15739
"minecraft:is_stackable": {
15840
},
41+
"minecraft:is_collidable": {
42+
},
15943
"minecraft:physics": {
16044
},
16145
"minecraft:pushable": {
@@ -185,12 +69,7 @@
18569
"max_dropped_ticks": 0,
18670
"use_motion_prediction_hints": true,
18771
"conditional_values": [
188-
{
189-
"test": "is_moving",
190-
"subject": "self",
191-
"operator": "==",
192-
"value": true
193-
}
72+
{ "test": "is_moving", "subject": "self" }
19473
]
19574
}
19675
]
@@ -232,6 +111,52 @@
232111
]
233112
},
234113
"minecraft:rideable": {
114+
"seat_count": 2,
115+
"passenger_max_width": 1.375,
116+
"interact_text": "action.interact.ride.boat",
117+
"pull_in_entities": true,
118+
"seats": [
119+
{
120+
"position": [ 0.0, -0.2, 0.0 ],
121+
"min_rider_count": 0,
122+
"max_rider_count": 1,
123+
"rotate_rider_by": -90,
124+
"lock_rider_rotation": 90
125+
},
126+
{
127+
"position": [ 0.2, -0.2, 0.0 ],
128+
"min_rider_count": 2,
129+
"max_rider_count": 2,
130+
"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",
131+
"lock_rider_rotation": 90
132+
},
133+
{
134+
"position": [ -0.6, -0.2, 0.0 ],
135+
"min_rider_count": 2,
136+
"max_rider_count": 2,
137+
"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",
138+
"lock_rider_rotation": 90
139+
}
140+
]
141+
}
142+
},
143+
144+
"component_groups": {
145+
"minecraft:floating": {
146+
"minecraft:buoyant": {
147+
"base_buoyancy": 1.0,
148+
"apply_gravity": true,
149+
"simulate_waves": true,
150+
"big_wave_probability": 0.03,
151+
"big_wave_speed": 10.0,
152+
"liquid_blocks": [
153+
"minecraft:water",
154+
"minecraft:flowing_water"
155+
]
156+
}
157+
},
158+
"minecraft:can_ride_default": {
159+
"minecraft:rideable": {
235160
"seat_count": 2,
236161
"passenger_max_width": 1.375,
237162
"interact_text": "action.interact.ride.boat",
@@ -260,6 +185,74 @@
260185
}
261186
]
262187
}
188+
},
189+
"minecraft:can_ride_bamboo": {
190+
"minecraft:rideable": {
191+
"seat_count": 2,
192+
"passenger_max_width": 1.375,
193+
"interact_text": "action.interact.ride.boat",
194+
"pull_in_entities": true,
195+
"seats": [
196+
{
197+
"position": [ 0.0, 0.1, 0.0 ],
198+
"min_rider_count": 0,
199+
"max_rider_count": 1,
200+
"rotate_rider_by": -90,
201+
"lock_rider_rotation": 90
202+
},
203+
{
204+
"position": [ 0.2, 0.1, 0.0 ],
205+
"min_rider_count": 2,
206+
"max_rider_count": 2,
207+
"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",
208+
"lock_rider_rotation": 90
209+
},
210+
{
211+
"position": [ -0.6, 0.1, 0.0 ],
212+
"min_rider_count": 2,
213+
"max_rider_count": 2,
214+
"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",
215+
"lock_rider_rotation": 90
216+
}
217+
]
218+
}
219+
},
220+
"minecraft:above_bubble_column_down": {
221+
"minecraft:buoyant": {
222+
"base_buoyancy": 1.0,
223+
"apply_gravity": true,
224+
"simulate_waves": false,
225+
"liquid_blocks": [
226+
"minecraft:water",
227+
"minecraft:flowing_water"
228+
],
229+
"drag_down_on_buoyancy_removed": 0.7
230+
},
231+
"minecraft:timer": {
232+
"looping": false,
233+
"time": 3,
234+
"time_down_event": {
235+
"event": "minecraft:sink",
236+
"target": "self"
237+
}
238+
},
239+
"minecraft:out_of_control": {
240+
}
241+
},
242+
"minecraft:above_bubble_column_up": {
243+
"minecraft:buoyant": {
244+
"base_buoyancy": 1.0,
245+
"apply_gravity": true,
246+
"simulate_waves": false,
247+
"liquid_blocks": [
248+
"minecraft:water",
249+
"minecraft:flowing_water"
250+
],
251+
"drag_down_on_buoyancy_removed": 0.7
252+
},
253+
"minecraft:out_of_control": {
254+
}
255+
}
263256
},
264257

265258
"events": {
@@ -270,10 +263,7 @@
270263
"sequence": [
271264
{
272265
"filters": {
273-
"test": "is_variant",
274-
"subject": "self",
275-
"operator": "!=",
276-
"value": 7
266+
"test": "is_variant", "operator": "!=", "value": 7
277267
},
278268
"add": {
279269
"component_groups": [
@@ -283,10 +273,7 @@
283273
},
284274
{
285275
"filters": {
286-
"test": "is_variant",
287-
"subject": "self",
288-
"operator": "==",
289-
"value": 7
276+
"test": "is_variant", "operator": "==", "value": 7
290277
},
291278
"add": {
292279
"component_groups": [

0 commit comments

Comments
 (0)