From 39409d0938ce20953cd3048a3dd3894f6aeb7e04 Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Tue, 7 Jun 2022 21:49:23 +0200 Subject: [PATCH] Trying to make sense of blocks --- ...bsorption.json => block_light_filter.json} | 2 +- .../blocks/format/components/loot.json | 2 +- source/behavior/blocks/format/events.json | 93 ++++--------------- 3 files changed, 20 insertions(+), 77 deletions(-) rename source/behavior/blocks/format/components/{block_light_absorption.json => block_light_filter.json} (60%) diff --git a/source/behavior/blocks/format/components/block_light_absorption.json b/source/behavior/blocks/format/components/block_light_filter.json similarity index 60% rename from source/behavior/blocks/format/components/block_light_absorption.json rename to source/behavior/blocks/format/components/block_light_filter.json index ddaf1662..c72c2725 100644 --- a/source/behavior/blocks/format/components/block_light_absorption.json +++ b/source/behavior/blocks/format/components/block_light_filter.json @@ -3,6 +3,6 @@ "additionalProperties": false, "type": "integer", "title": "Block Light Absorption", - "description": "The amount of light this block will absorb.", + "description": "The amount of light this block will filter out. Higher value means more light will be filtered out (0 - 15).", "default": 0 } diff --git a/source/behavior/blocks/format/components/loot.json b/source/behavior/blocks/format/components/loot.json index 3cacd67c..530e37cb 100644 --- a/source/behavior/blocks/format/components/loot.json +++ b/source/behavior/blocks/format/components/loot.json @@ -3,6 +3,6 @@ "additionalProperties": false, "type": "string", "title": "Loot", - "description": "The path to the loot table, relative to the behavior pack.", + "description": "The path to the loot table, relative to the behavior pack. Path string is limited to 256 characters.", "pattern": "loot_tables/.*\\.json$" } diff --git a/source/behavior/blocks/format/events.json b/source/behavior/blocks/format/events.json index 897a1bd1..38b6f3eb 100644 --- a/source/behavior/blocks/format/events.json +++ b/source/behavior/blocks/format/events.json @@ -5,17 +5,14 @@ "$comment": "UNDOCUMENTED", "type": "object", "properties": { - "minecraft:on_interact": { "$ref": "#/definitions/event_base" }, - "minecraft:on_step_on": { "$ref": "#/definitions/event_base" }, - "minecraft:on_step_off": { "$ref": "#/definitions/event_base" }, "minecraft:on_fall_on": { "$ref": "#/definitions/event_base" }, + "minecraft:on_interact": { "$ref": "#/definitions/event_base" }, "minecraft:on_placed": { "$ref": "#/definitions/event_base" }, - "minecraft:on_player_placing": { "$ref": "#/definitions/event_base" }, "minecraft:on_player_destroyed": { "$ref": "#/definitions/event_base" }, - "minecraft:ticking": { "$ref": "#/definitions/event_base" }, - "minecraft:random_ticking": { "$ref": "#/definitions/event_base" } + "minecraft:on_player_placing": { "$ref": "#/definitions/event_base" }, + "minecraft:on_step_off": { "$ref": "#/definitions/event_base" }, + "minecraft:on_step_on": { "$ref": "#/definitions/event_base" } }, - "additionalProperties": { "$ref": "#/definitions/event_base" }, "definitions": { "event_base": { "title": "Event", @@ -23,77 +20,23 @@ "$comment": "UNDOCUMENTED", "type": "object", "additionalProperties": false, - "$ref": "#/definitions/event_functions", "properties": { - "sequence": { - "title": "Sequence", - "description": "UNDOCUMENTED", - "$comment": "UNDOCUMENTED", - "type": "array", - "items": { - "title": "Sequence", - "description": "UNDOCUMENTED", - "$comment": "UNDOCUMENTED", - "type": "object", - "$ref": "#/definitions/event_functions" - } + "condition": { + "title": "Condition", + "description": "The condition of event to be executed on the block.", + "type": "string" }, - "randomize": { - "title": "Randomize", - "description": "UNDOCUMENTED", - "$comment": "UNDOCUMENTED", - "type": "array", - "items": { - "title": "Randomize", - "description": "UNDOCUMENTED", - "$comment": "UNDOCUMENTED", - "type": "object", - "$ref": "#/definitions/event_functions", - "required": ["weight"], - "properties": { - "weight": { "title": "Weight", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 } - } - } + "event": { + "title": "Event", + "description": "The event executed on the block.", + "type": "string" }, - "add_mob_effect": { "$ref": "./events/add_mob_effect.json" }, - "damage": { "$ref": "./events/damage.json" }, - "decrement_stack": { "$ref": "./events/decrement_stack.json" }, - "die": { "$ref": "./events/die.json" }, - "play_effect": { "$ref": "./events/play_effect.json" }, - "play_sound": { "$ref": "./events/play_sound.json" }, - "remove_mob_effect": { "$ref": "./events/remove_mob_effect.json" }, - "run_command": { "$ref": "./events/run_command.json" }, - "set_block": { "$ref": "./events/set_block.json" }, - "set_block_at_pos": { "$ref": "./events/set_block_at_pos.json" }, - "set_block_property": { "$ref": "./events/set_block_property.json" }, - "spawn_loot": { "$ref": "./events/spawn_loot.json" }, - "swing": { "$ref": "./events/swing.json" }, - "teleport": { "$ref": "./events/teleport.json" }, - "transform_item": { "$ref": "./events/transform_item.json" } - } - }, - "event_functions": { - "title": "Event", - "description": "UNDOCUMENTED", - "$comment": "UNDOCUMENTED", - "type": "object", - "additionalProperties": true, - "properties": { - "add_mob_effect": { "$ref": "./events/add_mob_effect.json" }, - "damage": { "$ref": "./events/damage.json" }, - "decrement_stack": { "$ref": "./events/decrement_stack.json" }, - "die": { "$ref": "./events/die.json" }, - "play_effect": { "$ref": "./events/play_effect.json" }, - "play_sound": { "$ref": "./events/play_sound.json" }, - "remove_mob_effect": { "$ref": "./events/remove_mob_effect.json" }, - "run_command": { "$ref": "./events/run_command.json" }, - "set_block": { "$ref": "./events/set_block.json" }, - "set_block_at_pos": { "$ref": "./events/set_block_at_pos.json" }, - "set_block_property": { "$ref": "./events/set_block_property.json" }, - "spawn_loot": { "$ref": "./events/spawn_loot.json" }, - "swing": { "$ref": "./events/swing.json" }, - "teleport": { "$ref": "./events/teleport.json" }, - "transform_item": { "$ref": "./events/transform_item.json" } + "target": { + "title": "Target", + "description": "The target of event executed on the block.", + "type": "string", + "default": "self" + } } } }