Skip to content

Commit

Permalink
v1.21.40.20-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Sep 4, 2024
1 parent 85553ac commit 13b96cb
Show file tree
Hide file tree
Showing 204 changed files with 39,965 additions and 4,067 deletions.
37 changes: 22 additions & 15 deletions behavior_pack/entities/arrow.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"format_version": "1.13.0",
"format_version": "1.21.40",
"minecraft:entity": {
"description": {
"identifier": "minecraft:arrow",
"is_spawnable": false,
"is_summonable": true,
"is_experimental": false
"is_summonable": true
},

"component_groups": {
"minecraft:hard_arrow": {
"minecraft:projectile": {
Expand All @@ -18,7 +18,7 @@
"destroy_on_hit": true
},
"stick_in_ground": {
"shake_time" : 0.35
"shake_time": 0.35
},
"arrow_effect": {
"apply_effect_to_blocking_targets": false
Expand All @@ -34,7 +34,6 @@
"offset": [ 0, -0.1, 0 ]
}
},

"minecraft:player_arrow": {
"minecraft:projectile": {
"on_hit": {
Expand All @@ -48,10 +47,10 @@
"power_multiplier": 0.97
},
"stick_in_ground": {
"shake_time" : 0.35
"shake_time": 0.35
},
"arrow_effect": {
"apply_effect_to_blocking_targets": false
"apply_effect_to_blocking_targets": false
}
},
"hit_sound": "bow.hit",
Expand All @@ -64,7 +63,6 @@
"offset": [ 0, -0.1, 0 ]
}
},

"minecraft:pillager_arrow": {
"minecraft:projectile": {
"on_hit": {
Expand Down Expand Up @@ -101,7 +99,9 @@
"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 All @@ -116,7 +116,7 @@
"destroy_on_hit": true
},
"stick_in_ground": {
"shake_time" : 0.35
"shake_time": 0.35
},
"arrow_effect": {
"apply_effect_to_blocking_targets": false
Expand All @@ -133,6 +133,8 @@
},
"minecraft:physics": {
},
"minecraft:dimension_bound": {
},
"minecraft:pushable": {
"is_pushable": false,
"is_pushable_by_piston": true
Expand All @@ -150,26 +152,31 @@
"minecraft:entity_spawned": {
"sequence": [
{
"filters": {"test": "is_difficulty", "value": "hard"},
"filters": {
"test": "is_difficulty", "value": "hard"
},
"add": {
"component_groups": [ "minecraft:hard_arrow" ]
}
},
{
"filters": {"test": "is_family", "subject": "other", "value": "player"},
"filters": {
"test": "is_family", "subject": "other", "value": "player"
},
"add": {
"component_groups" : [ "minecraft:player_arrow" ]
"component_groups": [ "minecraft:player_arrow" ]
}
},
{
"filters": {"test": "is_family", "subject": "other", "value": "pillager"},
"filters": {
"test": "is_family", "subject": "other", "value": "pillager"
},
"add": {
"component_groups": [ "minecraft:pillager_arrow" ]
}
}
]
}
}

}
}
149 changes: 81 additions & 68 deletions behavior_pack/entities/cat.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "1.21.0",
"format_version": "1.21.40",
"minecraft:entity": {
"description": {
"identifier": "minecraft:cat",
Expand Down Expand Up @@ -35,10 +35,6 @@
"minecraft:scale": {
"value": 0.8
},
"minecraft:behavior.breed": {
"priority": 3,
"speed_multiplier": 1.0
},
"minecraft:breedable": {
"require_tame": true,
"require_full_health": true,
Expand All @@ -52,6 +48,10 @@
}
},
"breed_items": [ "fish", "salmon" ]
},
"minecraft:behavior.breed": {
"priority": 3,
"speed_multiplier": 1.0
}
},
"minecraft:cat_wild": {
Expand Down Expand Up @@ -142,41 +142,50 @@
},
"minecraft:sittable": {
},
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 0.5,
"within_radius": 16,
"items": [
"fish",
"salmon"
]
},
"minecraft:is_dyeable": {
"interact_text": "action.interact.dye"
},
"minecraft:on_wake_with_owner": {
"event": "minecraft:pet_slept_with_owner",
"target": "self"
},
"minecraft:behavior.teleport_to_owner": {
"priority": 0,
"filters": {
"all_of": [
{ "test": "owner_distance", "operator": ">", "value": 12 },
{ "test": "is_panicking" }
]
}
},
"minecraft:behavior.pet_sleep_with_owner": {
"priority": 2,
"speed_multiplier": 1.2,
"search_radius": 10,
"search_height": 10,
"goal_radius": 1.0
},
"minecraft:behavior.stay_while_sitting": {
"priority": 3
},
"minecraft:behavior.follow_owner": {
"priority": 4,
"speed_multiplier": 1.0,
"start_distance": 10,
"stop_distance": 2
},
"minecraft:behavior.stay_while_sitting": {
"priority": 3
"minecraft:behavior.tempt": {
"priority": 5,
"speed_multiplier": 0.5,
"within_radius": 16,
"items": [
"fish",
"salmon"
]
},
"minecraft:behavior.ocelot_sit_on_block": {
"priority": 7,
"speed_multiplier": 1.0
},
"minecraft:behavior.pet_sleep_with_owner": {
"priority": 2,
"speed_multiplier": 1.2,
"search_radius": 10,
"search_height": 10,
"goal_radius": 1.0
},
"minecraft:on_wake_with_owner": {
"event": "minecraft:pet_slept_with_owner",
"target": "self"
}
},
"minecraft:cat_gift_for_owner": {
Expand Down Expand Up @@ -346,6 +355,14 @@
"minecraft:despawn": {
"despawn_from_distance": {}
},
"minecraft:physics": {
},
"minecraft:pushable": {
"is_pushable": true,
"is_pushable_by_piston": true
},
"minecraft:conditional_bandwidth_optimization": {
},
"minecraft:behavior.float": {
"priority": 0
},
Expand Down Expand Up @@ -382,14 +399,6 @@
},
"minecraft:behavior.look_at_player": {
"priority": 9
},
"minecraft:physics": {
},
"minecraft:pushable": {
"is_pushable": true,
"is_pushable_by_piston": true
},
"minecraft:conditional_bandwidth_optimization": {
}
},

