From 511e12c371ce1f5e7e03dacb7ddaa2eb123da151 Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Wed, 9 Feb 2022 13:49:31 +0100 Subject: [PATCH] Added celebrate_survive & move_outdoors --- .../format/behaviors/celebrate_survive.json | 27 ++++++ .../format/behaviors/move_outdoors.json | 17 ++++ .../entities/format/behaviors/tempt.json | 29 +++++-- .../behavior/entities/format/components.json | 84 +++++++++---------- 4 files changed, 109 insertions(+), 48 deletions(-) create mode 100644 source/behavior/entities/format/behaviors/celebrate_survive.json create mode 100644 source/behavior/entities/format/behaviors/move_outdoors.json diff --git a/source/behavior/entities/format/behaviors/celebrate_survive.json b/source/behavior/entities/format/behaviors/celebrate_survive.json new file mode 100644 index 00000000..4b2ffe0d --- /dev/null +++ b/source/behavior/entities/format/behaviors/celebrate_survive.json @@ -0,0 +1,27 @@ +{ + "$id": "blockception.minecraft.behavior.entities.minecraft.behavior.celebrate_survive", + "additionalProperties": false, + "type": "object", + "title": "Celebrate Survive", + "$comment": "UNDOCUMENTED", + "description": "UNDOCUMENTED", + "properties": { + "priority": { "$ref": "types/priority.json" }, + "speed_multiplier": { "$ref": "./types/speed_multiplier.json" }, + "fireworks_interval": { + "title": "Fireworks Interval", + "$ref": "../types/range_number_type.json", + "description": "The interval in ticks between playing the fireworks" + }, + "duration": { + "title": "Duration", + "description": "The duration in ticks of the celebration", + "type": "number" + }, + "on_celebration_end_event": { + "title": "On Celebration End Event", + "description": "The event to fire when the celebration ends", + "$ref": "../types/event.json" + } + } +} diff --git a/source/behavior/entities/format/behaviors/move_outdoors.json b/source/behavior/entities/format/behaviors/move_outdoors.json new file mode 100644 index 00000000..730a140d --- /dev/null +++ b/source/behavior/entities/format/behaviors/move_outdoors.json @@ -0,0 +1,17 @@ +{ + "$id": "blockception.minecraft.behavior.entities.minecraft.behavior.move_outdoors", + "additionalProperties": false, + "type": "object", + "title": "Move Outdoors", + "$comment": "UNDOCUMENTED", + "description": "UNDOCUMENTED", + "properties": { + "priority": { "$ref": "types/priority.json" }, + "speed_multiplier": { "$ref": "./types/speed_multiplier.json" }, + "timeout_cooldown": { + "title": "Duration", + "description": "The duration in ticks of the celebration", + "type": "number" + } + } +} diff --git a/source/behavior/entities/format/behaviors/tempt.json b/source/behavior/entities/format/behaviors/tempt.json index 1d94e3ef..a9f1624d 100644 --- a/source/behavior/entities/format/behaviors/tempt.json +++ b/source/behavior/entities/format/behaviors/tempt.json @@ -5,12 +5,8 @@ "title": "Tempt", "additionalProperties": false, "properties": { - "priority": { - "$ref": "types/priority.json" - }, - "speed_multiplier": { - "$ref": "types/speed_multiplier.json" - }, + "priority": { "$ref": "types/priority.json" }, + "speed_multiplier": { "$ref": "types/speed_multiplier.json" }, "can_get_scared": { "type": "boolean", "default": false, @@ -37,6 +33,27 @@ }, "title": "Items" }, + "sound_interval": { + "description": "The interval in ticks between playing the sound", + "title": "Sound Interval", + "oneOf": [ + { + "type": "number", + "minimum": 0 + }, + { + "items": [ + { "type": "integer", "minimum": 0, "title": "Minimum" }, + { "type": "integer", "minimum": 0, "title": "Maximum" } + ] + } + ] + }, + "tempt_sound": { + "type": "string", + "description": "Sound to play while the mob is being tempted.", + "title": "Tempt Sound" + }, "within_radius": { "type": "number", "default": 0, diff --git a/source/behavior/entities/format/components.json b/source/behavior/entities/format/components.json index 7c063f86..a70e11e6 100644 --- a/source/behavior/entities/format/components.json +++ b/source/behavior/entities/format/components.json @@ -7,59 +7,75 @@ "required": [], "properties": { "minecraft:addrider": { "$ref": "./components/addrider.json" }, + "minecraft:admire_item": { "$ref": "./components/admire_item.json" }, "minecraft:ageable": { "$ref": "./components/ageable.json" }, "minecraft:ambient_sound_interval": { "$ref": "./components/ambient_sound_interval.json" }, "minecraft:angry": { "$ref": "./components/angry.json" }, "minecraft:annotation.break_door": { "$ref": "./components/annotation.break_door.json" }, "minecraft:annotation.open_door": { "$ref": "./components/annotation.open_door.json" }, - "minecraft:attack": { "$ref": "./components/attack.json" }, + "minecraft:area_attack": { "$ref": "./components/area_attack.json" }, + "minecraft:attack_cooldown": { "$ref": "./components/attack_cooldown.json" }, "minecraft:attack_damage": { "$ref": "./components/attack_damage.json" }, + "minecraft:attack": { "$ref": "./components/attack.json" }, "minecraft:balloonable": { "$ref": "./components/balloonable.json" }, + "minecraft:barter": { "$ref": "./components/barter.json" }, "minecraft:block_climber": { "$ref": "./components/block_climber.json" }, - "minecraft:boss": { "$ref": "./components/boss.json" }, + "minecraft:block_sensor": { "$ref": "./components/block_sensor.json" }, "minecraft:boostable": { "$ref": "./components/boostable.json" }, + "minecraft:boss": { "$ref": "./components/boss.json" }, "minecraft:break_blocks": { "$ref": "./components/break_blocks.json" }, "minecraft:breathable": { "$ref": "./components/breathable.json" }, "minecraft:breedable": { "$ref": "./components/breedable.json" }, "minecraft:bribeable": { "$ref": "./components/bribeable.json" }, + "minecraft:buoyant": { "$ref": "./components/buoyant.json" }, "minecraft:burns_in_daylight": { "$ref": "./components/burns_in_daylight.json" }, "minecraft:can_climb": { "$ref": "./components/can_climb.json" }, "minecraft:can_fly": { "$ref": "./components/can_fly.json" }, "minecraft:can_power_jump": { "$ref": "./components/can_power_jump.json" }, + "minecraft:celebrate_hunt": { "$ref": "./components/celebrate_hunt.json" }, "minecraft:collision_box": { "$ref": "./components/collision_box.json" }, "minecraft:color": { "$ref": "./components/color.json" }, "minecraft:color2": { "$ref": "./components/color2.json" }, "minecraft:combat_regeneration": { "$ref": "./components/combat_regeneration.json" }, - "minecraft:drying_out_timer": { "$ref": "./components/drying_out_timer.json" }, "minecraft:conditional_bandwidth_optimization": { "$ref": "./components/conditional_bandwidth_optimization.json" }, "minecraft:custom_hit_test": { "$ref": "./components/custom_hit_test.json" }, "minecraft:damage_over_time": { "$ref": "./components/damage_over_time.json" }, "minecraft:damage_sensor": { "$ref": "./components/damage_sensor.json" }, "minecraft:default_look_angle": { "$ref": "./components/default_look_angle.json" }, "minecraft:despawn": { "$ref": "./components/despawn.json" }, + "minecraft:drying_out_timer": { "$ref": "./components/drying_out_timer.json" }, "minecraft:dweller": { "$ref": "./components/dweller.json" }, "minecraft:economy_trade_table": { "$ref": "./components/economy_trade_table.json" }, + "minecraft:entity_sensor": { "$ref": "./components/entity_sensor.json" }, "minecraft:environment_sensor": { "$ref": "./components/environment_sensor.json" }, + "minecraft:equip_item": { "$ref": "./components/equip_item.json" }, "minecraft:equipment": { "$ref": "./components/equipment.json" }, "minecraft:equippable": { "$ref": "./components/equippable.json" }, + "minecraft:experience_reward": { "$ref": "./components/experience_reward.json" }, "minecraft:explode": { "$ref": "./components/explode.json" }, "minecraft:fall_damage": { "$ref": "./components/fall_damage.json" }, "minecraft:fire_immune": { "$ref": "./components/fire_immune.json" }, - "minecraft:flocking": { "$ref": "./components/flocking.json" }, "minecraft:floats_in_liquid": { "$ref": "./components/floats_in_liquid.json" }, + "minecraft:flocking": { "$ref": "./components/flocking.json" }, "minecraft:flying_speed": { "$ref": "./components/flying_speed.json" }, "minecraft:follow_range": { "$ref": "./components/follow_range.json" }, "minecraft:friction_modifier": { "$ref": "./components/friction_modifier.json" }, "minecraft:genetics": { "$ref": "./components/genetics.json" }, "minecraft:giveable": { "$ref": "./components/giveable.json" }, "minecraft:ground_offset": { "$ref": "./components/ground_offset.json" }, + "minecraft:group_size": { "$ref": "./components/group_size.json" }, + "minecraft:grows_crop": { "$ref": "./components/grows_crop.json" }, "minecraft:healable": { "$ref": "./components/healable.json" }, "minecraft:health": { "$ref": "./components/health.json" }, - "minecraft:hurt_when_wet": { "$ref": "./components/hurt_when_wet.json" }, + "minecraft:hide": { "$ref": "./components/hide.json" }, + "minecraft:home": { "$ref": "./components/home.json" }, + "minecraft:horse.jump_strength": { "$ref": "./components/horse.jump_strength.json" }, "minecraft:hurt_on_condition": { "$ref": "./components/hurt_on_condition.json" }, + "minecraft:hurt_when_wet": { "$ref": "./components/hurt_when_wet.json" }, "minecraft:input_ground_controlled": { "$ref": "./components/input_ground_controlled.json" }, "minecraft:inside_block_notifier": { "$ref": "./components/inside_block_notifier.json" }, "minecraft:insomnia": { "$ref": "./components/insomnia.json" }, + "minecraft:instant_despawn": { "$ref": "./components/instant_despawn.json" }, "minecraft:interact": { "$ref": "./components/interact.json" }, "minecraft:inventory": { "$ref": "./components/inventory.json" }, "minecraft:is_baby": { "$ref": "./components/is_baby.json" }, @@ -86,26 +102,30 @@ "minecraft:loot": { "$ref": "./components/loot.json" }, "minecraft:managed_wandering_trader": { "$ref": "./components/managed_wandering_trader.json" }, "minecraft:mark_variant": { "$ref": "./components/mark_variant.json" }, - "minecraft:movement": { "$ref": "./components/movement.json" }, + "minecraft:mob_effect": { "$ref": "./components/mob_effect.json" }, "minecraft:movement.amphibious": { "$ref": "./components/movement.amphibious.json" }, "minecraft:movement.basic": { "$ref": "./components/movement.basic.json" }, "minecraft:movement.fly": { "$ref": "./components/movement.fly.json" }, "minecraft:movement.generic": { "$ref": "./components/movement.generic.json" }, "minecraft:movement.glide": { "$ref": "./components/movement.glide.json" }, + "minecraft:movement.hover": { "$ref": "./components/movement.hover.json" }, "minecraft:movement.jump": { "$ref": "./components/movement.jump.json" }, "minecraft:movement.skip": { "$ref": "./components/movement.skip.json" }, "minecraft:movement.sway": { "$ref": "./components/movement.sway.json" }, + "minecraft:movement": { "$ref": "./components/movement.json" }, "minecraft:nameable": { "$ref": "./components/nameable.json" }, "minecraft:navigation.climb": { "$ref": "./components/navigation.climb.json" }, "minecraft:navigation.float": { "$ref": "./components/navigation.float.json" }, "minecraft:navigation.fly": { "$ref": "./components/navigation.fly.json" }, "minecraft:navigation.generic": { "$ref": "./components/navigation.generic.json" }, + "minecraft:navigation.hover": { "$ref": "./components/navigation.hover.json" }, "minecraft:navigation.swim": { "$ref": "./components/navigation.swim.json" }, "minecraft:navigation.walk": { "$ref": "./components/navigation.walk.json" }, + "minecraft:npc": { "$ref": "./components/npc.json" }, "minecraft:on_death": { "$ref": "./components/on_death.json" }, "minecraft:on_friendly_anger": { "$ref": "./components/on_friendly_anger.json" }, - "minecraft:on_hurt": { "$ref": "./components/on_hurt.json" }, "minecraft:on_hurt_by_player": { "$ref": "./components/on_hurt_by_player.json" }, + "minecraft:on_hurt": { "$ref": "./components/on_hurt.json" }, "minecraft:on_ignite": { "$ref": "./components/on_ignite.json" }, "minecraft:on_start_landing": { "$ref": "./components/on_start_landing.json" }, "minecraft:on_start_takeoff": { "$ref": "./components/on_start_takeoff.json" }, @@ -113,13 +133,13 @@ "minecraft:on_target_escape": { "$ref": "./components/on_target_escape.json" }, "minecraft:on_wake_with_owner": { "$ref": "./components/on_wake_with_owner.json" }, "minecraft:out_of_control": { "$ref": "./components/out_of_control.json" }, - "minecraft:player.saturation": { "$ref": "./components/player.saturation.json" }, - "minecraft:player.exhaustion": { "$ref": "./components/player.exhaustion.json" }, - "minecraft:player.level": { "$ref": "./components/player.level.json" }, - "minecraft:player.experience": { "$ref": "./components/player.experience.json" }, "minecraft:peek": { "$ref": "./components/peek.json" }, "minecraft:persistent": { "$ref": "./components/persistent.json" }, "minecraft:physics": { "$ref": "./components/physics.json" }, + "minecraft:player.exhaustion": { "$ref": "./components/player.exhaustion.json" }, + "minecraft:player.experience": { "$ref": "./components/player.experience.json" }, + "minecraft:player.level": { "$ref": "./components/player.level.json" }, + "minecraft:player.saturation": { "$ref": "./components/player.saturation.json" }, "minecraft:preferred_path": { "$ref": "./components/preferred_path.json" }, "minecraft:projectile": { "$ref": "./components/projectile.json" }, "minecraft:push_through": { "$ref": "./components/push_through.json" }, @@ -129,8 +149,8 @@ "minecraft:rail_sensor": { "$ref": "./components/rail_sensor.json" }, "minecraft:ravager_blocked": { "$ref": "./components/ravager_blocked.json" }, "minecraft:rideable": { "$ref": "./components/rideable.json" }, - "minecraft:scale": { "$ref": "./components/scale.json" }, "minecraft:scale_by_age": { "$ref": "./components/scale_by_age.json" }, + "minecraft:scale": { "$ref": "./components/scale.json" }, "minecraft:scheduler": { "$ref": "./components/scheduler.json" }, "minecraft:shareables": { "$ref": "./components/shareables.json" }, "minecraft:shooter": { "$ref": "./components/shooter.json" }, @@ -139,45 +159,25 @@ "minecraft:sound_volume": { "$ref": "./components/sound_volume.json" }, "minecraft:spawn_entity": { "$ref": "./components/spawn_entity.json" }, "minecraft:spell_effects": { "$ref": "./components/spell_effects.json" }, + "minecraft:strength": { "$ref": "./components/strength.json" }, "minecraft:tameable": { "$ref": "./components/tameable.json" }, "minecraft:tamemount": { "$ref": "./components/tamemount.json" }, "minecraft:target_nearby_sensor": { "$ref": "./components/target_nearby_sensor.json" }, "minecraft:teleport": { "$ref": "./components/teleport.json" }, "minecraft:tick_world": { "$ref": "./components/tick_world.json" }, "minecraft:timer": { "$ref": "./components/timer.json" }, + "minecraft:trade_resupply": { "$ref": "./components/trade_resupply.json" }, "minecraft:trade_table": { "$ref": "./components/trade_table.json" }, + "minecraft:trail": { "$ref": "./components/trail.json" }, "minecraft:transformation": { "$ref": "./components/transformation.json" }, "minecraft:trust": { "$ref": "./components/trust.json" }, "minecraft:trusting": { "$ref": "./components/trusting.json" }, "minecraft:type_family": { "$ref": "./components/type_family.json" }, - "minecraft:variant": { "$ref": "./components/variant.json" }, "minecraft:underwater_movement": { "$ref": "./components/underwater_movement.json" }, + "minecraft:variant": { "$ref": "./components/variant.json" }, "minecraft:walk_animation_speed": { "$ref": "./components/walk_animation_speed.json" }, "minecraft:wants_jockey": { "$ref": "./components/wants_jockey.json" }, "minecraft:water_movement": { "$ref": "./components/water_movement.json" }, - "minecraft:admire_item": { "$ref": "./components/admire_item.json" }, - "minecraft:area_attack": { "$ref": "./components/area_attack.json" }, - "minecraft:attack_cooldown": { "$ref": "./components/attack_cooldown.json" }, - "minecraft:barter": { "$ref": "./components/barter.json" }, - "minecraft:block_sensor": { "$ref": "./components/block_sensor.json" }, - "minecraft:buoyant": { "$ref": "./components/buoyant.json" }, - "minecraft:celebrate_hunt": { "$ref": "./components/celebrate_hunt.json" }, - "minecraft:entity_sensor": { "$ref": "./components/entity_sensor.json" }, - "minecraft:equip_item": { "$ref": "./components/equip_item.json" }, - "minecraft:experience_reward": { "$ref": "./components/experience_reward.json" }, - "minecraft:group_size": { "$ref": "./components/group_size.json" }, - "minecraft:grows_crop": { "$ref": "./components/grows_crop.json" }, - "minecraft:home": { "$ref": "./components/home.json" }, - "minecraft:instant_despawn": { "$ref": "./components/instant_despawn.json" }, - "minecraft:mob_effect": { "$ref": "./components/mob_effect.json" }, - "minecraft:movement.hover": { "$ref": "./components/movement.hover.json" }, - "minecraft:navigation.hover": { "$ref": "./components/navigation.hover.json" }, - "minecraft:npc": { "$ref": "./components/npc.json" }, - "minecraft:strength": { "$ref": "./components/strength.json" }, - "minecraft:trail": { "$ref": "./components/trail.json" }, - "minecraft:hide": { "$ref": "./components/hide.json" }, - "minecraft:horse.jump_strength": { "$ref": "./components/horse.jump_strength.json" }, - "minecraft:trade_resupply": { "$ref": "./components/trade_resupply.json" }, "minecraft:behavior.admire_item": { "$ref": "./behaviors/admire_item.json" }, "minecraft:behavior.avoid_block": { "$ref": "./behaviors/avoid_block.json" }, @@ -186,6 +186,7 @@ "minecraft:behavior.beg": { "$ref": "./behaviors/beg.json" }, "minecraft:behavior.break_door": { "$ref": "./behaviors/break_door.json" }, "minecraft:behavior.breed": { "$ref": "./behaviors/breed.json" }, + "minecraft:behavior.celebrate_survive": { "$ref": "./behaviors/celebrate_survive.json" }, "minecraft:behavior.celebrate": { "$ref": "./behaviors/celebrate.json" }, "minecraft:behavior.charge_attack": { "$ref": "./behaviors/charge_attack.json" }, "minecraft:behavior.charge_held_item": { "$ref": "./behaviors/charge_held_item.json" }, @@ -215,8 +216,8 @@ "minecraft:behavior.find_mount": { "$ref": "./behaviors/find_mount.json" }, "minecraft:behavior.find_underwater_treasure": { "$ref": "./behaviors/find_underwater_treasure.json" }, "minecraft:behavior.flee_sun": { "$ref": "./behaviors/flee_sun.json" }, - "minecraft:behavior.float": { "$ref": "./behaviors/float.json" }, "minecraft:behavior.float_wander": { "$ref": "./behaviors/float_wander.json" }, + "minecraft:behavior.float": { "$ref": "./behaviors/float.json" }, "minecraft:behavior.follow_caravan": { "$ref": "./behaviors/follow_caravan.json" }, "minecraft:behavior.follow_mob": { "$ref": "./behaviors/follow_mob.json" }, "minecraft:behavior.follow_owner": { "$ref": "./behaviors/follow_owner.json" }, @@ -243,6 +244,7 @@ "minecraft:behavior.mingle": { "$ref": "./behaviors/mingle.json" }, "minecraft:behavior.mount_pathing": { "$ref": "./behaviors/mount_pathing.json" }, "minecraft:behavior.move_indoors": { "$ref": "./behaviors/move_indoors.json" }, + "minecraft:behavior.move_outdoors": { "$ref": "./behaviors/move_outdoors.json" }, "minecraft:behavior.move_through_village": { "$ref": "./behaviors/move_through_village.json" }, "minecraft:behavior.move_to_block": { "$ref": "./behaviors/move_to_block.json" }, "minecraft:behavior.move_to_land": { "$ref": "./behaviors/move_to_land.json" }, @@ -258,9 +260,7 @@ "minecraft:behavior.move_towards_target": { "$ref": "./behaviors/move_towards_target.json" }, "minecraft:behavior.nap": { "$ref": "./behaviors/nap.json" }, "minecraft:behavior.nearest_attackable_target": { "$ref": "./behaviors/nearest_attackable_target.json" }, - "minecraft:behavior.nearest_prioritized_attackable_target": { - "$ref": "./behaviors/nearest_prioritized_attackable_target.json" - }, + "minecraft:behavior.nearest_prioritized_attackable_target": { "$ref": "./behaviors/nearest_prioritized_attackable_target.json" }, "minecraft:behavior.ocelot_sit_on_block": { "$ref": "./behaviors/ocelot_sit_on_block.json" }, "minecraft:behavior.ocelotattack": { "$ref": "./behaviors/ocelotattack.json" }, "minecraft:behavior.offer_flower": { "$ref": "./behaviors/offer_flower.json" }, @@ -271,16 +271,16 @@ "minecraft:behavior.peek": { "$ref": "./behaviors/peek.json" }, "minecraft:behavior.pet_sleep_with_owner": { "$ref": "./behaviors/pet_sleep_with_owner.json" }, "minecraft:behavior.pickup_items": { "$ref": "./behaviors/pickup_items.json" }, - "minecraft:behavior.play": { "$ref": "./behaviors/play.json" }, "minecraft:behavior.play_dead": { "$ref": "./behaviors/play_dead.json" }, + "minecraft:behavior.play": { "$ref": "./behaviors/play.json" }, "minecraft:behavior.player_ride_tamed": { "$ref": "./behaviors/player_ride_tamed.json" }, "minecraft:behavior.raid_garden": { "$ref": "./behaviors/raid_garden.json" }, "minecraft:behavior.ram_attack": { "$ref": "./behaviors/ram_attack.json" }, "minecraft:behavior.random_breach": { "$ref": "./behaviors/random_breach.json" }, "minecraft:behavior.random_fly": { "$ref": "./behaviors/random_fly.json" }, "minecraft:behavior.random_hover": { "$ref": "./behaviors/random_hover.json" }, - "minecraft:behavior.random_look_around": { "$ref": "./behaviors/random_look_around.json" }, "minecraft:behavior.random_look_around_and_sit": { "$ref": "./behaviors/random_look_around_and_sit.json" }, + "minecraft:behavior.random_look_around": { "$ref": "./behaviors/random_look_around.json" }, "minecraft:behavior.random_sitting": { "$ref": "./behaviors/random_sitting.json" }, "minecraft:behavior.random_stroll": { "$ref": "./behaviors/random_stroll.json" }, "minecraft:behavior.random_swim": { "$ref": "./behaviors/random_swim.json" },