Skip to content

Commit a80e414

Browse files
mammerlamammerla
committed
v1.26.30.20-preview
1 parent 6c124c9 commit a80e414

411 files changed

Lines changed: 133847 additions & 1542 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/biomes/sulfur_caves.biome.json‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"format_version": "beta",
3+
"minecraft:biome": {
4+
"description": {
5+
"identifier": "minecraft:sulfur_caves"
6+
},
7+
"components": {
8+
"minecraft:climate": {
9+
"downfall": 0.4,
10+
"temperature": 0.8
11+
},
12+
"minecraft:overworld_height": {
13+
"noise_type": "default"
14+
},
15+
16+
"minecraft:tags": {
17+
"tags": [
18+
"caves",
19+
"sulfur_caves",
20+
"overworld",
21+
"monster"
22+
]
23+
},
24+
"minecraft:subsurface_builder": {
25+
"builder": {
26+
"type": "minecraft:noise_gradient",
27+
"noise_descriptor": {
28+
"name": "minecraft:sulfur_cave_gradient",
29+
"first_octave": -5,
30+
"amplitudes": [1.0, 0.0, 1.0]
31+
},
32+
"non_replaceable_blocks": [ "minecraft:bedrock" ],
33+
"noise_block_specifiers": [
34+
{
35+
"range": {
36+
"min": 0.5,
37+
"max": 0.55
38+
},
39+
"block": "minecraft:tuff"
40+
},
41+
{
42+
"range": {
43+
"min": 0.55,
44+
"max": 0.65
45+
},
46+
"block": "minecraft:cinnabar"
47+
},
48+
{
49+
"range": {
50+
"min": 0.65,
51+
"max": 0.7
52+
},
53+
"block": "minecraft:granite"
54+
},
55+
{
56+
"range": {
57+
"min": 0.7,
58+
"max": 1.0
59+
},
60+
"block": "minecraft:sulfur"
61+
}
62+
]
63+
}
64+
}
65+
}
66+
}
67+
}

‎behavior_pack/entities/boat.json‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.26.0",
2+
"format_version": "beta",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:boat",
@@ -17,7 +17,7 @@
1717
"minecraft:water",
1818
"minecraft:flowing_water"
1919
],
20-
"simulate_waves": true
20+
"movement_type": "waves"
2121
},
2222
"minecraft:collision_box": {
2323
"height": 0.455,
@@ -116,9 +116,18 @@
116116
"table": "loot_tables/entities/boat.json"
117117
},
118118
"minecraft:physics": {},
119-
"minecraft:pushable": {
120-
"is_pushable": true,
121-
"is_pushable_by_piston": true
119+
"minecraft:pushable_by_entity": {
120+
"presets": [
121+
{
122+
"push_mode": "legacy_boat",
123+
"strength_multiplier": 0.1,
124+
"min_distance": 0.3,
125+
"push_scale_self": 0.5,
126+
"push_scale_other": 0.25
127+
}
128+
]
129+
},
130+
"minecraft:pushable_by_block": {
122131
},
123132
"minecraft:rideable": {
124133
"interact_text": "action.interact.ride.boat",
@@ -144,7 +153,7 @@
144153
-0.2,
145154
0.0
146155
],
147-
"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"
156+
"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"
148157
},
149158
{
150159
"lock_rider_rotation": 90,
@@ -155,7 +164,7 @@
155164
-0.2,
156165
0.0
157166
],
158-
"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"
167+
"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"
159168
}
160169
],
161170
"pull_in_entities": true,
@@ -178,7 +187,7 @@
178187
"minecraft:flowing_water"
179188
],
180189
"drag_down_on_buoyancy_removed": 0.7,
181-
"simulate_waves": false
190+
"movement_type": "none"
182191
},
183192
"minecraft:out_of_control": {},
184193
"minecraft:timer": {
@@ -199,7 +208,7 @@
199208
"minecraft:flowing_water"
200209
],
201210
"drag_down_on_buoyancy_removed": 0.7,
202-
"simulate_waves": false
211+
"movement_type": "none"
203212
},
204213
"minecraft:out_of_control": {}
205214
},
@@ -227,7 +236,7 @@
227236
0.0
228237
],
229238
"max_rider_count": 2,
230-
"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"
239+
"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"
231240
},
232241
{
233242
"min_rider_count": 2,
@@ -238,7 +247,7 @@
238247
0.0
239248
],
240249
"max_rider_count": 2,
241-
"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"
250+
"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"
242251
}
243252
],
244253
"passenger_max_width": 1.375,
@@ -270,7 +279,7 @@
270279
0.0
271280
],
272281
"max_rider_count": 2,
273-
"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"
282+
"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"
274283
},
275284
{
276285
"min_rider_count": 2,
@@ -281,7 +290,7 @@
281290
0.0
282291
],
283292
"max_rider_count": 2,
284-
"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"
293+
"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"
285294
}
286295
],
287296
"passenger_max_width": 1.375,
@@ -299,7 +308,7 @@
299308
"minecraft:water",
300309
"minecraft:flowing_water"
301310
],
302-
"simulate_waves": true
311+
"movement_type": "waves"
303312
}
304313
}
305314
},

