Skip to content

Commit 46d8171

Browse files
mammerlamammerla
committed
v1.26.20.4
1 parent f5b6510 commit 46d8171

1,064 files changed

Lines changed: 183496 additions & 80399 deletions

File tree

Some content is hidden

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

‎behavior_pack/entities/camel.json‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.10",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:camel",
@@ -222,13 +222,31 @@
222222
"height": 2.375
223223
}
224224
},
225+
"minecraft:camel_baby_standing": {
226+
"minecraft:pushable_by_entity": {
227+
},
228+
"minecraft:pushable_by_block": {
229+
},
230+
"minecraft:collision_box": {
231+
"width": 2.11, //0.95/0.45
232+
"height": 3.11 //1.4/0.45
233+
}
234+
},
225235
"minecraft:camel_sitting": {
226236
"minecraft:pushable_by_block": {
227237
},
228238
"minecraft:collision_box": {
229239
"width": 1.7,
230240
"height": 0.945
231241
}
242+
},
243+
"minecraft:camel_baby_sitting": {
244+
"minecraft:pushable_by_block": {
245+
},
246+
"minecraft:collision_box": {
247+
"width": 2.11, //0.95/0.45
248+
"height": 0.944 //1.425/0.45
249+
}
232250
}
233251
},
234252

@@ -383,7 +401,7 @@
383401
"add": {
384402
"component_groups": [
385403
"minecraft:camel_baby",
386-
"minecraft:camel_standing"
404+
"minecraft:camel_baby_standing"
387405
]
388406
}
389407
},
@@ -409,20 +427,78 @@
409427
}
410428
},
411429
"minecraft:start_sitting": {
430+
"sequence": [
431+
{
432+
"filters": {
433+
"test": "is_baby"
434+
},
435+
"trigger": "minecraft:start_sitting_baby"
436+
},
437+
{
438+
"filters": {
439+
"test": "is_baby",
440+
"value": false
441+
},
442+
"trigger": "minecraft:start_sitting_adult"
443+
}
444+
]
445+
},
446+
"minecraft:start_sitting_adult": {
412447
"add": {
413448
"component_groups": ["minecraft:camel_sitting"]
414449
},
415450
"remove": {
416451
"component_groups": ["minecraft:camel_standing"]
417452
}
418453
},
454+
"minecraft:start_sitting_baby": {
455+
"add": {
456+
"component_groups": [
457+
"minecraft:camel_baby_sitting"
458+
]
459+
},
460+
"remove": {
461+
"component_groups": [
462+
"minecraft:camel_baby_standing"
463+
]
464+
}
465+
},
419466
"minecraft:stop_sitting": {
467+
"sequence": [
468+
{
469+
"filters": {
470+
"test": "is_baby"
471+
},
472+
"trigger": "minecraft:stop_sitting_baby"
473+
},
474+
{
475+
"filters": {
476+
"test": "is_baby",
477+
"value": false
478+
},
479+
"trigger": "minecraft:stop_sitting_adult"
480+
}
481+
]
482+
},
483+
"minecraft:stop_sitting_adult": {
420484
"add": {
421485
"component_groups": ["minecraft:camel_standing"]
422486
},
423487
"remove": {
424488
"component_groups": ["minecraft:camel_sitting"]
425489
}
490+
},
491+
"minecraft:stop_sitting_baby": {
492+
"add": {
493+
"component_groups": [
494+
"minecraft:camel_baby_standing"
495+
]
496+
},
497+
"remove": {
498+
"component_groups": [
499+
"minecraft:camel_baby_sitting"
500+
]
501+
}
426502
}
427503
}
428504
}

‎behavior_pack/entities/drowned.json‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.0",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:drowned",
@@ -230,10 +230,8 @@
230230
"target": "self"
231231
},
232232
"minecraft:physics": {},
233-
"minecraft:pushable": {
234-
"is_pushable": true,
235-
"is_pushable_by_piston": true
236-
},
233+
"minecraft:pushable_by_block": {},
234+
"minecraft:pushable_by_entity": {},
237235
"minecraft:rotation_locked_to_vehicle": {},
238236
"minecraft:shareables": {
239237
"items": [
@@ -489,6 +487,16 @@
489487
"minecraft:spawn_egg_interaction": {},
490488
"minecraft:underwater_movement": {
491489
"value": 0.06
490+
},
491+
"minecraft:apply_knockback_rules": {
492+
"presets": [
493+
{
494+
"horizontal_power": 1.5,
495+
"vertical_power": -0.6,
496+
"vertical_velocity_cap": -0.4,
497+
"check_if_target_is_immersed_in_water": true
498+
}
499+
]
492500
}
493501
},
494502
"component_groups": {
@@ -532,6 +540,10 @@
532540
"minecraft:scale": {
533541
"value": 0.5
534542
},
543+
"minecraft:collision_box": {
544+
"height": 1.96, // 0.98/0.5
545+
"width": 0.98 // 0.49/0.5
546+
},
535547
"minecraft:type_family": {
536548
"family": [
537549
"drowned",
@@ -561,6 +573,10 @@
561573
"monster",
562574
"mob"
563575
]
576+
},
577+
"minecraft:collision_box": {
578+
"height": 1.9,
579+
"width": 0.6
564580
}
565581
},
566582
"minecraft:melee_equipment": {
@@ -859,4 +875,4 @@
859875
}
860876
}
861877
}
862-
}
878+
}

