Skip to content

Commit

Permalink
v1.20.20.20-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Jun 28, 2023
1 parent 0478ac9 commit 5f340b3
Show file tree
Hide file tree
Showing 115 changed files with 12,793 additions and 892 deletions.
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
3 changes: 2 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
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
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
3 changes: 2 additions & 1 deletion behavior_pack/entities/skeleton.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@
"attack_radius": 15.0
},
"minecraft:shooter": {
"def": "minecraft:arrow"
"def": "minecraft:arrow",
"sound": "bow"
},
"minecraft:environment_sensor": {
"triggers": [
Expand Down
7 changes: 7 additions & 0 deletions behavior_pack/entities/trader_llama.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,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
9 changes: 8 additions & 1 deletion behavior_pack/entities/villager_v2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"timeout_cooldown": 8.0
}
},

"trade_resupply_component_group": {
"minecraft:trade_resupply": {}
},
Expand Down Expand Up @@ -1458,6 +1457,14 @@
},

"components": {
"minecraft:equipment": {
"slot_drop_chance": [
{
"slot": "slot.weapon.mainhand",
"drop_chance": 0.0
}
]
},
"minecraft:is_hidden_when_invisible": {
},
"minecraft:type_family": {
Expand Down
47 changes: 21 additions & 26 deletions behavior_pack/entities/zombie_villager_v2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,121 +114,116 @@
"value": 0
}
},
"nitwit": {
"minecraft:type_family": {
"family": [ "nitwit", "zombie", "zombie_villager", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
}
},
"farmer": {
"minecraft:type_family": {
"family": [ "farmer", "zombie", "zombie_villager", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 1
}
},
"fisherman": {
"minecraft:type_family": {
"family": [ "fisherman", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 2
}
},
"shepherd": {
"minecraft:type_family": {
"family": [ "shepherd", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 3
}
},
"fletcher": {
"minecraft:type_family": {
"family": [ "fletcher", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 4
}
},

"librarian": {
"minecraft:type_family": {
"family": [ "librarian", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 5
}
},

"cartographer": {
"minecraft:type_family": {
"family": [ "cartographer", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 6
}
},

"cleric": {
"minecraft:type_family": {
"family": [ "cleric", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 7
}
},

"armorer": {
"minecraft:type_family": {
"family": [ "armorer", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 8
}
},
"weaponsmith": {
"minecraft:type_family": {
"family": [ "weaponsmith", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 9
}
},
"toolsmith": {
"minecraft:type_family": {
"family": [ "toolsmith", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 10
}
},

"butcher": {
"minecraft:type_family": {
"family": [ "butcher", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 11
}
},
"leatherworker": {
"minecraft:type_family": {
"family": [ "leatherworker", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 12
}
},
"mason": {
"minecraft:type_family": {
"family": [ "stone_mason", "zombie_villager", "zombie", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 0
"value": 13
}
},
"nitwit": {
"minecraft:type_family": {
"family": [ "nitwit", "zombie", "zombie_villager", "undead", "monster", "mob" ]
},
"minecraft:variant": {
"value": 14
}
},

Expand Down
Loading

0 comments on commit 5f340b3

Please sign in to comment.