Skip to content

Commit

Permalink
Some more misc fixes (#295)
Browse files Browse the repository at this point in the history
* - Add mob effects enum

* - Add biome and biome tags to enum

* - Fix feature rules only showing with 1.13.0 format version

* - Replace 1.20.41 -> 1.20.80
- Make certain format versions restricted to 1.10.0

* - Remove example stick (having this here was annoying)

* - Fix

* - Remove empty sounds example

* - Misc fixes for entity components
  • Loading branch information
Xterionix authored Jun 28, 2024
1 parent 39d1280 commit 822ed53
Show file tree
Hide file tree
Showing 50 changed files with 412 additions and 304 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"examples": [
{
"format_version": "1.20.41",
"format_version": "1.10.0",
"animation_controllers": {
"controller.animation.example": {
"initial_state": "default",
Expand Down Expand Up @@ -92,7 +92,7 @@
"required": ["format_version", "animation_controllers"],
"additionalProperties": false,
"properties": {
"format_version": { "$ref": "../../general/format_version.json" },
"format_version": { "type": "string", "const": "1.10.0" },
"animation_controllers": {
"type": "object",
"title": "Animation Controllers",
Expand Down
4 changes: 2 additions & 2 deletions source/behavior/animations/animations.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
}
],
"examples": [{ "format_version": "1.20.41", "animations": { "animation.example": {} } }],
"examples": [{ "format_version": "1.10.0", "animations": { "animation.example": {} } }],
"definitions": {
"animationspec": {
"anyOf": [
Expand Down Expand Up @@ -65,7 +65,7 @@
"required": ["format_version", "animations"],
"additionalProperties": false,
"properties": {
"format_version": { "$ref": "../../general/format_version.json" },
"format_version": { "type": "string", "const": "1.10.0" },
"animations": {
"title": "Animations Schema",
"description": "The animation specification.",
Expand Down
2 changes: 1 addition & 1 deletion source/behavior/biomes/biomes.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "minecraft.behavior.biomes",
"type": "object",
"examples": [{ "plains": { "format_version": "1.20.41" } }],
"examples": [{ "plains": { "format_version": "1.20.80" } }],
"additionalProperties": {
"type": "object",
"title": "Biomes",
Expand Down
2 changes: 1 addition & 1 deletion source/behavior/blocks/blocks.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"label": "New block",
"body": {
"format_version": "${1:1.20.41}",
"format_version": "${1:1.20.80}",
"minecraft:block": {
"description": {
"identifier": "$2:${3:${TM_FILENAME/[\\.].*//}}"
Expand Down
4 changes: 2 additions & 2 deletions source/behavior/cameras/presets/cameras.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$id": "blockception.minecraft.behavior.cameras.preset",
"defaultSnippets": [
{
"format_version": "${1:1.20.41}",
"format_version": "${1:1.20.80}",
"minecraft:npc_dialogue": {
"identifier": "$2",
"inherit_from": "$3",
Expand All @@ -17,7 +17,7 @@
],
"examples": [
{
"format_version": "1.20.41",
"format_version": "1.20.80",
"minecraft:npc_dialogue": {
"identifier": "example:custom",
"inherit_from": "minecraft:free",
Expand Down
4 changes: 2 additions & 2 deletions source/behavior/dialogue/dialogue.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$id": "blockception.minecraft.behavior.dialogue",
"defaultSnippets": [
{
"format_version": "${1:1.20.41}",
"format_version": "${1:1.20.80}",
"minecraft:npc_dialogue": {
"scenes": [
{
Expand All @@ -15,7 +15,7 @@
],
"examples": [
{
"format_version": "1.20.41",
"format_version": "1.20.80",
"minecraft:npc_dialogue": {
"scenes": [
{
Expand Down
4 changes: 2 additions & 2 deletions source/behavior/entities/entities.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"label": "New entity",
"body": {
"format_version": "${1:1.20.41}",
"format_version": "${1:1.20.80}",
"minecraft:entity": {
"description": {
"identifier": "$2:${3:${TM_FILENAME/[\\.].*//}}",
Expand All @@ -20,7 +20,7 @@
],
"examples": [
{
"format_version": "1.20.41",
"format_version": "1.20.80",
"minecraft:entity": {
"description": { "identifier": "namespace:entity", "is_spawnable": true, "is_summonable": true },
"component_groups": {},
Expand Down
23 changes: 12 additions & 11 deletions source/behavior/entities/filters/filters/has_biome_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "object",
"title": "Has Biome Tag",
"description": "Tests whether the biome the subject is in has the specified tag.",
"required": ["value"],
"required": [ "value" ],
"properties": {
"test": {
"type": "string",
Expand All @@ -17,15 +17,16 @@
"$ref": "./types/subject.json"
},
"value": {
"description": "(Required) The tag to look for.",
"type": "string",
"title": "Value"
}
},
"examples": [
{
"test": "has_biome_tag",
"value": "monster"
"description": "The tag to look for.",
"title": "Value",
"anyOf": [
{
"$ref": "../../../../general/vanilla/biome_tag.json"
},
{
"$ref": "../../../../general/vanilla/biome.json"
}
]
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"$ref": "./types/subject.json"
},
"value": {
"type": "string",
"$ref": "../../../../general/vanilla/effect.json",
"description": "The specified mob effect.",
"title": "Value"
}
Expand Down
32 changes: 3 additions & 29 deletions source/behavior/entities/filters/filters/is_biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,9 @@
"$ref": "./types/subject.json"
},
"value": {
"description": "The Biome type to test.",
"type": "string",
"enum": [
"beach",
"desert",
"extreme_hills",
"flat",
"forest",
"ice",
"jungle",
"mesa",
"mushroom_island",
"ocean",
"plain",
"river",
"savanna",
"stone_beach",
"swamp",
"taiga",
"the_end",
"the_nether"
],
"description": "The biome type to test.",
"$ref": "../../../../general/vanilla/biome.json",
"title": "Value"
}
},
"examples": [
{
"test": "is_biome",
"value": "beach"
}
]
}
}
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
Loading

0 comments on commit 822ed53

Please sign in to comment.