Skip to content

Commit 6cdfb97

Browse files
authored
Merge pull request #96 from ink0rr/fixes
Schema fixes
2 parents 63fac81 + 23c657d commit 6cdfb97

17 files changed

Lines changed: 248 additions & 217 deletions

File tree

packages/minecraftBedrock/schema/block/v1.20.60/components/geometry.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"title": "Geometry",
44
"description": "The description identifier of the geometry file to use to render this block. This identifier must match an existing geometry identifier in any of the currently loaded resource packs.",
5-
"oneOf": [
5+
"anyOf": [
66
{
77
"type": "string",
88
"$ref": "../../../general/reference/geometry.json"
@@ -21,7 +21,7 @@
2121
"properties": {
2222
"identifier": {
2323
"title": "Identifier",
24-
"oneOf": [
24+
"anyOf": [
2525
{
2626
"type": "string",
2727
"$ref": "../../../general/reference/geometry.json"

packages/minecraftBedrock/schema/block/v1.21.100/components/geometry.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"title": "Geometry",
44
"description": "The description identifier of the geometry file to use to render this block. This identifier must match an existing geometry identifier in any of the currently loaded resource packs.",
5-
"oneOf": [
5+
"anyOf": [
66
{
77
"type": "string",
88
"$ref": "../../../general/reference/geometry.json"
@@ -23,7 +23,7 @@
2323
"properties": {
2424
"identifier": {
2525
"title": "Identifier",
26-
"oneOf": [
26+
"anyOf": [
2727
{
2828
"type": "string",
2929
"$ref": "../../../general/reference/geometry.json"

packages/minecraftBedrock/schema/block/v1.21.90/components/experimental/geometry.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"title": "Geometry",
44
"description": "The description identifier of the geometry file to use to render this block. This identifier must match an existing geometry identifier in any of the currently loaded resource packs.",
5-
"oneOf": [
5+
"anyOf": [
66
{
77
"type": "string",
88
"$ref": "../../../../general/reference/geometry.json"
@@ -23,7 +23,7 @@
2323
"properties": {
2424
"identifier": {
2525
"title": "Identifier",
26-
"oneOf": [
26+
"anyOf": [
2727
{
2828
"type": "string",
2929
"$ref": "../../../../general/reference/geometry.json"

packages/minecraftBedrock/schema/block/v1.21.90/components/geometry.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "http://json-schema.org/draft-07/schema",
33
"title": "Geometry",
44
"description": "The description identifier of the geometry file to use to render this block. This identifier must match an existing geometry identifier in any of the currently loaded resource packs.",
5-
"oneOf": [
5+
"anyOf": [
66
{
77
"type": "string",
88
"$ref": "../../../general/reference/geometry.json"
@@ -23,7 +23,7 @@
2323
"properties": {
2424
"identifier": {
2525
"title": "Identifier",
26-
"oneOf": [
26+
"anyOf": [
2727
{
2828
"type": "string",
2929
"$ref": "../../../general/reference/geometry.json"

packages/minecraftBedrock/schema/clientAnimation/main.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
},
171171
"blend_weight": {
172172
"title": "Blend Weight",
173-
"type": "number"
173+
"$ref": "../molang/embedded.json"
174174
},
175175
"override_previous_animation": {
176176
"title": "Override Previous Animation",

packages/minecraftBedrock/schema/entity/v1.16.0/behaviors/behavior.melee_attack.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
"type": "boolean",
4949
"default": false
5050
},
51-
"look_distance": {
52-
"title": "Look Distance",
53-
"type": "number"
54-
},
5551
"untrackable_cooldown_delay": {
5652
"title": "Untrackable Cooldown Delay",
5753
"type": "number"

packages/minecraftBedrock/schema/entity/v1.17.0/behaviors/behavior.melee_attack.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
"type": "boolean",
4949
"default": false
5050
},
51-
"look_distance": {
52-
"title": "Look Distance",
53-
"type": "number"
54-
},
5551
"untrackable_cooldown_delay": {
5652
"title": "Untrackable Cooldown Delay",
5753
"type": "number"

packages/minecraftBedrock/schema/entity/v1.20.30/behaviors/behavior.melee_attack.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
"type": "boolean",
4949
"default": false
5050
},
51-
"look_distance": {
52-
"title": "Look Distance",
53-
"type": "number"
54-
},
5551
"untrackable_cooldown_delay": {
5652
"title": "Untrackable Cooldown Delay",
5753
"type": "number"

packages/minecraftBedrock/schema/entity/v1.20.50/behaviors/behavior.melee_box_attack.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
"type": "boolean",
4949
"default": false
5050
},
51-
"look_distance": {
52-
"title": "Look Distance",
53-
"type": "number"
54-
},
5551
"untrackable_cooldown_delay": {
5652
"title": "Untrackable Cooldown Delay",
5753
"type": "number"
Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"title": "Move Around Target",
4+
"description": "Allows an entity to move around a target. If the entity is too close (i.e. closer than destination range min and height difference limit) it will try to move away from its target. If the entity is too far away from its target it will try to move closer to a random position within the destination range. A randomized amount of those positions will be behind the target, and the spread can be tweaked with 'destination_pos_search_spread_degrees'.",
45
"type": "object",
56
"additionalProperties": false,
67
"properties": {
78
"priority": { "$ref": "../../general/v1.16.0/behaviorPriority.json" },
9+
"destination_pos_spread_degrees": {
10+
"title": "Destination Pos Spread Degrees",
11+
"description": "This angle (in degrees) is used for controlling the spread when picking a destination position behind the target. A zero spread angle means the destination position will be straight behind the target with no variance. A 90 degree spread angle means the destination position can be up to 45 degrees to the left and to the right of the position straight behind the target's view direction.",
12+
"$ref": "../../../general/degree.json",
13+
"default": 90
14+
},
815
"destination_position_range": {
916
"title": "Destination Position Range",
17+
"description": "The range of distances from the target entity within which the goal should look for a position to move the owner entity to.",
1018
"type": "array",
1119
"minItems": 2,
1220
"maxItems": 2,
@@ -21,18 +29,34 @@
2129
}
2230
]
2331
},
24-
"destination_pos_spread_degrees": {
25-
"title": "Destination Pos Spread Degrees",
26-
"$ref": "../../../general/degree.json",
27-
"default": 90
32+
"filters": {
33+
"title": "Filters",
34+
"description": "Conditions that need to be met for the behavior to start.",
35+
"$ref": "../../general/v1.16.0/filter.json"
36+
},
37+
"height_difference_limit": {
38+
"title": "Height Difference Limit",
39+
"description": "Distance in height (in blocks) between the owner entity and the target has to be less than this value when owner checks if it is too close and should move away from the target. This value needs to be bigger than zero for the move away logic to trigger.",
40+
"type": "number",
41+
"default": 10
42+
},
43+
"horizontal_search_distance": {
44+
"title": "Horizontal Search Distance",
45+
"description": "Horizontal search distance (in blocks) when searching for a position to move away from target.",
46+
"type": "number",
47+
"default": 5
2848
},
2949
"movement_speed": {
3050
"title": "Movement Speed",
31-
"type": "number"
51+
"description": "The speed with which the entity should move to its target position.",
52+
"type": "number",
53+
"default": 0.6
3254
},
33-
"filters": {
34-
"title": "Filters",
35-
"$ref": "../../general/v1.16.0/filter.json"
55+
"vertical_search_distance": {
56+
"title": "Vertical Search Distance",
57+
"description": "Vertical search distance (in blocks) when searching for a position to move away from target.",
58+
"type": "number",
59+
"default": 5
3660
}
3761
}
3862
}

0 commit comments

Comments
 (0)