From 9fad9ca9539c3e7441f44eb882a728b51f1349aa Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Thu, 3 Jun 2021 13:48:22 +0200 Subject: [PATCH] added minecraft:mountain_parameters to biomes --- source/behavior/biomes/1.12.0/biomes.json | 1 + .../minecraft.mountain_parameters.json | 61 ++++++++++++ source/behavior/blocks/1.16.100/blocks.json | 99 ++++++++++++------- .../minecraft.entity_collision.json | 1 - source/behavior/blocks/1.16.100/events.json | 1 + source/behavior/blocks/1.16.200/blocks.json | 99 ++++++++++++------- .../minecraft.entity_collision.json | 1 - source/behavior/blocks/1.16.200/events.json | 4 +- .../components/minecraft.transformation.json | 14 +-- source/general/blocks_identifiers.json | 6 -- 10 files changed, 203 insertions(+), 84 deletions(-) create mode 100644 source/behavior/biomes/1.12.0/components/minecraft.mountain_parameters.json delete mode 100644 source/general/blocks_identifiers.json diff --git a/source/behavior/biomes/1.12.0/biomes.json b/source/behavior/biomes/1.12.0/biomes.json index 73c394aa..58a75114 100644 --- a/source/behavior/biomes/1.12.0/biomes.json +++ b/source/behavior/biomes/1.12.0/biomes.json @@ -19,6 +19,7 @@ "minecraft:swamp_surface": { "$ref": "./components/minecraft.swamp_surface.json" }, "minecraft:frozen_ocean_surface": { "$ref": "./components/minecraft.frozen_ocean_surface.json" }, "minecraft:mesa_surface": { "$ref": "./components/minecraft.mesa_surface.json" }, + "minecraft:mountain_parameters": { "$ref": "./components/minecraft.mountain_parameters.json" }, "minecraft:nether_surface": { "$ref": "./components/minecraft.nether_surface.json" }, "minecraft:the_end_surface": { "$ref": "./components/minecraft.the_end_surface.json" }, "minecraft:capped_surface": { "$ref": "./components/minecraft.capped_surface.json" }, diff --git a/source/behavior/biomes/1.12.0/components/minecraft.mountain_parameters.json b/source/behavior/biomes/1.12.0/components/minecraft.mountain_parameters.json new file mode 100644 index 00000000..b80310fd --- /dev/null +++ b/source/behavior/biomes/1.12.0/components/minecraft.mountain_parameters.json @@ -0,0 +1,61 @@ +{ + "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.mountain_parameters", + "title": "Mountain parameters", + "description": "Noise parameters used to drive mountain terrain generation in Overworld", + "type": "object", + "additionalProperties": false, + "minProperties": 0, + "maxProperties": 3, + "properties": { + "peaks_factor": { + "type": "number", + "title": "Peaks factor", + "description": "UNDOCUMENTATED" + }, + "steep_material_adjustment": { + "type": "object", + "title": "Steep material adjustment", + "description": "Defines surface material for steep slopes", + "additionalProperties": false, + "properties": { + "material": { + "type": "string", + "title": "Material", + "description": "Block type use as steep material." + }, + "north_slopes": { + "type": "boolean", + "title": "North slopes", + "description": "Enable for north facing slopes" + }, + "south_slopes": { + "type": "boolean", + "title": "South slopes", + "description": "Enable for south facing slopes" + }, + "west_slopes": { + "type": "boolean", + "title": "West slopes", + "description": "Enable for west facing slopes" + }, + "east_slopes": { + "type": "boolean", + "title": "East slopes", + "description": "Enable for east facing slopes" + } + } + }, + "top_slide": { + "title": "Top slide", + "description": "Controls the density tapering that happens at the top of the world to prevent terrain from reaching too high", + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "title": "Enabled", + "description": "If false, top slide will be disabled. If true, other parameters will be taken into account" + } + } + } + } +} diff --git a/source/behavior/blocks/1.16.100/blocks.json b/source/behavior/blocks/1.16.100/blocks.json index 918a88bd..98d7935b 100644 --- a/source/behavior/blocks/1.16.100/blocks.json +++ b/source/behavior/blocks/1.16.100/blocks.json @@ -18,6 +18,46 @@ "type": "object", "additionalProperties": false, "required": ["description", "components"], + "definitions": { + "components_ref": { + "type": "object", + "title": "Component", + "description": "UNDOCUMENTATED", + "additionalProperties": false, + "properties": { + "minecraft:on_fall_on": { "$ref": "./components/minecraft.on_fall_on.json" }, + "minecraft:on_interact": { "$ref": "./components/minecraft.on_interact.json" }, + "minecraft:on_placed": { "$ref": "./components/minecraft.on_placed.json" }, + "minecraft:on_player_destroyed": { "$ref": "./components/minecraft.on_player_destroyed.json" }, + "minecraft:on_player_placing": { "$ref": "./components/minecraft.on_player_placing.json" }, + "minecraft:on_step_off": { "$ref": "./components/minecraft.on_step_off.json" }, + "minecraft:on_step_on": { "$ref": "./components/minecraft.on_step_on.json" }, + "minecraft:block_light_absorption": { "$ref": "./components/minecraft.block_light_absorption.json" }, + "minecraft:block_light_emission": { "$ref": "./components/minecraft.block_light_emission.json" }, + "minecraft:breakonpush": { "$ref": "./components/minecraft.breakonpush.json" }, + "minecraft:breathability": { "$ref": "./components/minecraft.breathability.json" }, + "minecraft:destroy_time": { "$ref": "./components/minecraft.destroy_time.json" }, + "minecraft:display_name": { "$ref": "./components/minecraft.display_name.json" }, + "minecraft:entity_collision": { "$ref": "./components/minecraft.entity_collision.json" }, + "minecraft:explosion_resistance": { "$ref": "./components/minecraft.explosion_resistance.json" }, + "minecraft:flammable": { "$ref": "./components/minecraft.flammable.json" }, + "minecraft:friction": { "$ref": "./components/minecraft.friction.json" }, + "minecraft:geometry": { "$ref": "./components/minecraft.geometry.json" }, + "minecraft:immovable": { "$ref": "./components/minecraft.immovable.json" }, + "minecraft:map_color": { "$ref": "./components/minecraft.map_color.json" }, + "minecraft:material_instances": { "$ref": "./components/minecraft.material_instances.json" }, + "minecraft:onlypistonpush": { "$ref": "./components/minecraft.onlypistonpush.json" }, + "minecraft:pick_collision": { "$ref": "./components/minecraft.pick_collision.json" }, + "minecraft:placement_filter": { "$ref": "./components/minecraft.placement_filter.json" }, + "minecraft:preventsjumping": { "$ref": "./components/minecraft.preventsjumping.json" }, + "minecraft:random_ticking": { "$ref": "./components/minecraft.random_ticking.json" }, + "minecraft:rotation": { "$ref": "./components/minecraft.rotation.json" }, + "minecraft:ticking": { "$ref": "./components/minecraft.ticking.json" }, + "minecraft:unit_cube": { "$ref": "./components/minecraft.unit_cube.json" }, + "minecraft:unwalkable": { "$ref": "./components/minecraft.unwalkable.json" } + } + } + }, "properties": { "description": { "title": "Block Description", @@ -66,44 +106,35 @@ } } }, + "events": { "$ref": "./events.json" }, "components": { "type": "object", "title": "Component", - "description": "", - "properties": { - "minecraft:on_fall_on": { "$ref": "./components/minecraft.on_fall_on.json" }, - "minecraft:on_interact": { "$ref": "./components/minecraft.on_interact.json" }, - "minecraft:on_placed": { "$ref": "./components/minecraft.on_placed.json" }, - "minecraft:on_player_destroyed": { "$ref": "./components/minecraft.on_player_destroyed.json" }, - "minecraft:on_player_placing": { "$ref": "./components/minecraft.on_player_placing.json" }, - "minecraft:on_step_off": { "$ref": "./components/minecraft.on_step_off.json" }, - "minecraft:on_step_on": { "$ref": "./components/minecraft.on_step_on.json" }, - "minecraft:block_light_absorption": { "$ref": "./components/minecraft.block_light_absorption.json" }, - "minecraft:block_light_emission": { "$ref": "./components/minecraft.block_light_emission.json" }, - "minecraft:breakonpush": { "$ref": "./components/minecraft.breakonpush.json" }, - "minecraft:breathability": { "$ref": "./components/minecraft.breathability.json" }, - "minecraft:destroy_time": { "$ref": "./components/minecraft.destroy_time.json" }, - "minecraft:display_name": { "$ref": "./components/minecraft.display_name.json" }, - "minecraft:entity_collision": { "$ref": "./components/minecraft.entity_collision.json" }, - "minecraft:explosion_resistance": { "$ref": "./components/minecraft.explosion_resistance.json" }, - "minecraft:flammable": { "$ref": "./components/minecraft.flammable.json" }, - "minecraft:friction": { "$ref": "./components/minecraft.friction.json" }, - "minecraft:geometry": { "$ref": "./components/minecraft.geometry.json" }, - "minecraft:immovable": { "$ref": "./components/minecraft.immovable.json" }, - "minecraft:map_color": { "$ref": "./components/minecraft.map_color.json" }, - "minecraft:material_instances": { "$ref": "./components/minecraft.material_instances.json" }, - "minecraft:onlypistonpush": { "$ref": "./components/minecraft.onlypistonpush.json" }, - "minecraft:pick_collision": { "$ref": "./components/minecraft.pick_collision.json" }, - "minecraft:placement_filter": { "$ref": "./components/minecraft.placement_filter.json" }, - "minecraft:preventsjumping": { "$ref": "./components/minecraft.preventsjumping.json" }, - "minecraft:random_ticking": { "$ref": "./components/minecraft.random_ticking.json" }, - "minecraft:rotation": { "$ref": "./components/minecraft.rotation.json" }, - "minecraft:ticking": { "$ref": "./components/minecraft.ticking.json" }, - "minecraft:unit_cube": { "$ref": "./components/minecraft.unit_cube.json" }, - "minecraft:unwalkable": { "$ref": "./components/minecraft.unwalkable.json" } - } + "$ref": "#/definitions/components_ref" }, - "events": { "$ref": "./events.json" } + "permutations": { + "type": "array", + "title": "Permutations", + "description": "UNDOCUMENATED", + "items": { + "title": "Permutation", + "description": "UNDOCUMENATED", + "type": "object", + "additionalProperties": false, + "properties": { + "condition": { + "title": "Condition", + "description": "UNDOCUMENATED", + "$ref": "../../../molang/1.8.0/string.json" + }, + "components": { + "type": "object", + "title": "Component", + "$ref": "#/definitions/components_ref" + } + } + } + } } } } diff --git a/source/behavior/blocks/1.16.100/components/minecraft.entity_collision.json b/source/behavior/blocks/1.16.100/components/minecraft.entity_collision.json index e2024e1e..2edbe911 100644 --- a/source/behavior/blocks/1.16.100/components/minecraft.entity_collision.json +++ b/source/behavior/blocks/1.16.100/components/minecraft.entity_collision.json @@ -1,6 +1,5 @@ { "$id": "blockception.minecraft.behavior.blocks.1.16.100.minecraft.entity_collision", - "additionalProperties": false, "title": "Entity Collision 1.16.100", "description": "Can only be set to false, it disables the collision of the block with entities.", "oneOf": [ diff --git a/source/behavior/blocks/1.16.100/events.json b/source/behavior/blocks/1.16.100/events.json index 79c545b9..383a9817 100644 --- a/source/behavior/blocks/1.16.100/events.json +++ b/source/behavior/blocks/1.16.100/events.json @@ -63,6 +63,7 @@ "title": "Event", "description": "UNDOCUMENTATED", "type": "object", + "additionalProperties": true, "properties": { "add_mob_effect": { "$ref": "./events/add_mob_effect.json" }, "damage": { "$ref": "./events/damage.json" }, diff --git a/source/behavior/blocks/1.16.200/blocks.json b/source/behavior/blocks/1.16.200/blocks.json index 3a002e26..5787d594 100644 --- a/source/behavior/blocks/1.16.200/blocks.json +++ b/source/behavior/blocks/1.16.200/blocks.json @@ -18,6 +18,46 @@ "type": "object", "additionalProperties": false, "required": ["description", "components"], + "definitions": { + "components_ref": { + "type": "object", + "title": "Component", + "description": "UNDOCUMENTATED", + "additionalProperties": false, + "properties": { + "minecraft:on_fall_on": { "$ref": "./components/minecraft.on_fall_on.json" }, + "minecraft:on_interact": { "$ref": "./components/minecraft.on_interact.json" }, + "minecraft:on_placed": { "$ref": "./components/minecraft.on_placed.json" }, + "minecraft:on_player_destroyed": { "$ref": "./components/minecraft.on_player_destroyed.json" }, + "minecraft:on_player_placing": { "$ref": "./components/minecraft.on_player_placing.json" }, + "minecraft:on_step_off": { "$ref": "./components/minecraft.on_step_off.json" }, + "minecraft:on_step_on": { "$ref": "./components/minecraft.on_step_on.json" }, + "minecraft:block_light_absorption": { "$ref": "./components/minecraft.block_light_absorption.json" }, + "minecraft:block_light_emission": { "$ref": "./components/minecraft.block_light_emission.json" }, + "minecraft:breakonpush": { "$ref": "./components/minecraft.breakonpush.json" }, + "minecraft:breathability": { "$ref": "./components/minecraft.breathability.json" }, + "minecraft:destroy_time": { "$ref": "./components/minecraft.destroy_time.json" }, + "minecraft:display_name": { "$ref": "./components/minecraft.display_name.json" }, + "minecraft:entity_collision": { "$ref": "./components/minecraft.entity_collision.json" }, + "minecraft:explosion_resistance": { "$ref": "./components/minecraft.explosion_resistance.json" }, + "minecraft:flammable": { "$ref": "./components/minecraft.flammable.json" }, + "minecraft:friction": { "$ref": "./components/minecraft.friction.json" }, + "minecraft:geometry": { "$ref": "./components/minecraft.geometry.json" }, + "minecraft:immovable": { "$ref": "./components/minecraft.immovable.json" }, + "minecraft:map_color": { "$ref": "./components/minecraft.map_color.json" }, + "minecraft:material_instances": { "$ref": "./components/minecraft.material_instances.json" }, + "minecraft:onlypistonpush": { "$ref": "./components/minecraft.onlypistonpush.json" }, + "minecraft:pick_collision": { "$ref": "./components/minecraft.pick_collision.json" }, + "minecraft:placement_filter": { "$ref": "./components/minecraft.placement_filter.json" }, + "minecraft:preventsjumping": { "$ref": "./components/minecraft.preventsjumping.json" }, + "minecraft:random_ticking": { "$ref": "./components/minecraft.random_ticking.json" }, + "minecraft:rotation": { "$ref": "./components/minecraft.rotation.json" }, + "minecraft:ticking": { "$ref": "./components/minecraft.ticking.json" }, + "minecraft:unit_cube": { "$ref": "./components/minecraft.unit_cube.json" }, + "minecraft:unwalkable": { "$ref": "./components/minecraft.unwalkable.json" } + } + } + }, "properties": { "description": { "title": "Block Description", @@ -66,44 +106,35 @@ } } }, + "events": { "$ref": "./events.json" }, "components": { "type": "object", "title": "Component", - "description": "", - "properties": { - "minecraft:on_fall_on": { "$ref": "./components/minecraft.on_fall_on.json" }, - "minecraft:on_interact": { "$ref": "./components/minecraft.on_interact.json" }, - "minecraft:on_placed": { "$ref": "./components/minecraft.on_placed.json" }, - "minecraft:on_player_destroyed": { "$ref": "./components/minecraft.on_player_destroyed.json" }, - "minecraft:on_player_placing": { "$ref": "./components/minecraft.on_player_placing.json" }, - "minecraft:on_step_off": { "$ref": "./components/minecraft.on_step_off.json" }, - "minecraft:on_step_on": { "$ref": "./components/minecraft.on_step_on.json" }, - "minecraft:block_light_absorption": { "$ref": "./components/minecraft.block_light_absorption.json" }, - "minecraft:block_light_emission": { "$ref": "./components/minecraft.block_light_emission.json" }, - "minecraft:breakonpush": { "$ref": "./components/minecraft.breakonpush.json" }, - "minecraft:breathability": { "$ref": "./components/minecraft.breathability.json" }, - "minecraft:destroy_time": { "$ref": "./components/minecraft.destroy_time.json" }, - "minecraft:display_name": { "$ref": "./components/minecraft.display_name.json" }, - "minecraft:entity_collision": { "$ref": "./components/minecraft.entity_collision.json" }, - "minecraft:explosion_resistance": { "$ref": "./components/minecraft.explosion_resistance.json" }, - "minecraft:flammable": { "$ref": "./components/minecraft.flammable.json" }, - "minecraft:friction": { "$ref": "./components/minecraft.friction.json" }, - "minecraft:geometry": { "$ref": "./components/minecraft.geometry.json" }, - "minecraft:immovable": { "$ref": "./components/minecraft.immovable.json" }, - "minecraft:map_color": { "$ref": "./components/minecraft.map_color.json" }, - "minecraft:material_instances": { "$ref": "./components/minecraft.material_instances.json" }, - "minecraft:onlypistonpush": { "$ref": "./components/minecraft.onlypistonpush.json" }, - "minecraft:pick_collision": { "$ref": "./components/minecraft.pick_collision.json" }, - "minecraft:placement_filter": { "$ref": "./components/minecraft.placement_filter.json" }, - "minecraft:preventsjumping": { "$ref": "./components/minecraft.preventsjumping.json" }, - "minecraft:random_ticking": { "$ref": "./components/minecraft.random_ticking.json" }, - "minecraft:rotation": { "$ref": "./components/minecraft.rotation.json" }, - "minecraft:ticking": { "$ref": "./components/minecraft.ticking.json" }, - "minecraft:unit_cube": { "$ref": "./components/minecraft.unit_cube.json" }, - "minecraft:unwalkable": { "$ref": "./components/minecraft.unwalkable.json" } - } + "$ref": "#/definitions/components_ref" }, - "events": { "$ref": "./events.json" } + "permutations": { + "type": "array", + "title": "Permutations", + "description": "UNDOCUMENATED", + "items": { + "title": "Permutation", + "description": "UNDOCUMENATED", + "type": "object", + "additionalProperties": false, + "properties": { + "condition": { + "title": "Condition", + "description": "UNDOCUMENATED", + "$ref": "../../../molang/1.8.0/string.json" + }, + "components": { + "type": "object", + "title": "Component", + "$ref": "#/definitions/components_ref" + } + } + } + } } } } diff --git a/source/behavior/blocks/1.16.200/components/minecraft.entity_collision.json b/source/behavior/blocks/1.16.200/components/minecraft.entity_collision.json index d4a46d75..a7df419d 100644 --- a/source/behavior/blocks/1.16.200/components/minecraft.entity_collision.json +++ b/source/behavior/blocks/1.16.200/components/minecraft.entity_collision.json @@ -1,6 +1,5 @@ { "$id": "blockception.minecraft.behavior.blocks.1.16.200.minecraft.entity_collision", - "additionalProperties": false, "title": "Entity Collision 1.16.200", "description": "Can only be set to false, it disables the collision of the block with entities.", "oneOf": [ diff --git a/source/behavior/blocks/1.16.200/events.json b/source/behavior/blocks/1.16.200/events.json index fcdcdeea..ec5bc45b 100644 --- a/source/behavior/blocks/1.16.200/events.json +++ b/source/behavior/blocks/1.16.200/events.json @@ -14,13 +14,14 @@ "minecraft:ticking": { "$ref": "#/definitions/event_base" }, "minecraft:random_ticking": { "$ref": "#/definitions/event_base" } }, - "additionalProperties": { "oneOf": [{ "$ref": "#/definitions/event_base" }, { "$ref": "#/definitions/event_functions" }] }, + "additionalProperties": { "$ref": "#/definitions/event_base" }, "definitions": { "event_base": { "title": "Event", "description": "UNDOCUMENTATED", "type": "object", "additionalProperties": false, + "$ref": "#/definitions/event_functions", "properties": { "sequence": { "title": "Sequence", @@ -62,6 +63,7 @@ "title": "Event", "description": "UNDOCUMENTATED", "type": "object", + "additionalProperties": true, "properties": { "add_mob_effect": { "$ref": "./events/add_mob_effect.json" }, "damage": { "$ref": "./events/damage.json" }, diff --git a/source/behavior/entities/1.13.0/components/minecraft.transformation.json b/source/behavior/entities/1.13.0/components/minecraft.transformation.json index 92c086e2..95ec850d 100644 --- a/source/behavior/entities/1.13.0/components/minecraft.transformation.json +++ b/source/behavior/entities/1.13.0/components/minecraft.transformation.json @@ -10,13 +10,15 @@ "type": "object", "description": "List of components to add to the entity after the transformation", "properties": { "component_groups": { "type": "array", "description": "Names of component groups to add", "items": { "type": "string" } } }, - "title": "TODO Title", + "title": "Add", "additionalProperties": false }, - "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "TODO Title" }, + "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "Begin transform sound" }, "delay": { "type": "object", "description": "Defines the properties of the delay for the transformation", + "title": "Delay", + "additionalProperties": false, "properties": { "block_assist_chance": { "type": "number", @@ -41,18 +43,16 @@ "block_types": { "type": "array", "description": "List of blocks that can help the transformation of this entity", - "items": { "$ref": "../../../../general/blocks_identifiers.json" } + "items": { "$ref": "../../../../general/blocks/identifier.json" } }, "value": { "type": "number", "default": 0, "description": "Time in seconds before the entity transforms" } - }, - "title": "TODO Title", - "additionalProperties": false + } }, "drop_equipment": { "type": "boolean", "default": false, "description": "Cause the entity to drop all equipment upon transformation", - "title": "TODO Title" + "title": "Drop equipment" }, "into": { "type": "string", "description": "Entity Definition that this entity will transform into", "title": "TODO Title" }, "keep_level": { diff --git a/source/general/blocks_identifiers.json b/source/general/blocks_identifiers.json deleted file mode 100644 index 3b29aa45..00000000 --- a/source/general/blocks_identifiers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$id": "blockception.minecraft.general.1.8.0.blocks.item", - "type": "string", - "title": "Block Name", - "description": "TODO description" -}