Fixing blocks

This commit is contained in:
DaanV2
2021-01-06 14:07:24 +01:00
parent 7f0d198045
commit 9fa48a9376
32 changed files with 63 additions and 34 deletions

View File

@@ -56,7 +56,22 @@
} }
} }
} }
} },
"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": { "event_functions": {
@@ -64,21 +79,21 @@
"description": "UNDOCUMENTATED", "description": "UNDOCUMENTATED",
"type": "object", "type": "object",
"properties": { "properties": {
"add_mob_effect": { "$ref": "./events/add_mob_effect/json" }, "add_mob_effect": { "$ref": "./events/add_mob_effect.json" },
"damage": { "$ref": "./events/damage/json" }, "damage": { "$ref": "./events/damage.json" },
"decrement_stack": { "$ref": "./events/decrement_stack/json" }, "decrement_stack": { "$ref": "./events/decrement_stack.json" },
"die": { "$ref": "./events/die/json" }, "die": { "$ref": "./events/die.json" },
"play_effect": { "$ref": "./events/play_effect/json" }, "play_effect": { "$ref": "./events/play_effect.json" },
"play_sound": { "$ref": "./events/play_sound/json" }, "play_sound": { "$ref": "./events/play_sound.json" },
"remove_mob_effect": { "$ref": "./events/remove_mob_effect/json" }, "remove_mob_effect": { "$ref": "./events/remove_mob_effect.json" },
"run_command": { "$ref": "./events/run_command/json" }, "run_command": { "$ref": "./events/run_command.json" },
"set_block": { "$ref": "./events/set_block/json" }, "set_block": { "$ref": "./events/set_block.json" },
"set_block_at_pos": { "$ref": "./events/set_block_at_pos/json" }, "set_block_at_pos": { "$ref": "./events/set_block_at_pos.json" },
"set_block_property": { "$ref": "./events/set_block_property/json" }, "set_block_property": { "$ref": "./events/set_block_property.json" },
"spawn_loot": { "$ref": "./events/spawn_loot/json" }, "spawn_loot": { "$ref": "./events/spawn_loot.json" },
"swing": { "$ref": "./events/swing/json" }, "swing": { "$ref": "./events/swing.json" },
"teleport": { "$ref": "./events/teleport/json" }, "teleport": { "$ref": "./events/teleport.json" },
"transform_item": { "$ref": "./events/transform_item/json" } "transform_item": { "$ref": "./events/transform_item.json" }
} }
} }
} }

View File

@@ -16,7 +16,7 @@
"minecraft:random_ticking": { "$ref": "#/definitions/event_base" } "minecraft:random_ticking": { "$ref": "#/definitions/event_base" }
}, },
"additionalProperties": { "additionalProperties": {
"$ref": "#/definitions/event_base" "oneOf": [{ "$ref": "#/definitions/event_base" }, { "$ref": "#/definitions/event_functions" }]
}, },
"definitions": { "definitions": {
"event_base": { "event_base": {
@@ -24,7 +24,6 @@
"description": "UNDOCUMENTATED", "description": "UNDOCUMENTATED",
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"$ref": "#/definitions/event_functions",
"properties": { "properties": {
"sequence": { "sequence": {
"title": "Sequence", "title": "Sequence",
@@ -56,7 +55,22 @@
} }
} }
} }
} },
"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": { "event_functions": {
@@ -64,21 +78,21 @@
"description": "UNDOCUMENTATED", "description": "UNDOCUMENTATED",
"type": "object", "type": "object",
"properties": { "properties": {
"add_mob_effect": { "$ref": "./events/add_mob_effect/json" }, "add_mob_effect": { "$ref": "./events/add_mob_effect.json" },
"damage": { "$ref": "./events/damage/json" }, "damage": { "$ref": "./events/damage.json" },
"decrement_stack": { "$ref": "./events/decrement_stack/json" }, "decrement_stack": { "$ref": "./events/decrement_stack.json" },
"die": { "$ref": "./events/die/json" }, "die": { "$ref": "./events/die.json" },
"play_effect": { "$ref": "./events/play_effect/json" }, "play_effect": { "$ref": "./events/play_effect.json" },
"play_sound": { "$ref": "./events/play_sound/json" }, "play_sound": { "$ref": "./events/play_sound.json" },
"remove_mob_effect": { "$ref": "./events/remove_mob_effect/json" }, "remove_mob_effect": { "$ref": "./events/remove_mob_effect.json" },
"run_command": { "$ref": "./events/run_command/json" }, "run_command": { "$ref": "./events/run_command.json" },
"set_block": { "$ref": "./events/set_block/json" }, "set_block": { "$ref": "./events/set_block.json" },
"set_block_at_pos": { "$ref": "./events/set_block_at_pos/json" }, "set_block_at_pos": { "$ref": "./events/set_block_at_pos.json" },
"set_block_property": { "$ref": "./events/set_block_property/json" }, "set_block_property": { "$ref": "./events/set_block_property.json" },
"spawn_loot": { "$ref": "./events/spawn_loot/json" }, "spawn_loot": { "$ref": "./events/spawn_loot.json" },
"swing": { "$ref": "./events/swing/json" }, "swing": { "$ref": "./events/swing.json" },
"teleport": { "$ref": "./events/teleport/json" }, "teleport": { "$ref": "./events/teleport.json" },
"transform_item": { "$ref": "./events/transform_item/json" } "transform_item": { "$ref": "./events/transform_item.json" }
} }
} }
} }