‎behavior_pack/entities/bogged.json‎

Lines changed: 128 additions & 9 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.30",
33
"minecraft:entity": {
44
"description": {
55
"identifier": "minecraft:bogged",
@@ -223,10 +223,8 @@
223223
"avoid_water": true
224224
},
225225
"minecraft:physics": {},
226-
"minecraft:pushable": {
227-
"is_pushable": true,
228-
"is_pushable_by_piston": true
229-
},
226+
"minecraft:pushable_by_block": {},
227+
"minecraft:pushable_by_entity": {},
230228
"minecraft:shareables": {
231229
"items": [
232230
{
@@ -544,6 +542,55 @@
544542
"subject": "self",
545543
"value": false
546544
}
545+
},
546+
{
547+
"event": "minecraft:switch_to_hard_ranged",
548+
"filters": {
549+
"test": "is_difficulty",
550+
"value": "hard"
551+
}
552+
}
553+
]
554+
},
555+
"minecraft:shooter": {
556+
"aux_val": 26,
557+
"def": "minecraft:arrow",
558+
"sound": "bow"
559+
}
560+
},
561+
"minecraft:ranged_attack_hard": {
562+
"minecraft:behavior.ranged_attack": {
563+
"attack_interval": 2.5,
564+
"attack_radius": 15.0,
565+
"priority": 0
566+
},
567+
"minecraft:environment_sensor": {
568+
"triggers": [
569+
{
570+
"event": "minecraft:melee_mode",
571+
"filters": {
572+
"operator": "==",
573+
"test": "is_underwater",
574+
"subject": "self",
575+
"value": true
576+
}
577+
},
578+
{
579+
"event": "minecraft:melee_mode",
580+
"filters": {
581+
"operator": "==",
582+
"test": "has_ranged_weapon",
583+
"subject": "self",
584+
"value": false
585+
}
586+
},
587+
{
588+
"event": "minecraft:switch_to_normal_ranged",
589+
"filters": {
590+
"test": "is_difficulty",
591+
"operator": "!=",
592+
"value": "hard"
593+
}
547594
}
548595
]
549596
},
@@ -571,29 +618,101 @@
571618
},
572619
"remove": {
573620
"component_groups": [
574-
"minecraft:ranged_attack"
621+
"minecraft:ranged_attack",
622+
"minecraft:ranged_attack_hard"
575623
]
576624
}
577625
},
578626
"minecraft:entity_spawned": {
627+
"sequence": [
628+
{
629+
"filters": {
630+
"test": "is_difficulty",
631+
"value": "hard"
632+
},
633+
"add": {
634+
"component_groups": [
635+
"minecraft:ranged_attack_hard"
636+
]
637+
}
638+
},
639+
{
640+
"filters": {
641+
"test": "is_difficulty",
642+
"operator": "!=",
643+
"value": "hard"
644+
},
645+
"add": {
646+
"component_groups": [
647+
"minecraft:ranged_attack"
648+
]
649+
}
650+
}
651+
]
652+
},
653+
"minecraft:switch_to_hard_ranged": {
579654
"add": {
655+
"component_groups": [
656+
"minecraft:ranged_attack_hard"
657+
]
658+
},
659+
"remove": {
580660
"component_groups": [
581661
"minecraft:ranged_attack"
582662
]
583663
}
584664
},
585-
"minecraft:ranged_mode": {
665+
"minecraft:switch_to_normal_ranged": {
586666
"add": {
587667
"component_groups": [
588668
"minecraft:ranged_attack"
589669
]
590670
},
591671
"remove": {
592672
"component_groups": [
593-
"minecraft:melee_attack"
673+
"minecraft:ranged_attack_hard"
594674
]
595675
}
676+
},
677+
"minecraft:ranged_mode": {
678+
"sequence": [
679+
{
680+
"filters": {
681+
"test": "is_difficulty",
682+
"value": "hard"
683+
},
684+
"add": {
685+
"component_groups": [
686+
"minecraft:ranged_attack_hard"
687+
]
688+
},
689+
"remove": {
690+
"component_groups": [
691+
"minecraft:melee_attack",
692+
"minecraft:ranged_attack"
693+
]
694+
}
695+
},
696+
{
697+
"filters": {
698+
"test": "is_difficulty",
699+
"operator": "!=",
700+
"value": "hard"
701+
},
702+
"add": {
703+
"component_groups": [
704+
"minecraft:ranged_attack"
705+
]
706+
},
707+
"remove": {
708+
"component_groups": [
709+
"minecraft:melee_attack",
710+
"minecraft:ranged_attack_hard"
711+
]
712+
}
713+
}
714+
]
596715
}
597716
}
598717
}
599-
}
718+
}

0 commit comments

Comments
 (0)