Expand Down Expand Up @@ -516,32 +525,17 @@
}
]
},

"minecraft:spawn_from_village": {
"sequence": [
{
"randomize": [
{
"weight": 3,
"remove": {
},
"add": {
"component_groups": [
"minecraft:cat_adult",
"minecraft:cat_wild"
]
}
"trigger": "minecraft:spawn_wild_adult"
},
{
"weight": 1,
"remove": {
},
"add": {
"component_groups": [
"minecraft:cat_baby",
"minecraft:cat_wild"
]
}
"trigger": "minecraft:spawn_wild_baby"
}
]
},
Expand Down Expand Up @@ -631,41 +625,60 @@
}
]
},

"minecraft:spawn_midnight_cat": {
"sequence": [
{
"trigger": "minecraft:spawn_wild_adult",
"add": {
"component_groups": [
"minecraft:cat_adult",
"minecraft:cat_wild",
"minecraft:cat_black"
]
}
}
]
},

"minecraft:entity_born": {
"sequence": [
{
"filters": {
"test": "has_component",
"operator": "!=",
"value": "minecraft:is_baby"
},
"remove": {
"test": "has_component", "operator": "!=", "value": "minecraft:is_baby"
},
"add": {
"component_groups": [
"minecraft:cat_baby",
"minecraft:cat_tame"
]
}
"trigger": "minecraft:spawn_tame_baby"
}
]
},

"minecraft:spawn_wild_baby": {
"add": {
"component_groups": [
"minecraft:cat_baby",
"minecraft:cat_wild"
]
}
},
"minecraft:spawn_wild_adult": {
"add": {
"component_groups": [
"minecraft:cat_adult",
"minecraft:cat_wild"
]
}
},
"minecraft:spawn_tame_baby": {
"add": {
"component_groups": [
"minecraft:cat_baby",
"minecraft:cat_tame"
]
}
},
"minecraft:spawn_tame_adult": {
"add": {
"component_groups": [
"minecraft:cat_adult",
"minecraft:cat_tame"
]
}
},
"minecraft:ageable_grow_up": {
"remove": {
"component_groups": [
Expand Down
Loading

0 comments on commit 13b96cb

Please sign in to comment.