From 91ae5662fdf4f432e7b5e728cd383ed4d2e4f7b2 Mon Sep 17 00:00:00 2001 From: Xterionix <72647213+Xterionix@users.noreply.github.com> Date: Sat, 20 Jul 2024 23:54:11 +0500 Subject: [PATCH 1/5] - Remove molang examples --- source/molang/boolean.json | 2 +- source/molang/number.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/molang/boolean.json b/source/molang/boolean.json index a1b64d13..1a26318d 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 be612679..a1441a03 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" }] } From 4d4625177153989c33fed0bd53db0db2bb4c3599 Mon Sep 17 00:00:00 2001 From: Xterionix <72647213+Xterionix@users.noreply.github.com> Date: Sat, 20 Jul 2024 23:54:45 +0500 Subject: [PATCH 2/5] - Update has damage because apparently not every value is accepted --- .../entities/filters/filters/has_damage.json | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/source/behavior/entities/filters/filters/has_damage.json b/source/behavior/entities/filters/filters/has_damage.json index d33d62ee..051eda9c 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 From e31b9c284972b3437d44a009bf5ac429755658fa Mon Sep 17 00:00:00 2001 From: Xterionix <72647213+Xterionix@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:05:38 +0500 Subject: [PATCH 3/5] - Add materials enum and adjust entity/attachable accordingly --- source/general/vanilla/material.json | 227 ++++++++++ .../attachables/1.10.0/attachables.json | 22 +- .../attachables/1.8.0/attachables.json | 6 +- source/resource/entity/1.10.0/entity.json | 388 +----------------- source/resource/entity/1.8.0/entity.json | 5 +- 5 files changed, 261 insertions(+), 387 deletions(-) create mode 100644 source/general/vanilla/material.json diff --git a/source/general/vanilla/material.json b/source/general/vanilla/material.json new file mode 100644 index 00000000..cb629533 --- /dev/null +++ b/source/general/vanilla/material.json @@ -0,0 +1,227 @@ +{ + "title": "Material", + "description": "Entity or attachable material", + "anyOf": [ + { + "enum": [ + "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" + ] + }, + { + "type": "string" + } + ] +} \ No newline at end of file diff --git a/source/resource/attachables/1.10.0/attachables.json b/source/resource/attachables/1.10.0/attachables.json index 6eec5a8b..e09668a6 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 3155a15e..36413387 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 e7d68be1..5b999c6c 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" }, @@ -72,371 +72,7 @@ "type": "string", "description": "Material reference.", "title": "Material", - "examples": [ - "agent", - "alpha_block", - "alpha_block_color", - "animated_texture_blit", - "armor", - "armor_enchanted", - "armor_leather", - "armor_leather_enchanted", - "armor_stand", - "arrow", - "ash", - "axolotl", - "axolotl_limbs", - "banner", - "banner_pole", - "bat", - "beacon_beam", - "beacon_beam_transparent", - "bed", - "bee", - "bell", - "blaze_body", - "blaze_head", - "block_overlay", - "blue_spores", - "boat", - "camera", - "camera_facing_sprite", - "cat", - "chalkboard", - "charged_creeper", - "chest", - "chicken", - "chicken_legs", - "clouds", - "clownfish", - "cod", - "conduit", - "conduit_wind", - "cow", - "cracks_overlay", - "cracks_overlay_alpha_test", - "cracks_overlay_tile_entity", - "creeper", - "debug", - "debug_array_texture", - "debug_texture", - "dolphin", - "dragon_head", - "dragon_head_glint", - "drowned", - "egg", - "elytra", - "elytra_glint", - "enchanting_table_book", - "ender_crystal", - "ender_dragon", - "ender_pearl", - "enderman", - "enderman_invisible", - "endermite", - "entity", - "entity_alphablend", - "entity_alphablend_nocolor", - "entity_alphatest", - "entity_alphatest_change_color", - "entity_alphatest_change_color_glint", - "entity_alphatest_glint", - "entity_alphatest_glint_item", - "entity_alphatest_multicolor_tint", - "entity_alphatest_one_sided", - "entity_beam", - "entity_beam_additive", - "entity_change_color", - "entity_change_color_glint", - "entity_custom", - "entity_dissolve_layer0", - "entity_dissolve_layer1", - "entity_emissive", - "entity_emissive_alpha", - "entity_emissive_alpha_one_sided", - "entity_flat_color_line", - "entity_glint", - "entity_lead_base", - "entity_loyalty_rope", - "entity_multitexture", - "entity_multitexture_alpha_test", - "entity_multitexture_alpha_test_color_mask", - "entity_multitexture_color_mask", - "entity_multitexture_masked", - "entity_multitexture_multiplicative_blend", - "entity_nocull", - "entity_static", - "evoker", - "experience_orb", - "eye_of_ender_signal", - "fang", - "fireball", - "fireworks_rocket", - "fishing_hook", - "fox", - "fullscreen_cube_overlay", - "fullscreen_cube_overlay_blend", - "fullscreen_cube_overlay_opaque", - "ghast", - "glow_sign_text", - "glow_squid", - "goat", - "guardian", - "guardian_ghost", - "hoglin", - "holo_coord_frame", - "holo_hand", - "holo_hand_pointer", - "holo_hud_quad", - "hologram", - "hologram_hit_effect", - "hololens_LSRPlane", - "hololens_LSRPlaneTextured", - "hololens_UICursor", - "hololens_UICursor_ingame_mainpart", - "hololens_UICursor_ingame_pseudoshadow", - "holoscreen_level_quad", - "holoscreen_monoscopic_quad", - "holoscreen_stereoscopic_quad", - "horse", - "horse_leather_armor", - "husk", - "husk_clothes", - "im_gui", - "iron_golem", - "item_in_hand", - "item_in_hand_entity_alphatest", - "item_in_hand_entity_alphatest_color", - "item_in_hand_glint", - "item_in_hand_multicolor_tint", - "leash_knot", - "lightning", - "lingering_potion_enchanted", - "living_room", - "llama", - "llama_spit", - "magma_cube", - "map", - "map_decoration", - "map_marker", - "minecart", - "mob_head", - "mob_head_glint", - "mooshroom", - "mooshroom_mushrooms", - "moving_block", - "moving_block_alpha", - "moving_block_alpha_seasons", - "moving_block_alpha_single_side", - "moving_block_blend", - "moving_block_double_side", - "moving_block_seasons", - "name_tag", - "name_tag_depth_tested", - "name_text_depth_tested", - "npc", - "ocelot", - "on_screen_effect", - "opaque_block", - "opaque_block_color", - "opaque_block_color_uv2", - "overlay_quad", - "overlay_quad_clear", - "panda", - "parrot", - "particles_alpha", - "particles_base", - "particles_blend", - "particles_effects", - "particles_opaque", - "particles_random_test", - "passthru_postprocess", - "phantom", - "phantom_invisible", - "pig", - "piglin", - "piglin_brute", - "pillager", - "piston_arm", - "plankton", - "player", - "player_alphatest", - "player_animated", - "polar_bear", - "portal_base", - "precipitation", - "pufferfish", - "rabbit", - "rain", - "ravager", - "reality_frame_cutout", - "reality_frame_skyfill", - "red_spores", - "rift_mirror_logo", - "rift_mirror_texture", - "rift_texture_copy_noalpha", - "salmon", - "selection_box", - "selection_overlay", - "selection_overlay_alpha", - "selection_overlay_block_entity", - "selection_overlay_double_sided", - "selection_overlay_item", - "selection_overlay_level", - "selection_overlay_opaque", - "shadow_back", - "shadow_front", - "shadow_overlay", - "sheep", - "shield", - "shield_glint", - "shulker", - "shulker_box", - "shulker_bullet", - "sign", - "sign_text", - "silverfish", - "silverfish_layers", - "skeleton", - "slime", - "slime_outer", - "snow", - "snow_golem", - "snow_golem_pumpkin", - "snowball", - "spider", - "spider_invisible", - "splash_potion_enchanted", - "squid", - "ST_BatchedStandard", - "ST_Blur_1", - "ST_Blur_10", - "ST_Blur_11", - "ST_Blur_12", - "ST_Blur_2", - "ST_Blur_3", - "ST_Blur_4", - "ST_Blur_5", - "ST_Blur_6", - "ST_Blur_7", - "ST_Blur_8", - "ST_Blur_9", - "ST_Hairline", - "ST_HairlinePath", - "ST_LinearGradient2Point", - "ST_LinearGradient3PointSymmetrical", - "ST_LinearGradientFromTexture", - "ST_LinearGradientMasked2Point", - "ST_LinearGradientMasked3PointSymmetrical", - "ST_LinearGradientMaskedFromTexture", - "ST_Path", - "ST_RadialGradient2Point", - "ST_RadialGradient3PointSymmetrical", - "ST_RadialGradientFromTexture", - "ST_RadialGradientMasked2Point", - "ST_RadialGradientMasked3PointSymmetrical", - "ST_RadialGradientMaskedFromTexture", - "ST_SimpleTexture", - "ST_SimpleTextureMasked", - "ST_Standard", - "ST_StandardCircle", - "ST_StandardEllipse", - "ST_StandardRRect", - "ST_StandardStrokeCircle", - "ST_StandardStrokeEllipse", - "ST_StandardStrokeRRect", - "ST_StandardTexture", - "ST_StandardTextureWithColorMatrix", - "ST_Stencil", - "ST_StencilCircle", - "ST_StencilPath", - "ST_StencilRRect", - "ST_StencilTexture", - "ST_Text", - "ST_TextSDF", - "ST_TextStrokeSDF", - "ST_TexturesWithColorMix", - "ST_YUV2ARGB", - "ST_YUV2RGB", - "stray", - "stray_clothes", - "strider", - "terrain_alpha", - "terrain_alpha_seasons", - "terrain_alpha_single_side", - "terrain_base", - "terrain_blend", - "terrain_blend_far", - "terrain_blend_no_culling", - "terrain_doubleside", - "terrain_far", - "terrain_inside_block", - "terrain_opaque", - "terrain_opaque_seasons", - "terrain_seasons_far", - "terrain_seasons_far_alpha", - "trident", - "trident_glint", - "trident_riptide", - "tropicalfish", - "turtle", - "ui_banner", - "ui_banner_pole", - "ui_base", - "ui_conduit", - "ui_crosshair", - "ui_cubemap", - "ui_dragon_head", - "ui_dragon_head_glint", - "ui_fill_color", - "ui_fill_gradient", - "ui_fill_stencil", - "ui_grayscale", - "ui_grayscale_bilinear", - "ui_inventory_item_glint", - "ui_invert_overlay", - "ui_item", - "ui_item_glint", - "ui_item_glint_stencil", - "ui_item_multicolor_tint", - "ui_item_unglint_stencil", - "ui_mob_head", - "ui_mob_head_glint", - "ui_shield", - "ui_shield_glint", - "ui_skinning_item", - "ui_text", - "ui_text_msdf", - "ui_text_smooth", - "ui_texture_and_color", - "ui_texture_and_color_blur", - "ui_texture_and_color_tint", - "ui_textured", - "ui_textured_and_glcolor", - "ui_textured_and_glcolor_bilinear_sprite", - "ui_textured_and_glcolor_sprite", - "vex", - "villager", - "villager_v2", - "villager_v2_masked", - "vindicator", - "wandering_trader", - "water_hole", - "white_ash", - "windowsmr_holo_hand", - "wireframe", - "witch", - "wither_boss", - "wither_boss_armor", - "wither_skull", - "wolf", - "xp_bottle", - "zoglin", - "zombie", - "zombie_villager", - "zombie_villager_v2", - "zombie_villager_v2_masked" - ] + "$ref": "../../../general/vanilla/material.json" }, "description": "A collection of material definitions.", "title": "Materials" @@ -551,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", @@ -568,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" ] } } } @@ -585,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 } @@ -596,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 9bdf88cd..005163e8 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" }, From ab909526ea69f930a56d6882581aa5d3b671319a Mon Sep 17 00:00:00 2001 From: Xterionix <72647213+Xterionix@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:06:52 +0500 Subject: [PATCH 4/5] - Update damage source list --- source/general/entity/damage_source.json | 71 ++++++++++++------------ 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/source/general/entity/damage_source.json b/source/general/entity/damage_source.json index 62f80a0b..8d163877 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" ] } From 41c206f58fb9f1d4200bed44548507dc62d30529 Mon Sep 17 00:00:00 2001 From: Xterionix <72647213+Xterionix@users.noreply.github.com> Date: Wed, 14 Aug 2024 05:37:39 +0500 Subject: [PATCH 5/5] - Change to example --- source/general/vanilla/material.json | 438 +++++++++++++-------------- 1 file changed, 216 insertions(+), 222 deletions(-) diff --git a/source/general/vanilla/material.json b/source/general/vanilla/material.json index cb629533..0f5a1f69 100644 --- a/source/general/vanilla/material.json +++ b/source/general/vanilla/material.json @@ -1,227 +1,221 @@ { "title": "Material", "description": "Entity or attachable material", - "anyOf": [ - { - "enum": [ - "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" - ] - }, - { - "type": "string" - } + "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