diff --git a/source/behavior/entities/filters/filters/has_damage.json b/source/behavior/entities/filters/filters/has_damage.json index d33d62eef..051eda9c4 100644 --- a/source/behavior/entities/filters/filters/has_damage.json +++ b/source/behavior/entities/filters/filters/has_damage.json @@ -9,6 +9,35 @@ "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity receives the named damage type." }, "operator": { "$ref": "./types/operator.json" }, "subject": { "$ref": "./types/subject.json" }, - "value": { "type": "string", "description": "The Damage type to test.", "$ref": "../../../../general/entity/damage_source.json", "title": "Value" } + "value": { "type": "string", "description": "The Damage type to test.", "title": "Value", "enum": [ + "anvil", + "attack", + "block_explosion", + "contact", + "drowning", + "entity_explosion", + "fall", + "falling_block", + "fatal", + "fire", + "fire_tick", + "fly_into_wall", + "lava", + "magic", + "none", + "override", + "piston", + "projectile", + "self_destruct", + "sonic_boom", + "stalactite", + "stalagmite", + "starve", + "suffocation", + "thorns", + "void", + "wither" + ] + } } -} +} \ No newline at end of file diff --git a/source/general/entity/damage_source.json b/source/general/entity/damage_source.json index 62f80a0b6..8d163877f 100644 --- a/source/general/entity/damage_source.json +++ b/source/general/entity/damage_source.json @@ -3,42 +3,41 @@ "description": "The types of damage an entity can receive.", "type": "string", "enum": [ - "all", - "anvil", - "block_explosion", - "campfire", - "charging", - "contact", - "drowning", - "entity_attack", - "entity_explosion", - "fall", - "falling_block", - "fatal", - "fire", - "fire_tick", - "fireworks", - "fly_into_wall", - "freezing", - "lava", - "lightning", - "magic", - "magma", - "none", - "override", - "piston", - "projectile", - "ram_attack", - "sonic_boom", - "soul_campfire", - "stalactite", - "stalagmite", - "starve", - "suffocation", - "suicide", - "temperature", - "thorns", - "void", + "all", + "anvil", + "block_explosion", + "campfire", + "charging", + "contact", + "drowning", + "entity_attack", + "entity_explosion", + "fall", + "falling_block", + "fire", + "fire_tick", + "fireworks", + "fly_into_wall", + "freezing", + "lava", + "lightning", + "magic", + "magma", + "none", + "override", + "piston", + "projectile", + "ram_attack", + "self_destruct", + "sonic_boom", + "soul_campfire", + "stalactite", + "stalagmite", + "starve", + "suffocation", + "temperature", + "thorns", + "void", "wither" ] } diff --git a/source/general/vanilla/material.json b/source/general/vanilla/material.json new file mode 100644 index 000000000..0f5a1f69c --- /dev/null +++ b/source/general/vanilla/material.json @@ -0,0 +1,221 @@ +{ + "title": "Material", + "description": "Entity or attachable material", + "type": "string", + "examples": [ + "entity_static", + "entity_flat_color_line", + "entity_loyalty_rope", + "entity", + "opaque_block", + "opaque_block_color", + "opaque_block_color_uv2", + "alpha_block", + "alpha_block_color", + "entity_nocull", + "entity_change_color", + "entity_alphatest", + "entity_alphatest_one_sided", + "map", + "on_screen_effect", + "item_in_hand_entity_alphatest", + "item_in_hand_entity_alphatest_color", + "item_in_hand_entity_alphatest_one_sided_color", + "entity_alphablend", + "entity_alphablend_nocolor", + "guardian_ghost", + "player_spectator", + "entity_emissive", + "glow_squid", + "entity_emissive_alpha", + "entity_emissive_alpha_one_sided", + "entity_custom", + "item_in_hand", + "item_in_hand_multicolor_tint", + "map_decoration", + "map_marker", + "charged_creeper", + "item_in_hand_glint", + "entity_glint", + "entity_alphatest_glint", + "entity_alphatest_glint_item", + "entity_change_color_glint", + "entity_alphatest_change_color", + "entity_alphatest_change_color_glint", + "entity_alphatest_multicolor_tint", + "beacon_beam", + "beacon_beam_transparent", + "conduit_wind", + "entity_multitexture", + "entity_multitexture_color_mask", + "entity_multitexture_alpha_test", + "entity_multitexture_multiplicative_blend", + "entity_multitexture_alpha_test_color_mask", + "entity_lead_base", + "entity_multitexture_masked", + "moving_block", + "moving_block_seasons", + "moving_block_alpha_seasons", + "moving_block_alpha_single_side", + "moving_block_alpha", + "moving_block_double_side", + "moving_block_blend", + "entity_beam", + "entity_beam_additive", + "entity_dissolve_layer0", + "entity_dissolve_layer1", + "banner", + "banner_pole", + "agent", + "armadillo", + "armor", + "armor_leather", + "armor_enchanted", + "armor_leather_enchanted", + "armor_stand", + "arrow", + "axolotl", + "axolotl_limbs", + "bat", + "bat_v2", + "bed", + "bee", + "bell", + "blaze_head", + "blaze_body", + "boat", + "chalkboard", + "chest", + "chicken", + "chicken_legs", + "cow", + "creeper", + "dragon_head", + "dragon_head_glint", + "drowned", + "egg", + "elytra", + "elytra_glint", + "enchanting_table_book", + "ender_crystal", + "ender_dragon", + "enderman", + "enderman_invisible", + "endermite", + "eye_of_ender_signal", + "ender_pearl", + "evoker", + "fang", + "fireball", + "fireworks_rocket", + "fishing_hook", + "fox", + "frog", + "cat", + "clownfish", + "cod", + "conduit", + "pufferfish", + "salmon", + "tropicalfish", + "ghast", + "guardian", + "horse", + "horse_leather_armor", + "husk", + "husk_clothes", + "ravager", + "iron_golem", + "magma_cube", + "leash_knot", + "lingering_potion_enchanted", + "llama", + "llama_spit", + "minecart", + "mob_head", + "mob_head_glint", + "mooshroom", + "mooshroom_mushrooms", + "npc", + "ocelot", + "parrot", + "pig", + "hoglin", + "zoglin", + "shield", + "shield_glint", + "trident", + "trident_riptide", + "trident_glint", + "piston_arm", + "player", + "player_alphatest", + "polar_bear", + "panda", + "rabbit", + "sheep", + "shulker", + "shulker_box", + "shulker_bullet", + "sign", + "silverfish", + "silverfish_layers", + "skeleton", + "pillager", + "piglin", + "piglin_brute", + "goat", + "allay", + "warden", + "warden_bioluminescent_layer", + "chest_boat", + "slime", + "slime_outer", + "snowball", + "snow_golem", + "snow_golem_pumpkin", + "spider", + "spider_invisible", + "splash_potion_enchanted", + "squid", + "dolphin", + "phantom", + "phantom_invisible", + "stray", + "stray_clothes", + "strider", + "tadpole", + "turtle", + "camera", + "trial_spawner", + "vex", + "villager", + "villager_v2", + "villager_v2_masked", + "vindicator", + "wandering_trader", + "witch", + "wither_boss", + "wither_boss_armor", + "wither_skull", + "wolf", + "wolf_armor", + "xp_bottle", + "zombie", + "zombie_villager", + "zombie_villager_v2", + "zombie_villager_v2_masked", + "player_animated", + "experience_orb", + "sniffer", + "camel", + "pattern", + "pattern_glint", + "breeze", + "breeze_eyes", + "breeze_wind", + "breeze_wind_charge", + "bogged", + "bogged_clothes" + ] +} \ No newline at end of file diff --git a/source/molang/boolean.json b/source/molang/boolean.json index a1b64d138..1a26318d1 100644 --- a/source/molang/boolean.json +++ b/source/molang/boolean.json @@ -3,6 +3,6 @@ "title": "Molang Boolean", "description": "The minecraft molang definition that results in a boolean.", "anyOf": [{ "type": "string", "minLength": 0 }, { "type": "boolean" }], - "examples": [0, "query.variant", "(1.0)", "query.", "variable.=;"], + "examples": ["(1.0)", "(0.0)"], "defaultSnippets": [{ "label": "New Molang", "body": "$1" }] } diff --git a/source/molang/number.json b/source/molang/number.json index be612679e..a1441a031 100644 --- a/source/molang/number.json +++ b/source/molang/number.json @@ -3,6 +3,6 @@ "title": "Molang Number", "description": "The minecraft molang definition that results in a float.", "anyOf": [{ "type": "string", "minLength": 0 }, { "type": "number" }], - "examples": [0, "query.variant", "(1.0)", "query.", "variable.=;"], + "examples": ["(1.0)","(0.0)"], "defaultSnippets": [{ "label": "New Molang", "body": "$1" }] } diff --git a/source/resource/attachables/1.10.0/attachables.json b/source/resource/attachables/1.10.0/attachables.json index 6eec5a8b0..e09668a6c 100644 --- a/source/resource/attachables/1.10.0/attachables.json +++ b/source/resource/attachables/1.10.0/attachables.json @@ -4,7 +4,7 @@ "title": "Actor Animation 1.10.0", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED", - "required": ["format_version", "minecraft:attachable"], + "required": [ "format_version", "minecraft:attachable" ], "properties": { "format_version": { "title": "1.10.0 Format Version", @@ -16,12 +16,12 @@ "type": "object", "title": "Attachables", "description": "The attachables definition.", - "required": ["description"], + "required": [ "description" ], "properties": { "description": { "title": "Description", "type": "object", - "required": ["identifier"], + "required": [ "identifier" ], "additionalProperties": false, "properties": { "animations": { @@ -74,7 +74,13 @@ }, "materials": { "type": "object", - "additionalProperties": { "type": "string", "description": "A single material reference.", "title": "Material" }, + "additionalProperties": { + "type": "string", + "description": + "A single material reference.", + "title": "Material", + "$ref": "../../../general/vanilla/material.json" + }, "description": "A collection of material references.", "title": "Materials" }, @@ -174,10 +180,10 @@ "description": "UNDOCUMENTED: spawn egg.", "title": "Spawn Egg", "dependencies": { - "texture": ["texture_index"], - "texture_index": ["texture"], - "base_colour": ["overlay_color"], - "overlay_color": ["base_colour"] + "texture": [ "texture_index" ], + "texture_index": [ "texture" ], + "base_colour": [ "overlay_color" ], + "overlay_color": [ "base_colour" ] }, "properties": { "base_colour": { "type": "string", "description": "UNDOCUMENTED: base colour.", "title": "Base Colour" }, diff --git a/source/resource/attachables/1.8.0/attachables.json b/source/resource/attachables/1.8.0/attachables.json index 3155a15eb..36413387c 100644 --- a/source/resource/attachables/1.8.0/attachables.json +++ b/source/resource/attachables/1.8.0/attachables.json @@ -72,9 +72,11 @@ }, "materials": { "type": "object", - "description": "UNDOCUMENTED: materials.", "title": "Materials", - "additionalProperties": { "type": "string", "description": "UNDOCUMENTED: additionalProperties.", "title": "Material" } + "additionalProperties": { + "type": "string", "description": "Material Reference.", "title": "Material", + "$ref": "../../../general/vanilla/material.json" + } }, "min_engine_version": { "type": "string", diff --git a/source/resource/entity/1.10.0/entity.json b/source/resource/entity/1.10.0/entity.json index 919cda436..5b999c6cb 100644 --- a/source/resource/entity/1.10.0/entity.json +++ b/source/resource/entity/1.10.0/entity.json @@ -4,7 +4,7 @@ "title": "Actor Entity 1.10.0", "description": "A client side entity definition.", "additionalProperties": false, - "required": ["format_version", "minecraft:client_entity"], + "required": [ "format_version", "minecraft:client_entity" ], "properties": { "format_version": { "$ref": "../../../general/format_version.json" }, "minecraft:client_entity": { @@ -12,26 +12,26 @@ "additionalProperties": false, "title": "Client Entity", "description": "The entity description for clientside rendering, animations and models.", - "required": ["description"], + "required": [ "description" ], "properties": { "description": { "additionalProperties": false, "title": "Description", "description": "The entity description for clientside rendering, animations and models.", "type": "object", - "required": ["identifier"], + "required": [ "identifier" ], "properties": { "animations": { "title": "Animations", "description": "These names are used by the animation controller JSON. Players can reference animations from the vanilla Minecraft Resource Pack or create their own. Custom animations should be in the animation folder at the root of the Resource Pack.", "type": "object", "minProperties": 1, - "examples": [{ "basic": "controller.generic.basic" }], + "examples": [ { "basic": "controller.generic.basic" } ], "additionalProperties": { "type": "string", "description": "These names are used by the animation controller JSON. Players can reference animations from the vanilla Minecraft Resource Pack or create their own. Custom animations should be in the animation folder at the root of the Resource Pack.", "title": "Animation Reference", - "examples": ["controller.", "animation."] + "examples": [ "controller.", "animation." ] } }, "enable_attachables": { "type": "boolean", "description": "Whether or not attachables are enaboled.", "title": "Enable Attachables" }, @@ -71,7 +71,8 @@ "additionalProperties": { "type": "string", "description": "Material reference.", - "title": "Material" + "title": "Material", + "$ref": "../../../general/vanilla/material.json" }, "description": "A collection of material definitions.", "title": "Materials" @@ -186,12 +187,12 @@ "should_update_bones_and_effects_offscreen": { "title": "Should Update Bones And Effects Offscreen", "description": "Bones and effects will still be updated if the entity is off screen if this expression returns anything other than 0.0.", - "oneOf": [{ "type": "boolean" }, { "type": "string", "$ref": "../../../molang/string.json" }] + "oneOf": [ { "type": "boolean" }, { "type": "string", "$ref": "../../../molang/string.json" } ] }, "should_update_effects_offscreen": { "title": "Should Update Effects Offscreen", "description": "Effects will still be updated if the entity is off screen if this expression or `should_update_bones_and_effects_offscreen` returns anything other than 0.0.", - "oneOf": [{ "type": "boolean" }, { "type": "string", "$ref": "../../../molang/string.json" }] + "oneOf": [ { "type": "boolean" }, { "type": "string", "$ref": "../../../molang/string.json" } ] }, "variables": { "title": "Variables", @@ -203,7 +204,7 @@ "title": "Variable", "description": " If a variable is public, it can be read by other mobs. See the molang `->` operator for details.", "type": "string", - "enum": ["public"] + "enum": [ "public" ] } } } @@ -220,7 +221,7 @@ "type": "object", "description": "The definition of how the spawn_egg icon looks like.", "title": "Spawn Egg", - "dependencies": { "texture_index": ["texture"], "base_colour": ["overlay_color"], "overlay_color": ["base_color"] }, + "dependencies": { "texture_index": [ "texture" ], "base_colour": [ "overlay_color" ], "overlay_color": [ "base_color" ] }, "examples": [ { "base_color": "#FFFFFF", "overlay_color": "#000000" }, { "texture": "example_egg", "texture_index": 0 } @@ -231,14 +232,14 @@ "description": "The basic color of the egg.", "title": "Base Color", "format": "color-hex", - "examples": ["#FFFFFF"] + "examples": [ "#FFFFFF" ] }, "overlay_color": { "type": "string", "description": "The colors of the dots on the egg.", "title": "Overlay Color", "format": "color-hex", - "examples": ["#FFFFFF"] + "examples": [ "#FFFFFF" ] }, "texture": { "type": "string", "description": "The texture reference in item_texture.json", "title": "Texture" }, "texture_index": { "type": "integer", "description": "The index of the texture.", "title": "Texture Index", "default": 0 } diff --git a/source/resource/entity/1.8.0/entity.json b/source/resource/entity/1.8.0/entity.json index 9bdf88cdc..005163e85 100644 --- a/source/resource/entity/1.8.0/entity.json +++ b/source/resource/entity/1.8.0/entity.json @@ -93,7 +93,10 @@ }, "materials": { "type": "object", - "additionalProperties": { "type": "string", "description": "Material reference.", "title": "Material" }, + "additionalProperties": { + "type": "string", "description": "Material reference.", "title": "Material", + "$ref": "../../../general/vanilla/material.json" + }, "description": "A collection of material definitions.", "title": "Materials" },