‎behavior_pack/entities/egg.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.0",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:egg",
@@ -92,9 +92,15 @@
9292
"gravity": 0.03,
9393
"power": 1.5
9494
},
95-
"minecraft:pushable": {
96-
"is_pushable": true,
97-
"is_pushable_by_piston": true
95+
"minecraft:pushable_by_block": {},
96+
"minecraft:pushable_by_entity": {},
97+
"minecraft:apply_knockback_rules": {
98+
"presets": [
99+
{
100+
"vertical_power": 0.12,
101+
"vertical_velocity_cap": 0.12
102+
}
103+
]
98104
}
99105
},
100106
"events": {
@@ -115,4 +121,4 @@
115121
}
116122
}
117123
}
118-
}
124+
}

‎behavior_pack/entities/fox.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.10",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:fox",
@@ -14,9 +14,13 @@
1414
"minecraft:scale": {
1515
"value": 0.5
1616
},
17+
"minecraft:collision_box": {
18+
"width": 0.72, // 0.36/0.5
19+
"height": 0.84 // 0.42/0.5
20+
},
1721
"minecraft:ageable": {
1822
"duration": 1200,
19-
"feed_items": ["sweet_berries", "glow_berries"],
23+
"feed_items": [ "sweet_berries", "glow_berries" ],
2024
"pause_growth_items": [ "golden_dandelion" ],
2125
"reset_growth_items": [ "golden_dandelion" ],
2226
"grow_up": {
@@ -45,10 +49,14 @@
4549
},
4650
"minecraft:breedable": {
4751
"require_tame": false,
48-
"breed_items": ["sweet_berries", "glow_berries"],
52+
"breed_items": [ "sweet_berries", "glow_berries" ],
4953
"breeds_with": {
5054
"minecraft:fox": {}
5155
}
56+
},
57+
"minecraft:collision_box": {
58+
"width": 0.6,
59+
"height": 0.7
5260
}
5361
},
5462

‎behavior_pack/entities/glow_squid.json‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.0",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:glow_squid",
@@ -83,9 +83,9 @@
8383
}
8484
},
8585
"minecraft:physics": {},
86-
"minecraft:pushable": {
87-
"is_pushable": true,
88-
"is_pushable_by_piston": true
86+
"minecraft:pushable_by_entity": {
87+
},
88+
"minecraft:pushable_by_block": {
8989
},
9090
"minecraft:spawn_egg_interaction": {},
9191
"minecraft:type_family": {
@@ -98,7 +98,11 @@
9898
},
9999
"component_groups": {
100100
"minecraft:squid_adult": {
101-
"minecraft:leashable_to": {}
101+
"minecraft:leashable_to": {},
102+
"minecraft:collision_box": {
103+
"height": 0.8,
104+
"width": 0.8
105+
}
102106
},
103107
"minecraft:squid_baby": {
104108
"minecraft:is_baby": {},
@@ -113,6 +117,10 @@
113117
},
114118
"minecraft:scale": {
115119
"value": 0.5
120+
},
121+
"minecraft:collision_box": {
122+
"height": 1, // 0.5/0.5
123+
"width": 1 // 0.5/0.5
116124
}
117125
}
118126
},
@@ -150,4 +158,4 @@
150158
}
151159
}
152160
}
153-
}
161+
}

‎behavior_pack/entities/hoglin.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.10",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:hoglin",
@@ -101,8 +101,8 @@
101101
"value": 0.5
102102
},
103103
"minecraft:collision_box": {
104-
"width": 0.85,
105-
"height": 0.85
104+
"height": 1.7, // 0.85/0.5
105+
"width": 1.5 // 0.75/0.5
106106
},
107107
"minecraft:custom_hit_test": {
108108
"hitboxes": [
@@ -350,6 +350,10 @@
350350
"minecraft:movement.basic": {},
351351
"minecraft:jump.static": {},
352352
"minecraft:can_climb": {},
353+
"minecraft:collision_box": {
354+
"height": 1.9,
355+
"width": 0.6
356+
},
353357
"minecraft:leashable": {},
354358
"minecraft:despawn": {
355359
"despawn_from_distance": {}

‎behavior_pack/entities/husk.json‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.0",
2+
"format_version": "1.26.20",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:husk",
@@ -236,9 +236,9 @@
236236
}
237237
},
238238
"minecraft:physics": {},
239-
"minecraft:pushable": {
240-
"is_pushable": true,
241-
"is_pushable_by_piston": true
239+
"minecraft:pushable_by_entity": {
240+
},
241+
"minecraft:pushable_by_block": {
242242
},
243243
"minecraft:rotation_locked_to_vehicle": {},
244244
"minecraft:shareables": {
@@ -601,6 +601,10 @@
601601
-0.35
602602
]
603603
}
604+
},
605+
"minecraft:collision_box": {
606+
"height": 1.9,
607+
"width": 0.6
604608
}
605609
},
606610
"minecraft:convert_to_zombie": {
@@ -744,6 +748,10 @@
744748
"minecraft:scale": {
745749
"value": 0.5
746750
},
751+
"minecraft:collision_box": {
752+
"height": 1.96, // 0.98/0.5
753+
"width": 0.98 // 0.49/0.5
754+
},
747755
"minecraft:type_family": {
748756
"family": [
749757
"baby_undead",
@@ -951,4 +959,4 @@
951959
}
952960
}
953961
}
954-
}
962+
}

0 commit comments

Comments
 (0)