Skip to content

Commit

Permalink
v1.19.60.22-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Dec 1, 2022
1 parent 82fade5 commit f230231
Show file tree
Hide file tree
Showing 61 changed files with 919 additions and 311 deletions.
75 changes: 68 additions & 7 deletions behavior_pack/entities/donkey.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
{
"slot": 0,
"item": "saddle",
"accepted_items": ["saddle"],
"accepted_items": [ "saddle" ],
"on_equip": {
"event": "minecraft:donkey_saddled"
},
Expand All @@ -167,6 +167,26 @@
}
]
},
"minecraft:interact": {
"interactions": [
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "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 }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.equip"
}
]
},
"minecraft:rideable": {
"seat_count": 1,
"crouching_skip_interact": true,
Expand Down Expand Up @@ -238,8 +258,25 @@
"on_interact": {
"filters": {
"all_of": [
{ "test" : "is_family", "subject" : "other", "value" : "player"},
{ "test" : "has_equipment", "domain": "hand","subject" : "other", "value" : "chest"}
{ "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 }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.saddle"
},
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false },
{ "test": "has_equipment", "domain": "hand", "subject": "other", "value": "chest" }
]
},
"event": "minecraft:on_chest",
Expand All @@ -254,7 +291,26 @@

"minecraft:donkey_chested": {
"minecraft:is_chested": {

},
"minecraft:interact": {
"interactions": [
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "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 }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.saddle"
}
]
}
},

Expand Down Expand Up @@ -291,7 +347,12 @@
"minecraft:hurt_on_condition": {
"damage_conditions": [
{
"filters": { "test": "in_lava", "subject": "self", "operator": "==", "value": true },
"filters": {
"test": "in_lava",
"subject": "self",
"operator": "==",
"value": true
},
"cause": "lava",
"damage_per_tick": 4
}
Expand Down Expand Up @@ -375,7 +436,7 @@
"minecraft:behavior.random_look_around": {
"priority": 8
},
"minecraft:physics": {
"minecraft:physics": {
},
"minecraft:pushable": {
"is_pushable": true,
Expand Down Expand Up @@ -473,4 +534,4 @@
}
}
}
}
}
68 changes: 66 additions & 2 deletions behavior_pack/entities/horse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,56 @@
}

},
"minecraft:interact": {
"interactions": [
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{
"none_of": [
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "value": "leather_horse_armor" },
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "value": "iron_horse_armor" },
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "value": "golden_horse_armor" },
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "value": "diamond_horse_armor" }
]
},
{
"any_of": [
{ "test": "has_equipment", "subject": "player", "domain": "hand", "value": "leather_horse_armor" },
{ "test": "has_equipment", "subject": "player", "domain": "hand", "value": "iron_horse_armor" },
{ "test": "has_equipment", "subject": "player", "domain": "hand", "value": "golden_horse_armor" },
{ "test": "has_equipment", "subject": "player", "domain": "hand", "value": "diamond_horse_armor" }
]
},
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
]
},
"target": "self"
},
"equip_item_slot": 1,
"interact_text": "action.interact.equiphorsearmor"
},
{
"play_sounds": "saddle",
"on_interact": {
"filters": {
"all_of": [
{ "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 }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.saddle"
}
]
},
"minecraft:inventory": {
"inventory_size": 2,
"container_type": "horse"
Expand Down Expand Up @@ -329,7 +379,12 @@
"minecraft:hurt_on_condition": {
"damage_conditions": [
{
"filters": { "test": "in_lava", "subject": "self", "operator": "==", "value": true },
"filters": {
"test": "in_lava",
"subject": "self",
"operator": "==",
"value": true
},
"cause": "lava",
"damage_per_tick": 4
}
Expand Down Expand Up @@ -544,6 +599,15 @@
}
},

"minecraft:spawn_adult": {
"add": {
"component_groups": [
"minecraft:horse_adult",
"minecraft:horse_wild"
]
}
},

"minecraft:on_tame": {
"remove": {
"component_groups": [
Expand Down Expand Up @@ -623,4 +687,4 @@
}
}
}
}
}
68 changes: 39 additions & 29 deletions behavior_pack/entities/llama.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,23 +145,6 @@
"temper_mod": 6
}
],
"auto_reject_items": [
{
"item": "horsearmorleather"
},
{
"item": "horsearmoriron"
},
{
"item": "horsearmorgold"
},
{
"item": "horsearmordiamond"
},
{
"item": "saddle"
}
],
"tame_event": {
"event": "minecraft:on_tame",
"target": "self"
Expand Down Expand Up @@ -208,32 +191,59 @@
"on_interact": {
"filters": {
"all_of": [
{
"test": "is_family",
"subject": "other",
"value": "player"
},
{
"test": "has_equipment",
"domain": "hand",
"subject": "other",
"value": "chest"
}
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false },
{ "test": "has_equipment", "domain": "hand", "subject": "other", "value": "chest" }
]
},
"event": "minecraft:on_chest",
"target": "self"
},
"use_item": true,
"interact_text": "action.interact.attachchest"
},
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "carpet" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "carpet" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.equipcarpet"
}
]
}
},

"minecraft:llama_chested": {
"minecraft:is_chested": {

},
"minecraft:interact": {
"interactions": [
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "test": "has_equipment", "subject": "self", "domain": "inventory", "operator": "not", "value": "carpet" },
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "carpet" },
{ "test": "is_family", "subject": "other", "value": "player" },
{ "test": "is_sneaking", "subject": "other", "value": false }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.equipcarpet"
}
]
}
},

Expand Down
42 changes: 39 additions & 3 deletions behavior_pack/entities/mule.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,22 +205,58 @@
"filters": {
"all_of": [
{ "test": "has_equipment", "subject": "other", "domain": "hand", "value": "chest"},
{ "test" : "is_family", "subject" : "other", "value" : "player"}
{ "test": "is_family", "subject": "other", "value": "player"},
{ "test": "is_sneaking", "subject": "other", "value": false }
]
},
"event": "minecraft:on_chest",
"target": "self"
},
"use_item": true,
"interact_text": "action.interact.attachchest"
},
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "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 }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.saddle"
}
]
}
},

"minecraft:mule_chested": {
"minecraft:is_chested": {

},
"minecraft:interact": {
"interactions": [
{
"play_sounds": "armor.equip_generic",
"on_interact": {
"filters": {
"all_of": [
{ "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 }
]
},
"target": "self"
},
"equip_item_slot": 0,
"interact_text": "action.interact.saddle"
}
]
}
},

Expand Down Expand Up @@ -441,4 +477,4 @@
}
}
}
}
}
Loading

0 comments on commit f230231

Please sign in to comment.