diff --git a/behavior_pack/entities/cat.json b/behavior_pack/entities/cat.json index 7f3c1606a..179d25831 100644 --- a/behavior_pack/entities/cat.json +++ b/behavior_pack/entities/cat.json @@ -39,6 +39,7 @@ "require_tame": true, "require_full_health": true, "allow_sitting": true, + "combine_parent_colors": true, "breeds_with": { "mate_type": "minecraft:cat", "baby_type": "minecraft:cat", diff --git a/behavior_pack/entities/creaking.json b/behavior_pack/entities/creaking.json index 4351f95b1..c5487e5eb 100644 --- a/behavior_pack/entities/creaking.json +++ b/behavior_pack/entities/creaking.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.50", + "format_version": "1.21.60", "use_beta_features": true, "minecraft:entity": { "description": { @@ -55,8 +55,32 @@ }, "minecraft:is_hidden_when_invisible": { }, - "minecraft:environment_sensor": { + "minecraft:despawn": { + "despawn_from_distance": {} + } + }, + + "component_groups": { + "minecraft:spawned_by_player": { + "minecraft:nameable": { + }, + "minecraft:navigation.walk": { + "can_path_over_water": true, + "can_path_over_lava": false, + "avoid_damage_blocks": true + }, + "minecraft:hurt_on_condition": { + "damage_conditions": [ + { + "filters": { "test": "in_lava" }, + "cause": "lava", + "damage_per_tick": 4 + } + ] + }, + "minecraft:environment_sensor": { "triggers": [ + // This trigger needs to be aligned with the analogous one defined in "minecraft:spawned_by_creaking_heart". { "filters": { "all_of": [ @@ -76,48 +100,11 @@ ] }, "event": "minecraft:become_neutral" - }, - { - "filters": { - "all_of": [ - { "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": ">", "value": 0 }, - { "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": "<=", "value": 5 } - ] - }, - "event": "minecraft:increment_swaying_ticks" - }, - { - "filters": { - "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": ">", "value": 5 - }, - "event": "minecraft:reset_swaying_ticks" - } - ] - } - }, - - "component_groups": { - "minecraft:spawned_by_player": { - "minecraft:nameable": { - }, - "minecraft:navigation.walk": { - "can_path_over_water": true, - "can_path_over_lava": false, - "avoid_damage_blocks": true - }, - "minecraft:hurt_on_condition": { - "damage_conditions": [ - { - "filters": { "test": "in_lava" }, - "cause": "lava", - "damage_per_tick": 4 } ] } }, "minecraft:spawned_by_creaking_heart": { - "minecraft:transient": { - }, "minecraft:dimension_bound": { }, "minecraft:fire_immune": { @@ -165,6 +152,71 @@ "deals_damage": "no_but_side_effects_apply" } ] + }, + "minecraft:environment_sensor": { + "triggers": [ + // This trigger needs to be aligned with the analogous one defined in "minecraft:spawned_by_player". + { + "filters": { + "all_of": [ + { + "any_of": [ + { "test": "enum_property", "domain": "minecraft:creaking_state", "value": "hostile_observed" }, + { "test": "enum_property", "domain": "minecraft:creaking_state", "value": "hostile_unobserved" } + ] + }, + { + "any_of": [ + { "test": "has_target", "value": false }, + { "test": "actor_health", "subject": "target", "value": 0 }, + { "test": "target_distance", "operator": ">", "value": 24 } + ] + } + ] + }, + "event": "minecraft:become_neutral" + }, + // Force the Creaking to despawn if the conditions for it being spawned are no longer met. + { + "filters": { + "all_of": [ + { "test": "enum_property", "domain": "minecraft:creaking_state", "operator": "not", "value": "twitching" }, + { + "any_of": [ + { "test": "home_distance", "operator": ">", "value": 34 }, + { "test": "is_daytime" } + ] + } + ] + }, + "event": "minecraft:crumble_and_notify_creaking_heart" + }, + { + "filters": { + "all_of": [ + { "test": "enum_property", "domain": "minecraft:creaking_state", "operator": "not", "value": "twitching" }, + { "test": "is_bound_to_creaking_heart", "value": false } + ] + }, + "event": "minecraft:crumble" + }, + // Make sure that the Creaking sways for exactly 5 ticks. + { + "filters": { + "all_of": [ + { "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": ">", "value": 0 }, + { "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": "<=", "value": 5 } + ] + }, + "event": "minecraft:increment_swaying_ticks" + }, + { + "filters": { + "test": "int_property", "domain": "minecraft:creaking_swaying_ticks", "operator": ">", "value": 5 + }, + "event": "minecraft:reset_swaying_ticks" + } + ] } }, "minecraft:mobile": { @@ -259,6 +311,10 @@ { "test": "has_equipment", "subject": "other", "domain": "head", "value": "carved_pumpkin" } ] } + }, + "minecraft:ambient_sound_interval": { + // We need to override the ambient sound to be something else or it will play even after the component is removed. + "event_name": "undefined" } }, "minecraft:hostile_unobserved": { @@ -467,6 +523,12 @@ "sound": "death" } }, + "minecraft:crumble_and_notify_creaking_heart": { + "execute_event_on_home_block": { + "event": "minecraft:on_spawned_creaking_crumbling" + }, + "trigger": "minecraft:crumble" + }, "minecraft:damaged_by_player": { "execute_event_on_home_block": { "event": "minecraft:on_spawned_creaking_damaged_by_player" diff --git a/behavior_pack/entities/donkey.json b/behavior_pack/entities/donkey.json index d9e8dde3c..0e162719c 100644 --- a/behavior_pack/entities/donkey.json +++ b/behavior_pack/entities/donkey.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.10", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:donkey", @@ -313,6 +313,8 @@ "components": { "minecraft:is_hidden_when_invisible": { }, + "minecraft:ambient_sound_interval": { + }, "minecraft:type_family": { "family": [ "donkey", "mob" ] }, diff --git a/behavior_pack/entities/drowned.json b/behavior_pack/entities/drowned.json index 4670abdd1..265a706ec 100644 --- a/behavior_pack/entities/drowned.json +++ b/behavior_pack/entities/drowned.json @@ -18,7 +18,7 @@ "value": 0.5 }, "minecraft:movement": { - "value": 0.25 + "value": 0.35 }, "minecraft:underwater_movement": { "value": 0.08 diff --git a/behavior_pack/entities/fox.json b/behavior_pack/entities/fox.json index 75f6ea73f..b1fd36504 100644 --- a/behavior_pack/entities/fox.json +++ b/behavior_pack/entities/fox.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.40", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:fox", @@ -366,7 +366,7 @@ "minecraft:fox_night": { "minecraft:environment_sensor": { "triggers": [ - { + { "filters": { "test" : "weather_at_position", "value" : "thunderstorm" }, "event": "minecraft:fox_configure_thunderstorm" }, @@ -375,7 +375,7 @@ "event": "minecraft:fox_configure_day" } ] - }, + }, "minecraft:behavior.stroll_towards_village": { "priority": 11, "speed_multiplier": 1.0, @@ -404,6 +404,12 @@ "value": 80, "range": 160 } + }, + + "minecraft:fox_ambient_defending_target": { + "minecraft:ambient_sound_interval": { + "event_name": "mad" + } } }, @@ -812,7 +818,8 @@ }, "add": { "component_groups": [ - "minecraft:defending_fox" + "minecraft:defending_fox", + "minecraft:fox_ambient_defending_target" ] } }, diff --git a/behavior_pack/entities/horse.json b/behavior_pack/entities/horse.json index 183576e96..5cfce58c4 100644 --- a/behavior_pack/entities/horse.json +++ b/behavior_pack/entities/horse.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.10", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:horse", @@ -348,6 +348,8 @@ "components": { "minecraft:is_hidden_when_invisible": { }, + "minecraft:ambient_sound_interval": { + }, "minecraft:equippable": { "slots": [ { diff --git a/behavior_pack/entities/mule.json b/behavior_pack/entities/mule.json index a214f4161..7a2d4aa14 100644 --- a/behavior_pack/entities/mule.json +++ b/behavior_pack/entities/mule.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.10", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:mule", @@ -258,6 +258,8 @@ "components": { "minecraft:is_hidden_when_invisible": { }, + "minecraft:ambient_sound_interval": { + }, "minecraft:type_family": { "family": [ "mule", "mob" ] }, diff --git a/behavior_pack/entities/sheep.json b/behavior_pack/entities/sheep.json index 3c6e29666..c935c8bdb 100644 --- a/behavior_pack/entities/sheep.json +++ b/behavior_pack/entities/sheep.json @@ -71,6 +71,7 @@ }, "minecraft:breedable": { "require_tame": false, + "combine_parent_colors": true, "breeds_with": { "mate_type": "minecraft:sheep", "baby_type": "minecraft:sheep" diff --git a/behavior_pack/entities/skeleton_horse.json b/behavior_pack/entities/skeleton_horse.json index d9a52ee5c..de89d27ad 100644 --- a/behavior_pack/entities/skeleton_horse.json +++ b/behavior_pack/entities/skeleton_horse.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:skeleton_horse", @@ -72,7 +72,7 @@ "test": "is_family", "subject": "other", "value": "lightning" } }, - "deals_damage": false + "deals_damage": "no" } } } @@ -81,6 +81,8 @@ "components": { "minecraft:is_hidden_when_invisible": { }, + "minecraft:ambient_sound_interval": { + }, "minecraft:type_family": { "family": [ "skeletonhorse", "undead", "mob" ] }, diff --git a/behavior_pack/entities/strider.json b/behavior_pack/entities/strider.json index 24f96f4d7..00f1edc4a 100644 --- a/behavior_pack/entities/strider.json +++ b/behavior_pack/entities/strider.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:strider", @@ -225,6 +225,9 @@ }, "components": { + "minecraft:movement_sound_distance_offset": { + "value": 0.6 + }, "minecraft:is_hidden_when_invisible": { }, "minecraft:type_family": { @@ -242,7 +245,9 @@ "damage_conditions": [ { "filters": { - "test": "in_contact_with_water", "operator": "==", "value": true + "test": "in_contact_with_water", + "operator": "==", + "value": true }, "cause": "drowning", "damage_per_tick": 1 diff --git a/behavior_pack/entities/wolf.json b/behavior_pack/entities/wolf.json index 024546f89..15b8706cf 100644 --- a/behavior_pack/entities/wolf.json +++ b/behavior_pack/entities/wolf.json @@ -64,6 +64,7 @@ "minecraft:breedable": { "require_tame": true, "require_full_health": true, + "combine_parent_colors": true, "breeds_with": { "mate_type": "minecraft:wolf", "baby_type": "minecraft:wolf", @@ -229,11 +230,14 @@ } }, - "minecraft:wolf_tame": { - "minecraft:is_tamed": { - }, + "minecraft:on_tame_collar_color": { "minecraft:color": { "value": 14 + } + }, + + "minecraft:wolf_tame": { + "minecraft:is_tamed": { }, "minecraft:attack": { "damage": 4 @@ -1127,7 +1131,8 @@ }, "add": { "component_groups": [ - "minecraft:wolf_tame" + "minecraft:wolf_tame", + "minecraft:on_tame_collar_color" ] } }, diff --git a/behavior_pack/entities/zombie_horse.json b/behavior_pack/entities/zombie_horse.json index c7d056446..117f7eaab 100644 --- a/behavior_pack/entities/zombie_horse.json +++ b/behavior_pack/entities/zombie_horse.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:zombie_horse", @@ -58,6 +58,8 @@ "components": { "minecraft:is_hidden_when_invisible": { }, + "minecraft:ambient_sound_interval": { + }, "minecraft:type_family": { "family": [ "zombiehorse", "undead", "mob" ] }, diff --git a/behavior_pack/entities/zombie_villager_v2.json b/behavior_pack/entities/zombie_villager_v2.json index 60a8fe710..7dd850ae3 100644 --- a/behavior_pack/entities/zombie_villager_v2.json +++ b/behavior_pack/entities/zombie_villager_v2.json @@ -1,5 +1,5 @@ { - "format_version": "1.20.10", + "format_version": "1.21.60", "minecraft:entity": { "description": { "identifier": "minecraft:zombie_villager_v2", @@ -20,7 +20,6 @@ "value": 0.35 } }, - "adult": { "minecraft:experience_reward": { "on_death": "query.last_hit_by_player ? 5 + (query.equipment_count * Math.Random(1,3)) : 0" @@ -44,19 +43,16 @@ "track_target": true } }, - "jockey": { "minecraft:behavior.find_mount": { "priority": 1, "within_radius": 16 } }, - "can_break_doors": { "minecraft:annotation.break_door": { } }, - "from_abandoned_village": { "minecraft:navigation.walk": { "is_amphibious": true, @@ -70,7 +66,6 @@ "speed_multiplier": 1 } }, - "to_villager": { "minecraft:transformation": { "into": "minecraft:villager_v2", @@ -107,7 +102,6 @@ "minecraft:is_shaking": { } }, - "unskilled": { "minecraft:type_family": { "family": [ "unskilled", "zombie", "zombie_villager", "undead", "monster", "mob" ] @@ -228,80 +222,67 @@ "value": 14 } }, - "desert_villager": { "minecraft:mark_variant": { "value": 1 } }, - "jungle_villager": { "minecraft:mark_variant": { "value": 2 } }, - "savanna_villager": { "minecraft:mark_variant": { "value": 3 } }, - "snow_villager": { "minecraft:mark_variant": { "value": 4 } }, - "swamp_villager": { "minecraft:mark_variant": { "value": 5 } }, - "taiga_villager": { "minecraft:mark_variant": { "value": 6 } }, - "villager_skin_0": { "minecraft:skin_id": { "value": 0 } }, - "villager_skin_1": { "minecraft:skin_id": { "value": 1 } }, - "villager_skin_2": { "minecraft:skin_id": { "value": 2 } }, - "villager_skin_3": { "minecraft:skin_id": { "value": 3 } }, - "villager_skin_4": { "minecraft:skin_id": { "value": 4 } }, - "villager_skin_5": { "minecraft:skin_id": { "value": 5 } } }, - "components": { "minecraft:is_hidden_when_invisible": { }, @@ -340,7 +321,6 @@ "height": 1.9 }, "minecraft:burns_in_daylight": {}, - "minecraft:health": { "value": 20, "max": 20 @@ -568,7 +548,6 @@ } ] }, - "minecraft:interact": { "interactions": { // Curing the villager @@ -666,7 +645,6 @@ "is_pushable_by_piston": true } }, - "events": { "villager_converted": { "remove": { @@ -677,7 +655,6 @@ ] } }, - "minecraft:entity_spawned": { "sequence": [ { @@ -701,7 +678,6 @@ "component_groups": [ "baby" ] - } }, { @@ -713,7 +689,6 @@ "baby", "jockey" ] - } } ] @@ -801,7 +776,6 @@ } ] }, - "minecraft:spawn_skilled_adult": { "sequence": [ { @@ -870,7 +844,6 @@ } ] }, - "minecraft:entity_transformed": { "sequence": [ { @@ -1029,11 +1002,9 @@ } ] }, - "minecraft:become_cleric": { "add": { "component_groups": [ "cleric" ] } }, - "from_village": { "sequence": [ { @@ -1044,7 +1015,6 @@ } ] }, - "minecraft:add_biome_and_skin": { "sequence": [ { @@ -1076,7 +1046,7 @@ ] }, { - "filters": { + "filters": { "any_of": [ { "test": "has_biome_tag", "value": "desert" }, { "test": "has_biome_tag", "value": "mesa" } @@ -1095,7 +1065,7 @@ { "filters": { "any_of": [ - { + { "all_of": [ { "test": "has_biome_tag", "value": "cold" }, { "test": "has_biome_tag", "operator": "!=", "value": "ocean" } @@ -1107,7 +1077,12 @@ "add": { "component_groups": [ "snow_villager" ] } }, { - "filters": { "test": "has_biome_tag", "value": "swamp" }, + "filters": { + "any_of": [ + { "test": "has_biome_tag", "value": "swamp" }, + { "test": "has_biome_tag", "value": "mangrove_swamp" } + ] + }, "add": { "component_groups": [ "swamp_villager" ] } }, { diff --git a/behavior_pack/manifest.json b/behavior_pack/manifest.json index 8f34e52ee..5325b9e05 100644 --- a/behavior_pack/manifest.json +++ b/behavior_pack/manifest.json @@ -5,7 +5,7 @@ "name": "Vanilla Behavior Pack", "uuid": "ee649bcf-256c-4013-9068-6a802b89d756", "version": [ 0, 0, 1 ], - "min_engine_version": [ 1, 21, 50 ] + "min_engine_version": [ 1, 21, 60 ] }, "modules": [ { diff --git a/behavior_pack/spawn_rules/skeleton.json b/behavior_pack/spawn_rules/skeleton.json index 48953233c..a78e5d374 100644 --- a/behavior_pack/spawn_rules/skeleton.json +++ b/behavior_pack/spawn_rules/skeleton.json @@ -9,35 +9,28 @@ { "minecraft:spawns_on_surface": { }, - "minecraft:spawns_underground": { }, - "minecraft:spawns_on_block_prevented_filter": [ "minecraft:nether_wart_block", "minecraft:shroomlight" ], - "minecraft:brightness_filter": { "min": 0, "max": 7, "adjust_for_weather": true }, - "minecraft:difficulty_filter": { "min": "easy", "max": "hard" }, - "minecraft:weight": { "default": 80 }, - "minecraft:herd": { "min_size": 1, "max_size": 2 }, - "minecraft:biome_filter": { "any_of": [ { @@ -51,6 +44,11 @@ "test": "has_biome_tag", "operator": "!=", "value": "frozen" + }, + { + "test": "has_biome_tag", + "operator": "!=", + "value": "mangrove_swamp" } ] }, diff --git a/documentation/Addons.html b/documentation/Addons.html index 85c22ff44..cd28396a9 100644 --- a/documentation/Addons.html +++ b/documentation/Addons.html @@ -1,4 +1,4 @@ -
Index
minecraft:item_visual | Identifier String | - | The description identifier of the geometry and material used to render the item of this block.Experimental toggles required: Upcoming Creator Features geometry + | The description identifier of the geometry and material used to render the item of this block.Experimental toggles required: Upcoming Creator Features (in format versions before 1.21.50) geometry [Required] The "minecraft:geometry" component that will be used for the item.Back to top@@ -489,7 +489,7 @@ Block Definition Properties Code ExampleExample |