Skip to content

Commit

Permalink
v1.20.30.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Sep 19, 2023
1 parent 67b7540 commit c775528
Show file tree
Hide file tree
Showing 241 changed files with 58,482 additions and 33,369 deletions.
2 changes: 2 additions & 0 deletions behavior_pack/entities/camel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@
"hard_distance": 6.0,
"max_distance": 10.0
},
"minecraft:balloonable": {
},
"minecraft:type_family": {
"family": [ "camel", "mob" ]
},
Expand Down
3 changes: 2 additions & 1 deletion behavior_pack/entities/dolphin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@
"max_distance": 10.0
},
"minecraft:balloonable": {
"mass": 0.4
},
"minecraft:conditional_bandwidth_optimization": {
}
Expand Down Expand Up @@ -435,4 +436,4 @@
}
}
}
}
}
30 changes: 11 additions & 19 deletions behavior_pack/entities/donkey.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "saddle" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "saddle" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"target": "self"
Expand Down Expand Up @@ -234,25 +234,8 @@
"golden_apple",
"appleEnchanted"
]
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"apple",
"carrot",
"golden_apple",
"appleEnchanted",
"golden_carrot",
"carrotOnAStick",
"hay_block",
"sugar",
"bread",
"wheat"
]
}
},

"minecraft:donkey_unchested": {
"minecraft:interact": {
"interactions": [
Expand All @@ -264,7 +247,7 @@
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "saddle" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "saddle" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"target": "self"
Expand Down Expand Up @@ -427,6 +410,15 @@
"priority": 1,
"speed_multiplier": 1.2
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"golden_apple",
"appleEnchanted",
"golden_carrot"
]
},
"minecraft:behavior.random_stroll": {
"priority": 6,
"speed_multiplier": 0.7
Expand Down
9 changes: 8 additions & 1 deletion behavior_pack/entities/drowned.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@

"minecraft:ranged_mode": {
"minecraft:shooter": {
"def": "minecraft:thrown_trident"
"def": "minecraft:thrown_trident",
"sound": "item.trident.throw"
},
"minecraft:behavior.ranged_attack": {
"priority": 3,
Expand Down Expand Up @@ -78,6 +79,7 @@
"damage": 3
},
"minecraft:behavior.melee_attack": {
"can_spread_on_fire": true,
"priority": 3,
"speed_multiplier": 1,
"track_target": false,
Expand Down Expand Up @@ -134,6 +136,11 @@
"family": [ "drowned", "zombie", "undead", "monster", "mob" ]
},
"minecraft:equip_item": {
"excluded_items": [
{
"item": "minecraft:banner:15"
}
]
},
"minecraft:collision_box": {
"width": 0.6,
Expand Down
29 changes: 25 additions & 4 deletions behavior_pack/entities/evocation_illager.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@
}
},
"components": {
"minecraft:equip_item": {
},
"minecraft:shareables": {
"items": [
{
"item": "minecraft:banner:15",
"want_amount": 1,
"surplus_amount": 1,
"priority": 0
}
]
},
"minecraft:is_hidden_when_invisible": {
},
"minecraft:experience_reward": {
Expand Down Expand Up @@ -196,11 +208,11 @@
"cast_duration": 3.0,
"particle_color": "#FFB38033",
"weight": 3,
"filters": {
"filters": {
"all_of": [
{ "test" : "is_family", "subject" : "other", "value" : "sheep"},
{ "test" : "is_color", "subject" : "other", "value" : "blue"}
]
]
},
"start_sound_event": "cast.spell",
"sequence": [
Expand Down Expand Up @@ -232,13 +244,13 @@
"priority": 2,
"entity_types": [
{
"filters": {
"filters": {
"any_of": [
{ "test" : "is_family", "subject" : "other", "value" : "player"},
{ "test" : "is_family", "subject" : "other", "value" : "snowgolem"},
{ "test" : "is_family", "subject" : "other", "value" : "irongolem"},
{ "test" : "is_family", "subject" : "other", "value" : "wandering_trader"}
]
]
},
"max_dist": 20
},
Expand Down Expand Up @@ -268,6 +280,15 @@
"minecraft:behavior.hurt_by_target": {
"priority": 1
},
"minecraft:behavior.equip_item": {
"priority": 3
},
"minecraft:behavior.pickup_items": {
"priority": 7,
"max_dist": 3,
"goal_radius": 2,
"speed_multiplier": 1.0
},
"minecraft:persistent": {
},
"minecraft:physics": {
Expand Down
2 changes: 1 addition & 1 deletion behavior_pack/entities/hoglin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"become_zombie": {
"minecraft:transformation": {
"into": "minecraft:zoglin",
"transformation_sound": "converted_to_zombified",
"transformation_sound": "mob.hoglin.converted_to_zombified",
"keep_level": true
}
},
Expand Down
23 changes: 11 additions & 12 deletions behavior_pack/entities/horse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
]
},
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"target": "self"
Expand All @@ -206,7 +206,7 @@
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "saddle" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "saddle" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"target": "self"
Expand Down Expand Up @@ -258,18 +258,8 @@
"mutation_strategy": "random",
"random_variant_mutation_interval": [0, 7],
"random_extra_variant_mutation_interval": [0, 5]
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"golden_apple",
"appleEnchanted",
"golden_carrot"
]
}
},

"minecraft:horse_saddled": {
"minecraft:is_saddled": {
},
Expand Down Expand Up @@ -474,6 +464,15 @@
"priority": 3,
"speed_multiplier": 1.2
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"golden_apple",
"appleEnchanted",
"golden_carrot"
]
},
"minecraft:behavior.random_stroll": {
"priority": 6,
"speed_multiplier": 0.7
Expand Down
10 changes: 8 additions & 2 deletions behavior_pack/entities/husk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"minecraft:convert_to_zombie": {
"minecraft:transformation": {
"into": "minecraft:zombie<minecraft:as_adult>",
"transformation_sound": "convert_to_drowned",
"transformation_sound": "mob.husk.convert_to_zombie",
"drop_equipment": true,
"delay": {
"value": 15
Expand All @@ -53,7 +53,7 @@
"minecraft:convert_to_baby_zombie": {
"minecraft:transformation": {
"into": "minecraft:zombie<minecraft:as_baby>",
"transformation_sound": "convert_to_drowned",
"transformation_sound": "mob.husk.convert_to_zombie",
"drop_equipment": true,
"delay": {
"value": 15
Expand Down Expand Up @@ -122,6 +122,11 @@
"breathes_water": true
},
"minecraft:equip_item": {
"excluded_items": [
{
"item": "minecraft:banner:15"
}
]
},
"minecraft:collision_box": {
"width": 0.6,
Expand Down Expand Up @@ -412,6 +417,7 @@
"priority": 2
},
"minecraft:behavior.melee_attack": {
"can_spread_on_fire": true,
"priority": 3
},
"minecraft:behavior.stomp_turtle_egg": {
Expand Down
17 changes: 16 additions & 1 deletion behavior_pack/entities/iron_golem.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,22 @@
"red_nether_brick",
"end_bricks",
"red_sandstone",
"stained_glass",
"white_stained_glass",
"orange_stained_glass",
"magenta_stained_glass",
"light_blue_stained_glass",
"yellow_stained_glass",
"lime_stained_glass",
"pink_stained_glass",
"gray_stained_glass",
"light_gray_stained_glass",
"cyan_stained_glass",
"purple_stained_glass",
"blue_stained_glass",
"brown_stained_glass",
"green_stained_glass",
"red_stained_glass",
"black_stained_glass",
"glass",
"glowstone",
"prismarine",
Expand Down
7 changes: 7 additions & 0 deletions behavior_pack/entities/llama.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,13 @@
"priority": 4,
"speed_multiplier": 1.2
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"hay_block"
]
},
"minecraft:behavior.random_stroll": {
"priority": 6,
"speed_multiplier": 0.7
Expand Down
32 changes: 12 additions & 20 deletions behavior_pack/entities/mule.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,25 +177,8 @@
"minecraft:inventory": {
"inventory_size": 16,
"container_type": "horse"
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"apple",
"carrot",
"golden_apple",
"appleEnchanted",
"golden_carrot",
"carrotOnAStick",
"hay_block",
"sugar",
"bread",
"wheat"
]
}
},

"minecraft:mule_unchested": {
"minecraft:interact": {
"interactions": [
Expand All @@ -206,7 +189,7 @@
"all_of": [
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "chest"},
{ "test": "is_family", "subject": "other", "value": "player"},
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"event": "minecraft:on_chest",
Expand All @@ -223,7 +206,7 @@
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "saddle" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "saddle" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"target": "self"
Expand All @@ -248,7 +231,7 @@
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "saddle" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "saddle" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
{ "test": "is_sneak_held", "subject": "other", "value": false }
]
},
"target": "self"
Expand Down Expand Up @@ -367,6 +350,15 @@
"priority": 1,
"speed_multiplier": 1.2
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 1.2,
"items": [
"golden_apple",
"appleEnchanted",
"golden_carrot"
]
},
"minecraft:behavior.random_stroll": {
"priority": 6,
"speed_multiplier": 0.7
Expand Down
1 change: 1 addition & 0 deletions behavior_pack/entities/pig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"minecraft:pig_transform": {
"minecraft:transformation": {
"into": "minecraft:pig_zombie",
"transformation_sound": "mob.pig.death",
"delay": 0.5
}
},
Expand Down
Loading

0 comments on commit c775528

Please sign in to comment.