Skip to content
Open

Fixes #103

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/minecraftBedrock/fileDefinitions.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"icon": "mdi-cube-unfolded",
"detect": {
"packType": "resourcePack",
"scope": "water/",
"scope": "cubemaps/",
"matcher": [
"cubemaps/**/*",
"cubemaps/*"
Expand Down
14 changes: 14 additions & 0 deletions packages/minecraftBedrock/schema/biome/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@
"then": {
"$ref": "./v1.21.110/main.json"
}
},
{
"if": {
"properties": {
"format_version": {
"enum": [
"1.26.0"
]
}
}
},
"then": {
"$ref": "./v1.26.0/main.json"
}
}
]
}
14 changes: 14 additions & 0 deletions packages/minecraftBedrock/schema/block/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,20 @@
"then": {
"$ref": "./v1.21.130/main.json"
}
},
{
"if": {
"properties": {
"format_version": {
"enum": [
"1.26.0"
]
}
}
},
"then": {
"$ref": "./v1.26.0/main.json"
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
{
"properties": {
"minecraft:collision_box": {
"$ref": "../../../project/experimentalGameplay/upcomingCreatorFeatures.json",
"then": {
"$ref": "./experimental/collision_box.json"
},
"else": {
"$ref": "../../v1.19.50/components/collision_box.json"
}
"$ref": "../../v1.26.0/components/collision_box.json"
},
"minecraft:connection_rule": {
"$ref": "../../v1.26.0/components/connection_rule.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"description": "Defines the area of the block that collides with entities. If set to true, default values are used. If set to false, the block's collision with entities is disabled. If this component is omitted, default values are used.",
"title": "Collision Box",
"oneOf": [
{
"$ref": "#/definitions/box"
},
{
"type": "array",
"items": {
"$ref": "#/definitions/box"
}
},
{
"type": "boolean"
}
],
"definitions": {
"box": {
"type": "object",
"additionalProperties": false,
"properties": {
"size": {
"title": "Size",
"description": "Size of each side of the collision box. Size is specified as [x, y, z]. 'origin' + 'size' must be in the range (-8, 0, -8) to (8, 16, 8), inclusive.",
"type": "array",
"maxItems": 3,
"minItems": 3,
"items": [
{
"type": "number",
"maximum": 16,
"minimum": 0,
"default": 16.0
},
{
"type": "number",
"maximum": 24.0,
"minimum": 0,
"default": 16.0
},
{
"type": "number",
"maximum": 16,
"minimum": 0,
"default": 16.0
}
]
},
"origin": {
"title": "Origin",
"description": "Minimal position of the bounds of the collision box. 'origin' is specified as [x, y, z] and must be in the range (-8, 0, -8) to (8, 16, 8), inclusive.",
"type": "array",
"maxItems": 3,
"minItems": 3,
"items": [
{
"type": "number",
"minimum": -8,
"maximum": 8,
"default": -8.0
},
{
"type": "number",
"minimum": 0,
"maximum": 16,
"default": 0.0
},
{
"type": "number",
"minimum": -8,
"maximum": 8,
"default": -8.0
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"material_instances": {
"description": "The 'minecraft:material_instances' component that will be used for the embedded visual.",
"$ref": "../../v1.21.80/components/material_instances.json"
"$ref": "./material_instances.json"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"properties": {
"geometry": {
"description": "The 'minecraft:geometry' component that will be used for the item.",
"$ref": "../../../v1.21.100/components/geometry.json"
"$ref": "../../v1.21.100/components/geometry.json"
},
"material_instances": {
"description": "The 'minecraft:material_instances' component that will be used for the item.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
"type": "boolean",
"default": false
},
"can_spread_on_fire": {
"title": "Can Spread On Fire",
"description": "If the entity is on fire, this allows the entity's target to catch on fire after being hit.",
"type": "boolean",
"default": false
},
"require_complete_path": {
"title": "Require Complete Path",
"description": "Toggles (on/off) the need to have a full path from the entity to the target when using this melee attack behavior.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,18 @@
"on_home": {
"title": "Event: On Home",
"description": "Event to run when this mob gets home.",
"anyOf": [
{
"$ref": "../../general/v1.16.0/eventDefinition.json"
},
{
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
}
]
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
},
"on_failed": {
"title": "Event: On Failed",
"description": "Event to run if this entity fails to get home.",
"anyOf": [
{
"$ref": "../../general/v1.16.0/eventDefinition.json"
},
{
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
}
]
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"additionalProperties": false,
"description": "Sets that this entity doesn't take damage from fire.",
"title": "Fire Immune",
"type": ["boolean", "object"]
"type": "object"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,18 @@
"on_home": {
"title": "Event: On Home",
"description": "Event to run when this mob gets home.",
"anyOf": [
{
"$ref": "../../general/v1.16.0/eventDefinition.json"
},
{
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
}
]
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
},
"on_failed": {
"title": "Event: On Failed",
"description": "Event to run if this entity fails to get home.",
"anyOf": [
{
"$ref": "../../general/v1.16.0/eventDefinition.json"
},
{
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
}
]
"type": "array",
"items": {
"$ref": "../../general/v1.16.0/eventDefinition.json"
}
},
"calculate_new_path_radius": {
"title": "Calculate New Path Radius",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
"type": "boolean",
"default": false
},
"can_spread_on_fire": {
"title": "Can Spread On Fire",
"description": "If the entity is on fire, this allows the entity's target to catch on fire after being hit.",
"type": "boolean",
"default": false
},
"require_complete_path": {
"title": "Require Complete Path",
"description": "Toggles (on/off) the need to have a full path from the entity to the target when using this melee attack behavior.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"minecraft:free_camera_controlled": {
"$ref": "../../v1.21.110/components/free_camera_controlled.json"
},
"mincraft:vertical_movement_action": {
"minecraft:vertical_movement_action": {
"$ref": "../../v1.21.110/components/vertical_movement_action.json"
},
"minecraft:dash_action": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"minecraft:free_camera_controlled": {
"$ref": "../../v1.21.110/components/free_camera_controlled.json"
},
"mincraft:vertical_movement_action": {
"minecraft:vertical_movement_action": {
"$ref": "../../v1.21.110/components/vertical_movement_action.json"
},
"minecraft:dash_action": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"$schema": "http://json-schema.org/draft-07/schema",
"type": "string",
"description": "The category for this item. Categories are used to control high level properties of how the item is integrated into the bedrock engine, such as whether it can be used in slash commands.",
"enum": ["nature", "construction", "items", "equipment", "none", "commands"]
"enum": ["nature", "construction", "items", "equipment", "none"]
}
19 changes: 18 additions & 1 deletion packages/minecraftBedrock/schema/itemTexture/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@
"type": "string",
"$ref": "../general/reference/paths.json#/definitions/texture_paths"
},
{
"type": "object",
"properties": {
"path": {
"title": "Path",
"$ref": "../general/reference/paths.json#/definitions/texture_paths"
},
"tint_color": {
"title": "Tint Color",
"$ref": "../general/hexColor.json"
},
"overlay_color": {
"title": "Overlay Color",
"$ref": "../general/hexColor.json"
}
}
},
{
"type": "array",
"items": {
Expand Down Expand Up @@ -60,4 +77,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"properties": {
"minecraft:recipe_brewing_container": {
"title": "Brewing Container Recipe",
"description": "Represents a recipe that for use with a potion brewing station.",
"description": "Represents a Potion Brewing Container Recipe.",
"type": "object",
"additionalProperties": false,
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"$schema": "http://json-schema.org/draft-07/schema",
"type": "object",
"properties": {
"minecraft:recipe_brewing_container_mix": {
"title": "Brewing Container Mix Recipe",
"description": "Represents a recipe that for use with a Potion Brewing station.",
"minecraft:recipe_brewing_mix": {
"title": "Brewing Mix Recipe",
"description": "Represents a Potion Brewing Mix.",
"type": "object",
"additionalProperties": false,
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"properties": {
"minecraft:recipe_brewing_container": {
"title": "Brewing Container Recipe",
"description": "Represents a recipe that for use with a potion brewing station.",
"description": "Represents a Potion Brewing Container Recipe.",
"type": "object",
"additionalProperties": false,
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"$schema": "http://json-schema.org/draft-07/schema",
"type": "object",
"properties": {
"minecraft:recipe_brewing_container_mix": {
"title": "Brewing Container Mix Recipe",
"description": "Represents a recipe that for use with a Potion Brewing station.",
"minecraft:recipe_brewing_mix": {
"title": "Brewing Mix Recipe",
"description": "Represents a Potion Brewing Mix.",
"type": "object",
"additionalProperties": false,
"properties": {
Expand Down
Loading