From 38ea808af5c254e3442e1c789381043d7116bdb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=BC=E3=83=B31920?= Date: Tue, 28 May 2024 14:49:27 +0800 Subject: [PATCH] Minor changes to texture definition RegExp, & added "FANCY" material enum (#290) * Implement some missing `ui/` schemas - Add `allow_debug_missing_texture` - Add `propagate_alpha` - Add `use_child_anchors` * Tweak descriptions of `item_ref` It should be noted that UI are referred to as "elements." Moreover, the examples used colon (`:`) instead of dots (`.`) which contradicts the given description. * Add more enum values to the `easing` property These are all known values, aside from the five that was given. * Update damage_source.json The list of damage sources have been updated and added new possible damage sources. Damage source `attack` has been deprecated going forward and has been split into two, namely: `entity_attack` and `entity_explosion`. Damage source `fatal` has also been deprecated in newer format/`min_engine` versions, and has caused content log errors upon testing. But will remain for backwards compatibility. This commit aims to resolve #185. Please refer to the damage sensor documentation here: https://github.com/MicrosoftDocs/minecraft-creator/blob/main/creator/Reference/Content/EntityReference/Examples/EntityComponents/minecraftComponent_damage_sensor.md * Define `pack_scope` and `product_type` fields for pack manifests With the release of Add-Ons in the marketplace, these property fields have become present in pack manifests. * Tweak RegExp for defining texture names - It will now match for a colon text (`:`) whereby namespaces are defined with - Fix completely off-the-mark RegExp for `item_texture.json` and `terrain_texture.json` files. * Add `FANCY` material enum * Merge branch --- source/general/manifest/manifest.1.json | 12 ++++++++++++ source/resource/materials/materials.json | 1 + source/resource/textures/flipbook_textures.json | 2 +- source/resource/textures/item_texture.json | 2 +- source/resource/textures/terrain_texture.json | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/source/general/manifest/manifest.1.json b/source/general/manifest/manifest.1.json index 841bd7759..d16007123 100644 --- a/source/general/manifest/manifest.1.json +++ b/source/general/manifest/manifest.1.json @@ -38,6 +38,12 @@ "description": "This is the minimum version of the game that this pack was written for. This helps the game identify whether any backwards compatibility is needed for your pack. You should always use the highest version currently available when creating packs", "title": "Minimum Engine Version" }, + "pack_scope": { + "title": "Pack Scope", + "type": "string", + "description": "This is the scope of the pack. This is only for resource packs", + "enum": ["global", "world", "any"] + }, "lock_template_options": { "type": "boolean", "description": "UNDOCUMENTED: lock template options.", "title": "Lock Template Options" }, "base_game_version": { "$ref": "../Version.json", "description": "UNDOCUMENTED: base game version.", "title": "Base Game Version" } }, @@ -127,6 +133,12 @@ "license": { "type": "string", "description": "The license of the pack.", "title": "License" }, "url": { "type": "string", "description": "The home website of your pack.", "title": "Url" }, "description": "UNDOCUMENTED: metadata.", + "product_type": { + "type": "string", + "title": "Product Type", + "description": "The type of product this pack is. This is used to determine how the pack is displayed in the store.", + "enum": ["", "addon"] + }, "title": "Metadata" } } diff --git a/source/resource/materials/materials.json b/source/resource/materials/materials.json index f55ed2c17..968c6785b 100644 --- a/source/resource/materials/materials.json +++ b/source/resource/materials/materials.json @@ -52,6 +52,7 @@ "ENABLE_LIGHT", "ENABLE_VERTEX_TINT_MASK", "END_PORTAL", + "FANCY", "FLIP_OCCLUSION", "FOG", "FORCE_DEPTH_ZERO", diff --git a/source/resource/textures/flipbook_textures.json b/source/resource/textures/flipbook_textures.json index f49359ab2..076c0ccf4 100644 --- a/source/resource/textures/flipbook_textures.json +++ b/source/resource/textures/flipbook_textures.json @@ -20,7 +20,7 @@ "atlas_tile": { "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED", - "pattern": "^[a-z0-9_\\-]*$", + "pattern": "^[a-z0-9_:\\-]*$", "title": "Atlas Index", "type": "string" }, diff --git a/source/resource/textures/item_texture.json b/source/resource/textures/item_texture.json index 93bd42b66..56094991d 100644 --- a/source/resource/textures/item_texture.json +++ b/source/resource/textures/item_texture.json @@ -70,7 +70,7 @@ "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED", "type": "object", - "propertyNames": { "pattern": "^[\\w_\\-\\.]+$" }, + "propertyNames": { "pattern": "^[a-z0-9_:\\-]*$" }, "additionalProperties": { "title": "Texture Data", "description": "UNDOCUMENTED.", diff --git a/source/resource/textures/terrain_texture.json b/source/resource/textures/terrain_texture.json index 2a5ff8e87..5b44b48a7 100644 --- a/source/resource/textures/terrain_texture.json +++ b/source/resource/textures/terrain_texture.json @@ -59,7 +59,7 @@ "resource_pack_name": { "type": "string", "title": "Resource Pack Name", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" }, "texture_data": { "type": "object", - "propertyNames": { "pattern": "^[\\w_\\-\\.]+$" }, + "propertyNames": { "pattern": "^[a-z0-9_:\\-]*$" }, "additionalProperties": { "type": "object", "title": "Texture Data",