Skip to content

Commit

Permalink
- Misc fixes for entity components
Browse files Browse the repository at this point in the history
  • Loading branch information
Xterionix committed Jun 27, 2024
1 parent e8f16e0 commit e294058
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 43 deletions.
1 change: 0 additions & 1 deletion source/behavior/entities/format/behaviors/celebrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"properties": {
"priority": { "$ref": "types/priority.json" },
"celebration_sound": {
"default": "",
"description": "The sound event to trigger during the celebration.",
"title": "Celebration Sound",
"$ref": "../../../../general/sound_event.json"
Expand Down
3 changes: 1 addition & 2 deletions source/behavior/entities/format/behaviors/drop_item_for.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
"loot_table": {
"title": "Loot Table",
"type": "string",
"description": "The loot table that contains the possible loot the entity can drop with this goal.",
"examples": ["loot_tables/"]
"description": "The loot table that contains the possible loot the entity can drop with this goal."
},
"max_head_look_at_height": {
"title": "Max Head Look At Height",
Expand Down
2 changes: 0 additions & 2 deletions source/behavior/entities/format/behaviors/eat_mob.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
"eat_mob_sound": {
"title": "Eat Mob Sound",
"$ref": "../../../../general/sound_event.json",
"default": "",
"description": "Sets the sound that should play when eating a mob."
},
"loot_table": {
"title": "Loot Table",
"type": "string",
"default": "",
"description": "The loot table for loot to be dropped when eating a mob."
},
"pull_in_force": {
Expand Down
10 changes: 5 additions & 5 deletions source/behavior/entities/format/behaviors/lay_egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"title": "Lay Egg Sound",
"$ref": "../../../../general/sound_event.json",
"default": "lay_egg",
"description": "[EXPERIMENTAL] Sound event name for laying egg. Defaulted to lay_egg which is used for Turtles."
"description": "Sound event name for laying egg. Defaulted to lay_egg which is used for Turtles."
},
"lay_seconds": {
"title": "Lay Seconds",
"type": "number",
"default": 10.0,
"description": "[EXPERIMENTAL] Duration of the laying egg process in seconds."
"description": "Duration of the laying egg process in seconds."
},
"on_lay": {
"title": "On Lay",
Expand All @@ -61,20 +61,20 @@
"type": "array",
"default": ["minecraft:sand"],
"items": { "title": "Block ID", "$ref": "../../../../general/item/descriptor.json" },
"description": "[EXPERIMENTAL] Blocks that the mob can lay its eggs on top of."
"description": "Blocks that the mob can lay its eggs on top of."
},
"target_materials_above_block": {
"title": "Target Materials Above Block",
"type": "array",
"default": ["Air"],
"enum": ["Air", "Any", "Lava", "Water"],
"description": "[EXPERIMENTAL] Types of materials that can exist above the target block. Valid types are Air, Water, and Lava."
"description": "Types of materials that can exist above the target block. Valid types are Air, Water, and Lava."
},
"use_default_animation": {
"title": "Use Default Animation",
"type": "boolean",
"default": true,
"description": "[EXPERIMENTAL] Specifies if the default lay-egg animation should be played when the egg is placed or not."
"description": "Specifies if the default lay-egg animation should be played when the egg is placed or not."
}
},
"examples": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"item_table": {
"title": "Item Table",
"type": "string",
"default": "",
"description": "File path relative to the resource pack root for items to spawn list (loot table format)."
"description": "File path relative to the behavior pack root for items to spawn list (loot table format)."
},
"on_digging_start": {
"title": "On Digging Start",
Expand Down
2 changes: 1 addition & 1 deletion source/behavior/entities/format/behaviors/sonic_boom.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"additionalProperties": false,
"type": "object",
"title": "Sonic Boom",
"description": "[EXPERIMENTAL BEHAVIOR] Plays the provided sounds and activates the `SONIC BOOM` actor flag during the specified duration",
"description": "Plays the provided sounds and activates the `SONIC BOOM` actor flag during the specified duration",
"properties": {
"priority": { "$ref": "./types/priority.json" },
"speed_multiplier": { "$ref": "types/speed_multiplier.json" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"type": "number",
"default": 45,
"description": "The Maximum time in seconds that the trader will be interested with showing it's trade items.",
"title": "Interest_time"
"title": "Interest Time"
},
"remove_item_time": {
"type": "number",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"title": "Condition"
},
"event_name": {
"$ref": "../../../../general/sound_event.json",
"type": "string",
"description": "Level sound event to be played as the ambient sound.",
"title": "Event Name"
}
Expand Down
4 changes: 2 additions & 2 deletions source/behavior/entities/format/components/area_attack.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"description": "The type of damage that is applied to entities that enter the damage range."
},
"damage_cooldown": {
"title": "damage cooldown",
"title": "Damage Cooldown",
"type": "number",
"default": 0,
"description": "Attack cooldown (in seconds) for how often this entity can attack a target."
Expand All @@ -35,7 +35,7 @@
"title": "Entity Filter"
},
"play_attack_sound": {
"title": "play attack sound",
"title": "Play Attack Sound",
"type": "boolean",
"default": 4.94066e-324,
"description": "If the entity should play their attack sound when attacking a target."
Expand Down
2 changes: 1 addition & 1 deletion source/behavior/entities/format/components/attack.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"effect_name": {
"type": "string",
"$ref": "../../../../general/vanilla/effect.json",
"description": "Identifier of the status ailment to apply to an entity attacked by this entity's melee attack.",
"examples": ["wither", "hunger"],
"title": "Effect Name"
},
"effect_duration": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "blockception.minecraft.behavior.entities.minecraft.behavior.break_blocks",
"$id": "blockception.minecraft.behavior.entities.minecraft.break_blocks",
"type": "object",
"title": "Break Blocks",
"additionalProperties": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
},
"table": {
"type": "string",
"default": "",
"description": "File path relative to the resource pack root for this entity's trades.",
"title": "Table"
},
Expand Down
10 changes: 4 additions & 6 deletions source/behavior/entities/format/components/healable.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@
"properties": {
"name": {
"title": "Name",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"description": "Effect name.",
"$ref": "../../../../general/vanilla/effect.json",
"type": "string"
},
"duration": {
"type": "integer",
"default": 0,
"minimum": 0,
"description": "The duration of the effect.",
"$comment": "UNDOCUMENTED"
"description": "The duration of the effect."
},
"amplifier": {
"type": "integer",
"default": 0,
"minimum": 0,
"description": "The amplifier of the effect.",
"$comment": "UNDOCUMENTED"
"description": "The amplifier of the effect."
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions source/behavior/entities/format/components/interact.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"interact_text": {
"title": "Interact Text",
"type": "string",
"default": "",
"description": "Text to show when the player is able to interact in this way with this entity when playing with Touch-screen controls."
},
"on_interact": {
Expand Down Expand Up @@ -98,13 +97,11 @@
"play_sounds": {
"title": "Play Sounds",
"$ref": "../../../../general/sound_event.json",
"default": "",
"description": "List of sounds to play when the interaction occurs."
},
"spawn_entities": {
"title": "Spawn Entities",
"type": "string",
"default": "",
"description": "List of entities to spawn when the interaction occurs."
},
"spawn_items": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$id": "blockception.minecraft.behavior.entities.minecraft.item_controllable",
"description": "Efines what items can be used to control this entity while ridden.",
"description": "Defines what items can be used to control this entity while ridden.",
"type": "object",
"title": "Item Controllable",
"additionalProperties": false,
Expand Down
1 change: 0 additions & 1 deletion source/behavior/entities/format/components/nameable.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"properties": {
"name_filter": {
"type": "string",
"default": "",
"description": "List of special names that will cause the events defined in `on_named` to fire.",
"title": "Name Filter"
},
Expand Down
15 changes: 6 additions & 9 deletions source/behavior/entities/format/components/projectile.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
},
"filter": {
"type": "string",
"default": "",
"description": "Entity Definitions defined here can't be hurt by the projectile.",
"title": "Filter"
},
Expand Down Expand Up @@ -129,7 +128,7 @@
},
"offset": {
"type": "array",
"default": [0, 0.0, 0],
"default": [ 0, 0.0, 0 ],
"description": "The offset from the entity's anchor where the projectile will spawn.",
"title": "Offset",
"$ref": "../../../../general/vectors/number3.json"
Expand Down Expand Up @@ -221,7 +220,7 @@
"additionalProperties": false,
"properties": {
"shape": {
"enum": ["sphere", "cube"],
"enum": [ "sphere", "cube" ],
"default": "sphere",
"description": "The shape of the area that is frozen.",
"title": "Shape"
Expand Down Expand Up @@ -429,8 +428,7 @@
},
"effect": {
"title": "Effect",
"type": "string",
"default": "not set",
"$ref": "../../../../general/vanilla/effect.json",
"description": "The identifier of the mob entity to affect."
},
"visible": {
Expand Down Expand Up @@ -490,7 +488,7 @@
"type": "object",
"description": "Removes the projectile.",
"additionalProperties": true,
"properties": {}
"properties": { }
},
"spawn_aoe_cloud": {
"title": "Spawn AOE Cloud",
Expand Down Expand Up @@ -696,7 +694,6 @@
}
},
"examples": [
{},
{
"anchor": 0,
"angle_offset": 0,
Expand All @@ -714,9 +711,9 @@
"lightning": false,
"liquid_inertia": 0.6,
"multiple_targets": true,
"offset": [],
"offset": [ ],
"on_fire_time": 5,
"on_hit": {},
"on_hit": { },
"particle": "iconcrack",
"potion_effect": -1,
"power": 1.3,
Expand Down
2 changes: 0 additions & 2 deletions source/behavior/entities/format/components/shooter.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"$id": "blockception.minecraft.behavior.entities.minecraft.shooter",
"description": "Defines the entity's ranged attack behavior.",
"$comment": "As of 1.19.60 & out of exp 1.20.10",
"type": "object",
"title": "Shooter",
"additionalProperties": false,
Expand All @@ -15,7 +14,6 @@
"def": {
"title": "Def",
"type": "string",
"examples": ["minecraft:arrow", "minecraft:small_fireball", "minecraft:thrown_trident"],
"description": "Actor definition to use as projectile for the ranged attack. The actor definition must have the projectile component to be able to be shot as a projectile"
},
"magic": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
},
"spawn_entity": {
"type": "string",
"default": "",
"description": "Identifier of the entity to spawn, leave empty to spawn the item defined above instead.",
"title": "Spawn Entity"
},
Expand Down

0 comments on commit e294058

Please sign in to comment.