Some more misc fixes (#295)

* - Add mob effects enum

* - Add biome and biome tags to enum

* - Fix feature rules only showing with 1.13.0 format version

* - Replace 1.20.41 -> 1.20.80
- Make certain format versions restricted to 1.10.0

* - Remove example stick (having this here was annoying)

* - Fix

* - Remove empty sounds example

* - Misc fixes for entity components
This commit is contained in:
Xterionix
2024-06-29 00:06:53 +05:00
committed by GitHub
parent 39d1280d5c
commit 822ed538f9
50 changed files with 412 additions and 304 deletions

View File

@@ -1,168 +0,0 @@
{
"$id": "blockception.minecraft.behavior.feature_rules.1.13.0",
"type": "object",
"title": "Feature Rules 1.13.0",
"description": "Each feature rule controls exactly one feature and serves as the root of a chain of feature data.",
"additionalProperties": false,
"required": ["format_version", "minecraft:feature_rules"],
"minProperties": 2,
"maxProperties": 2,
"definitions": {
"coord_dist": {
"title": "",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"oneOf": [
{
"$ref": "../../../molang/number.json",
"description": "Expression for the coordinate (evaluated each iteration). Mutually exclusive with random distribution object below."
},
{
"type": "object",
"description": "Distribution for the coordinate (evaluated each iteration). Mutually exclusive with Molang expression above.",
"additionalProperties": false,
"examples": [{ "numerator": 1, "denominator": 1 }],
"properties": {
"numerator": {
"title": "Numerator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
},
"denominator": {
"title": "Denominator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
}
}
}
]
}
},
"properties": {
"format_version": {
"const": "1.13.0",
"description": "Specifies the version of the game this entity was made in. Minimum supported version is 1.13.0. Current supported version is 1.13.0.",
"title": "Format Version"
},
"minecraft:feature_rules": {
"title": "Feature Rules",
"description": "Each feature rule controls exactly one feature and serves as the root of a chain of feature data.",
"type": "object",
"additionalProperties": false,
"required": ["description", "conditions"],
"properties": {
"description": {
"title": "Description",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "object",
"additionalProperties": false,
"required": ["identifier", "places_feature"],
"properties": {
"identifier": {
"title": "Identifier",
"description": "The name of this feature in the form `namespace_name:feature_name`. `feature_name` must match the filename.",
"type": "string",
"$ref": "../../../general/feature/identifier.json"
},
"places_feature": {
"title": "Places Feature",
"description": "Named reference to the feature controlled by this rule.",
"type": "string"
}
}
},
"conditions": {
"title": "Conditions",
"description": "Parameters to control where and when the feature will be placed.",
"type": "object",
"additionalProperties": false,
"required": ["placement_pass"],
"properties": {
"placement_pass": {
"title": "Placement pass",
"description": "When the feature should be placed relative to others. Earlier passes in the list are guaranteed to occur before later passes. Order is not guaranteed within each pass.",
"type": "string",
"enum": [
"pregeneration_pass",
"first_pass",
"before_underground_pass",
"underground_pass",
"after_underground_pass",
"before_surface_pass",
"surface_pass",
"after_surface_pass",
"before_sky_pass",
"sky_pass",
"after_sky_pass",
"final_pass"
]
},
"minecraft:biome_filter": {
"title": "Placement pass",
"description": "List of filter tests to determine which biomes this rule will attach to.",
"$ref": "../../entities/filters/filters.json"
}
}
},
"distribution": {
"title": "Distribution",
"description": "Parameters controlling the initial scatter of the feature.",
"type": "object",
"additionalProperties": false,
"required": ["iterations"],
"properties": {
"coordinate_eval_order": {
"title": "Coordinate Eval Order",
"description": "The order in which coordinates will be evaluated. Should be used when a coordinate depends on another. If omitted, defaults to `xzy`.",
"type": "string",
"enum": ["xyz", "xzy", "yxz", "yzx", "zxy", "zyx"]
},
"iterations": {
"title": "Iterations",
"description": "Number of scattered positions to generate.",
"$ref": "../../../molang/number.json"
},
"scatter_chance": {
"title": "Scatter Chance",
"oneOf": [
{
"$ref": "../../../molang/number.json",
"description": "Probability (0-100] that this scatter will occur. Not evaluated each iteration; either no iterations will run, or all will."
},
{
"type": "object",
"description": "Probability numerator / denominator that this scatter will occur. Not evaluated each iteration; either no iterations will run, or all will.",
"additionalProperties": false,
"properties": {
"numerator": {
"title": "Numerator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
},
"denominator": {
"title": "Denominator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
}
}
}
]
},
"x": { "title": "X", "$ref": "#/definitions/coord_dist" },
"z": { "title": "Y", "$ref": "#/definitions/coord_dist" },
"y": { "title": "Z", "$ref": "#/definitions/coord_dist" }
}
}
}
}
}
}

View File

@@ -3,7 +3,7 @@
"$id": "blockception.minecraft.behavior.feature_rules",
"examples": [
{
"format_version": "1.20.41",
"format_version": "1.20.80",
"minecraft:feature_rules": {
"minecraft:ore_feature": {
"description": {
@@ -15,8 +15,13 @@
}
}
],
"allOf": [
{ "if": { "properties": { "format_version": { "type": "string", "const": "1.13.0" } } }, "then": { "$ref": "./1.13.0/feature_rules.json" } },
{ "properties": { "format_version": { "$ref": "../../general/format_version.json" } } }
]
"type": "object",
"title": "Feature Rules",
"description": "Each feature rule controls exactly one feature and serves as the root of a chain of feature data.",
"required": ["format_version", "minecraft:feature_rules"],
"additionalProperties": false,
"properties": {
"format_version": { "$ref": "../../general/format_version.json" },
"minecraft:feature_rules": { "$ref": "./format/minecraft.feature_rules.json" }
}
}

View File

@@ -0,0 +1,149 @@
{
"$id": "blockception.minecraft.behavior.feature_rules.minecraft.feature_rules",
"type": "object",
"title": "Feature Rules",
"additionalProperties": false,
"definitions": {
"coord_dist": {
"title": "",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"oneOf": [
{
"$ref": "../../../molang/number.json",
"description": "Expression for the coordinate (evaluated each iteration). Mutually exclusive with random distribution object below."
},
{
"type": "object",
"description": "Distribution for the coordinate (evaluated each iteration). Mutually exclusive with Molang expression above.",
"additionalProperties": false,
"examples": [ { "numerator": 1, "denominator": 1 } ],
"properties": {
"numerator": {
"title": "Numerator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
},
"denominator": {
"title": "Denominator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
}
}
}
]
}
},
"properties": {
"description": {
"title": "Description",
"description": "The description of this feature rule.",
"type": "object",
"additionalProperties": false,
"required": [ "identifier", "places_feature" ],
"properties": {
"identifier": {
"title": "Identifier",
"description": "The name of this feature in the form `namespace_name:feature_name`. `feature_name` must match the filename.",
"type": "string",
"$ref": "../../../general/feature/identifier.json"
},
"places_feature": {
"title": "Places Feature",
"description": "Named reference to the feature controlled by this rule.",
"type": "string"
}
}
},
"conditions": {
"title": "Conditions",
"description": "Parameters to control where and when the feature will be placed.",
"type": "object",
"additionalProperties": false,
"required": [ "placement_pass" ],
"properties": {
"placement_pass": {
"title": "Placement Pass",
"description": "When the feature should be placed relative to others. Earlier passes in the list are guaranteed to occur before later passes. Order is not guaranteed within each pass.",
"type": "string",
"enum": [
"pregeneration_pass",
"first_pass",
"before_underground_pass",
"underground_pass",
"after_underground_pass",
"before_surface_pass",
"surface_pass",
"after_surface_pass",
"before_sky_pass",
"sky_pass",
"after_sky_pass",
"final_pass"
]
},
"minecraft:biome_filter": {
"title": "Biome Filter",
"description": "List of filter tests to determine which biomes this rule will attach to.",
"$ref": "../../entities/filters/filters.json"
}
}
},
"distribution": {
"title": "Distribution",
"description": "Parameters controlling the initial scatter of the feature.",
"type": "object",
"additionalProperties": false,
"required": [ "iterations" ],
"properties": {
"coordinate_eval_order": {
"title": "Coordinate Eval Order",
"description": "The order in which coordinates will be evaluated. Should be used when a coordinate depends on another. If omitted, defaults to `xzy`.",
"type": "string",
"enum": [ "xyz", "xzy", "yxz", "yzx", "zxy", "zyx" ]
},
"iterations": {
"title": "Iterations",
"description": "Number of scattered positions to generate.",
"$ref": "../../../molang/number.json"
},
"scatter_chance": {
"title": "Scatter Chance",
"oneOf": [
{
"$ref": "../../../molang/number.json",
"description": "Probability (0-100] that this scatter will occur. Not evaluated each iteration; either no iterations will run, or all will."
},
{
"type": "object",
"description": "Probability numerator / denominator that this scatter will occur. Not evaluated each iteration; either no iterations will run, or all will.",
"additionalProperties": false,
"properties": {
"numerator": {
"title": "Numerator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
},
"denominator": {
"title": "Denominator",
"description": "UNDOCUMENTED.",
"$comment": "UNDOCUMENTED",
"type": "number",
"minimum": 1
}
}
}
]
},
"x": { "title": "X", "$ref": "#/definitions/coord_dist" },
"z": { "title": "Y", "$ref": "#/definitions/coord_dist" },
"y": { "title": "Z", "$ref": "#/definitions/coord_dist" }
}
}
}
}