diff --git a/.vscode/schema-validation.json b/.vscode/schema-validation.json index 7d1c63ff..704f02b8 100644 --- a/.vscode/schema-validation.json +++ b/.vscode/schema-validation.json @@ -20,6 +20,19 @@ "title": { "type": "string", "pattern": "^([A-Z0-9][a-z0-9\\.]*(| ))*$" + }, + "defaultSnippets": { + "type": "array", + "title": "default Snippets", + "items": { + "type": "object", + "required": ["label", "body"], + "examples": [{ "label": "example", "body": {} }], + "properties": { + "label": { "type": "string" }, + "body": { "type": ["object", "string", "array", "number", "boolean", "integer"] } + } + } } } }, diff --git a/source/behavior/entities/format/components/conditional_bandwidth_optimization.json b/source/behavior/entities/format/components/conditional_bandwidth_optimization.json index e208d948..6b51490c 100644 --- a/source/behavior/entities/format/components/conditional_bandwidth_optimization.json +++ b/source/behavior/entities/format/components/conditional_bandwidth_optimization.json @@ -13,6 +13,7 @@ "title": "Conditional Value", "description": "The object containing the conditional bandwidth optimization values.", "additionalProperties": false, + "type": "object", "properties": { "max_dropped_ticks": { "title": "Maximum Dropped Ticks", diff --git a/source/behavior/entities/format/components/rideable.json b/source/behavior/entities/format/components/rideable.json index 60d04aeb..69d212c6 100644 --- a/source/behavior/entities/format/components/rideable.json +++ b/source/behavior/entities/format/components/rideable.json @@ -25,7 +25,7 @@ "description": "Defines the minimum number of riders that need to be riding this entity before this seat can be used" }, "position": { - "$ref": "../../../../general/array_3_number.json", + "$ref": "../../../../general/vectors/number3.json", "default": [0.0, 0.0, 0.0], "description": "Position of this seat relative to this entity's position" }, diff --git a/source/behavior/items/1.10.0/items.json b/source/behavior/items/1.10.0/items.json index 31566778..e7a27d16 100644 --- a/source/behavior/items/1.10.0/items.json +++ b/source/behavior/items/1.10.0/items.json @@ -87,7 +87,7 @@ "description": "'chorus_teleport` or `none`.", "enum": ["chorus_teleport", "suspicious_stew_effect", "none"] }, - "on_use_range": { "$ref": "../../../general/array_3_number.json" }, + "on_use_range": { "$ref": "../../../general/vectors/number3.json" }, "cooldown_type": { "type": "string", "description": "'chorusfruit` or `none`.", "enum": ["chorusfruit", "none"] }, "cooldown_time": { "type": "integer", "description": "Cooldown time in ticks." }, "can_always_eat": { "type": "boolean", "description": "Can always eat this item? true or false." }, diff --git a/source/behavior/items/1.14.0/items.json b/source/behavior/items/1.14.0/items.json index 8f202aa4..d68f0ef9 100644 --- a/source/behavior/items/1.14.0/items.json +++ b/source/behavior/items/1.14.0/items.json @@ -101,7 +101,7 @@ "title": "On Use Action", "enum": ["chorus_teleport", "suspicious_stew_effect", "none"] }, - "on_use_range": { "$ref": "../../../general/array_3_number.json", "title": "On Use Range" }, + "on_use_range": { "$ref": "../../../general/vectors/number3.json", "title": "On Use Range" }, "cooldown_type": { "type": "string", "description": "'chorusfruit` or `none`.", diff --git a/source/behavior/items/1.16.0/items.json b/source/behavior/items/1.16.0/items.json index 3275ecb9..cd5ad2d4 100644 --- a/source/behavior/items/1.16.0/items.json +++ b/source/behavior/items/1.16.0/items.json @@ -111,7 +111,7 @@ "title": "On Use Action", "enum": ["chorus_teleport", "suspicious_stew_effect", "none"] }, - "on_use_range": { "$ref": "../../../general/array_3_number.json" }, + "on_use_range": { "$ref": "../../../general/vectors/number3.json" }, "cooldown_type": { "type": "string", "description": "'chorusfruit` or `none`.", diff --git a/source/general/array_2_integer.json b/source/general/array_2_integer.json deleted file mode 100644 index 5c3cd987..00000000 --- a/source/general/array_2_integer.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$id": "general.array.integer.2", - "type": "array", - "title": "Array Of 2 Items", - "description": "An array of 2 integers", - "examples": [[0, 1]], - "items": [ - { "type": "integer", "description": "An number", "title": "X" }, - { "type": "integer", "description": "An number", "title": "Y" } - ] -} diff --git a/source/general/array_2_number.json b/source/general/array_2_number.json deleted file mode 100644 index 99a10ebe..00000000 --- a/source/general/array_2_number.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$id": "general.array.number.2", - "type": "array", - "title": "Array Of 2 Items", - "description": "An array of 2 numbers", - "examples": [[0, 1]], - "items": [ - { "type": "number", "description": "An number", "title": "X" }, - { "type": "number", "description": "An number", "title": "Y" } - ] -} diff --git a/source/general/array_3_integer.json b/source/general/array_3_integer.json deleted file mode 100644 index c280cd15..00000000 --- a/source/general/array_3_integer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$id": "general.array.integer.3", - "type": "array", - "title": "Array Of 3 Items", - "description": "An array of 3 integers", - "examples": [[0, 1, 2]], - "items": [ - { "type": "integer", "description": "An number", "title": "X" }, - { "type": "integer", "description": "An number", "title": "Y" }, - { "type": "integer", "description": "An number", "title": "Z" } - ] -} diff --git a/source/general/array_3_number.json b/source/general/array_3_number.json deleted file mode 100644 index 52af00b5..00000000 --- a/source/general/array_3_number.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$id": "general.array.number.3", - "type": "array", - "title": "Array Of 3 Items", - "description": "An array of 3 numbers", - "examples": [[0, 1, 2]], - "items": [ - { "type": "number", "description": "An number", "title": "X" }, - { "type": "number", "description": "An number", "title": "Y" }, - { "type": "number", "description": "An number", "title": "Z" } - ] -} diff --git a/source/general/vectors/integer2.json b/source/general/vectors/integer2.json new file mode 100644 index 00000000..45ed4be6 --- /dev/null +++ b/source/general/vectors/integer2.json @@ -0,0 +1,10 @@ +{ + "type": "array", + "title": "Vector Of 2 Items", + "description": "An vector of 2 integers", + "examples": [[0, 0]], + "items": [ + { "type": "integer", "description": "The X component", "title": "X", "default": 0 }, + { "type": "integer", "description": "The Y component", "title": "Y", "default": 0 } + ] +} diff --git a/source/general/vectors/integer3.json b/source/general/vectors/integer3.json new file mode 100644 index 00000000..5c0cef8a --- /dev/null +++ b/source/general/vectors/integer3.json @@ -0,0 +1,11 @@ +{ + "type": "array", + "title": "Vector Of 3 Items", + "description": "An vector of 3 integers", + "examples": [[0, 0, 0]], + "items": [ + { "type": "integer", "description": "The X component", "title": "X", "default": 0 }, + { "type": "integer", "description": "The Y component", "title": "Y", "default": 0 }, + { "type": "integer", "description": "The Z component", "title": "Z", "default": 0 } + ] +} diff --git a/source/general/vectors/number2.json b/source/general/vectors/number2.json new file mode 100644 index 00000000..44a535a9 --- /dev/null +++ b/source/general/vectors/number2.json @@ -0,0 +1,10 @@ +{ + "type": "array", + "title": "Vector Of 2 Items", + "description": "An vector of 2 number", + "examples": [[0, 0]], + "items": [ + { "type": "number", "description": "The X component", "title": "X", "default": 0 }, + { "type": "number", "description": "The Y component", "title": "Y", "default": 0 } + ] +} diff --git a/source/general/vectors/number3.json b/source/general/vectors/number3.json new file mode 100644 index 00000000..c235f698 --- /dev/null +++ b/source/general/vectors/number3.json @@ -0,0 +1,11 @@ +{ + "type": "array", + "title": "Vector Of 3 Items", + "description": "An vector of 3 number", + "examples": [[0.0, 0.0, 0.0]], + "items": [ + { "type": "number", "description": "The X component", "title": "X", "default": 0 }, + { "type": "number", "description": "The Y component", "title": "Y", "default": 0 }, + { "type": "number", "description": "The Z component", "title": "Z", "default": 0 } + ] +}