Skip to content

Commit 09cb073

Browse files
mammerlamammerla
committed
v1.26.30.28-preview
1 parent 4772c15 commit 09cb073

232 files changed

Lines changed: 28002 additions & 6663 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/sulfur_cube.json‎

Lines changed: 186 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
"on_damage": {
387387
"filters": {
388388
"test": "on_fire",
389-
"subject": "other"
389+
"subject": "damager"
390390
},
391391
"event": "minecraft:try_priming"
392392
},
@@ -424,6 +424,17 @@
424424
"cause": "fire",
425425
"deals_damage": "yes"
426426
},
427+
{
428+
"on_damage": {
429+
"event": "minecraft:try_priming"
430+
},
431+
"cause": "fire_tick",
432+
"deals_damage": "yes"
433+
},
434+
{
435+
"cause": "magma",
436+
"deals_damage": "no_but_entity_effects_apply"
437+
},
427438
{
428439
"cause": "all",
429440
"deals_damage": "yes"
@@ -432,10 +443,6 @@
432443
}
433444
},
434445
"minecraft:sulfur_cube_medium_with_block_interactable": {
435-
"minecraft:leashable": {
436-
},
437-
"minecraft:leashable_to": {
438-
},
439446
"minecraft:environment_sensor": {
440447
"triggers": [
441448
{
@@ -608,7 +615,7 @@
608615
},
609616
"hurt_item": 1,
610617
"interact_text": "action.interact.creeper",
611-
"play_sounds": "ignite",
618+
"play_sounds": "fuse",
612619
"swing": true
613620
},
614621
{
@@ -637,7 +644,7 @@
637644
},
638645
"use_item": true,
639646
"interact_text": "action.interact.creeper",
640-
"play_sounds": "ignite",
647+
"play_sounds": "fuse",
641648
"swing": true
642649
}
643650
]
@@ -647,6 +654,7 @@
647654
"minecraft:sulfur_cube_medium_primed": {
648655
"minecraft:explode": {
649656
"causes_fire": false,
657+
"destroy_affected_by_griefing": true,
650658
"fuse_lit": true,
651659
"power": 3,
652660
"fuse_length": 6
@@ -655,6 +663,7 @@
655663
"minecraft:sulfur_cube_medium_primed_by_explosion": {
656664
"minecraft:explode": {
657665
"causes_fire": false,
666+
"destroy_affected_by_griefing": true,
658667
"fuse_lit": true,
659668
"power": 3,
660669
"fuse_length": {
@@ -697,9 +706,18 @@
697706
"presets": [
698707
{
699708
"filters": {
700-
"test": "is_family",
701-
"subject": "other",
702-
"value": "player"
709+
"any_of": [
710+
{
711+
"test": "is_family",
712+
"subject": "other",
713+
"value": "player"
714+
},
715+
{
716+
"test": "is_controlling_passenger_family",
717+
"subject": "other",
718+
"value": "player"
719+
}
720+
]
703721
},
704722
"push_mode": "ball",
705723
"push_scale_self": 3.0,
@@ -744,9 +762,18 @@
744762
"presets": [
745763
{
746764
"filters": {
747-
"test": "is_family",
748-
"subject": "other",
749-
"value": "player"
765+
"any_of": [
766+
{
767+
"test": "is_family",
768+
"subject": "other",
769+
"value": "player"
770+
},
771+
{
772+
"test": "is_controlling_passenger_family",
773+
"subject": "other",
774+
"value": "player"
775+
}
776+
]
750777
},
751778
"push_mode": "ball",
752779
"push_scale_self": 2.0,
@@ -756,7 +783,7 @@
756783
"min_kick_speed": 0.0,
757784
"max_kick_speed": 0.5,
758785
"vertical_kick_multiplier": 0.3,
759-
"play_sound_impulse_threshold": 0.0,
786+
"play_sound_impulse_threshold": 0.1,
760787
"play_sound_cooldown_in_seconds": 0.7
761788
}
762789
]
@@ -791,9 +818,18 @@
791818
"presets": [
792819
{
793820
"filters": {
794-
"test": "is_family",
795-
"subject": "other",
796-
"value": "player"
821+
"any_of": [
822+
{
823+
"test": "is_family",
824+
"subject": "other",
825+
"value": "player"
826+
},
827+
{
828+
"test": "is_controlling_passenger_family",
829+
"subject": "other",
830+
"value": "player"
831+
}
832+
]
797833
},
798834
"push_mode": "ball",
799835
"push_scale_self": 0.3,
@@ -826,9 +862,18 @@
826862
"presets": [
827863
{
828864
"filters": {
829-
"test": "is_family",
830-
"subject": "other",
831-
"value": "player"
865+
"any_of": [
866+
{
867+
"test": "is_family",
868+
"subject": "other",
869+
"value": "player"
870+
},
871+
{
872+
"test": "is_controlling_passenger_family",
873+
"subject": "other",
874+
"value": "player"
875+
}
876+
]
832877
},
833878
"push_mode": "ball",
834879
"push_scale_self": 0.3,
@@ -861,9 +906,18 @@
861906
"presets": [
862907
{
863908
"filters": {
864-
"test": "is_family",
865-
"subject": "other",
866-
"value": "player"
909+
"any_of": [
910+
{
911+
"test": "is_family",
912+
"subject": "other",
913+
"value": "player"
914+
},
915+
{
916+
"test": "is_controlling_passenger_family",
917+
"subject": "other",
918+
"value": "player"
919+
}
920+
]
867921
},
868922
"push_mode": "ball",
869923
"push_scale_self": 3.0,
@@ -908,9 +962,18 @@
908962
"presets": [
909963
{
910964
"filters": {
911-
"test": "is_family",
912-
"subject": "other",
913-
"value": "player"
965+
"any_of": [
966+
{
967+
"test": "is_family",
968+
"subject": "other",
969+
"value": "player"
970+
},
971+
{
972+
"test": "is_controlling_passenger_family",
973+
"subject": "other",
974+
"value": "player"
975+
}
976+
]
914977
},
915978
"push_mode": "ball",
916979
"push_scale_self": 2.0,
@@ -955,9 +1018,18 @@
9551018
"presets": [
9561019
{
9571020
"filters": {
958-
"test": "is_family",
959-
"subject": "other",
960-
"value": "player"
1021+
"any_of": [
1022+
{
1023+
"test": "is_family",
1024+
"subject": "other",
1025+
"value": "player"
1026+
},
1027+
{
1028+
"test": "is_controlling_passenger_family",
1029+
"subject": "other",
1030+
"value": "player"
1031+
}
1032+
]
9611033
},
9621034
"push_mode": "ball",
9631035
"push_scale_self": 0.5,
@@ -990,9 +1062,18 @@
9901062
"presets": [
9911063
{
9921064
"filters": {
993-
"test": "is_family",
994-
"subject": "other",
995-
"value": "player"
1065+
"any_of": [
1066+
{
1067+
"test": "is_family",
1068+
"subject": "other",
1069+
"value": "player"
1070+
},
1071+
{
1072+
"test": "is_controlling_passenger_family",
1073+
"subject": "other",
1074+
"value": "player"
1075+
}
1076+
]
9961077
},
9971078
"push_mode": "ball",
9981079
"push_scale_self": 0.2,
@@ -1025,9 +1106,18 @@
10251106
"presets": [
10261107
{
10271108
"filters": {
1028-
"test": "is_family",
1029-
"subject": "other",
1030-
"value": "player"
1109+
"any_of": [
1110+
{
1111+
"test": "is_family",
1112+
"subject": "other",
1113+
"value": "player"
1114+
},
1115+
{
1116+
"test": "is_controlling_passenger_family",
1117+
"subject": "other",
1118+
"value": "player"
1119+
}
1120+
]
10311121
},
10321122
"push_mode": "ball",
10331123
"push_scale_self": 3.0,
@@ -1060,9 +1150,18 @@
10601150
"presets": [
10611151
{
10621152
"filters": {
1063-
"test": "is_family",
1064-
"subject": "other",
1065-
"value": "player"
1153+
"any_of": [
1154+
{
1155+
"test": "is_family",
1156+
"subject": "other",
1157+
"value": "player"
1158+
},
1159+
{
1160+
"test": "is_controlling_passenger_family",
1161+
"subject": "other",
1162+
"value": "player"
1163+
}
1164+
]
10661165
},
10671166
"push_mode": "ball",
10681167
"push_scale_self": 0.3,
@@ -1095,9 +1194,18 @@
10951194
"presets": [
10961195
{
10971196
"filters": {
1098-
"test": "is_family",
1099-
"subject": "other",
1100-
"value": "player"
1197+
"any_of": [
1198+
{
1199+
"test": "is_family",
1200+
"subject": "other",
1201+
"value": "player"
1202+
},
1203+
{
1204+
"test": "is_controlling_passenger_family",
1205+
"subject": "other",
1206+
"value": "player"
1207+
}
1208+
]
11011209
},
11021210
"push_mode": "ball",
11031211
"push_scale_self": 2.0,
@@ -1142,9 +1250,18 @@
11421250
"presets": [
11431251
{
11441252
"filters": {
1145-
"test": "is_family",
1146-
"subject": "other",
1147-
"value": "player"
1253+
"any_of": [
1254+
{
1255+
"test": "is_family",
1256+
"subject": "other",
1257+
"value": "player"
1258+
},
1259+
{
1260+
"test": "is_controlling_passenger_family",
1261+
"subject": "other",
1262+
"value": "player"
1263+
}
1264+
]
11481265
},
11491266
"push_mode": "ball",
11501267
"push_scale_self": 2.0,
@@ -1187,13 +1304,31 @@
11871304
"cause": "entity_attack",
11881305
"damage_cooldown": 0.0,
11891306
"damage_per_tick": 1,
1190-
"damage_range": 0.2,
1307+
"damage_range": 0.4,
11911308
"use_self_as_damage_source": false,
11921309
"entity_filter": {
1193-
"subject": "other",
1194-
"test": "is_family",
1195-
"operator": "not",
1196-
"value": "sulfur_cube"
1310+
"all_of": [
1311+
{
1312+
"subject": "other",
1313+
"test": "is_family",
1314+
"operator": "not",
1315+
"value": "sulfur_cube"
1316+
},
1317+
{
1318+
"any_of": [
1319+
{
1320+
"subject": "other",
1321+
"test": "is_family",
1322+
"value": "mob"
1323+
},
1324+
{
1325+
"subject": "other",
1326+
"test": "is_family",
1327+
"value": "player"
1328+
}
1329+
]
1330+
}
1331+
]
11971332
}
11981333
}
11991334
}
@@ -1202,6 +1337,8 @@
12021337
"components": {
12031338
"minecraft:is_hidden_when_invisible": {
12041339
},
1340+
"minecraft:renders_when_invisible": {
1341+
},
12051342
"minecraft:offspring": {
12061343
"blend_attributes": false,
12071344
"offspring_pairs": {

0 commit comments

Comments
 (0)