Skip to content

Commit

Permalink
[v1.1.17] Merge pull request #10 from bridge-core/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Joelant05 authored Oct 20, 2020
2 parents 17ee355 + 8961bae commit f3613f8
Show file tree
Hide file tree
Showing 8 changed files with 188 additions and 174 deletions.
2 changes: 1 addition & 1 deletion dist/auto-completions.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bridge-data",
"version": "1.1.16",
"version": "1.1.17",
"description": "Provide data for the bridge. editor",
"main": "dist/auto-completions.js",
"scripts": {
Expand Down
14 changes: 7 additions & 7 deletions packages/auto_completions/block/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,19 +168,19 @@
"$versioned_template.minecraft:on_step_on": [
{
"$if": "$format_version >= 1.16.100",
"$data": "$block.general.event_defintion"
"$data": "$block.general.event_definition"
}
],
"$versioned_template.minecraft:on_step_off": [
{
"$if": "$format_version >= 1.16.100",
"$data": "$block.general.event_defintion"
"$data": "$block.general.event_definition"
}
],
"$versioned_template.minecraft:on_player_destroyed": [
{
"$if": "$format_version >= 1.16.100",
"$data": "$block.general.event_defintion"
"$data": "$block.general.event_definition"
}
],
"$versioned_template.minecraft:on_fall_on": [
Expand All @@ -197,7 +197,7 @@
"$versioned_template.minecraft:on_placed": [
{
"$if": "$format_version >= 1.16.100",
"$data": "$block.general.event_defintion"
"$data": "$block.general.event_definition"
}
],
"$versioned_template.minecraft:on_player_placing": [
Expand All @@ -209,7 +209,7 @@
"$versioned_template.minecraft:on_interact": [
{
"$if": "$format_version >= 1.16.100",
"$data": "$block.general.event_defintion"
"$data": "$block.general.event_definition"
}
],
"$versioned_template.minecraft:ticking": [
Expand All @@ -221,15 +221,15 @@
"$dynamic.list.index_pair": "$general.number"
},

"on_tick": "$block.general.event_defintion"
"on_tick": "$block.general.event_definition"
}
}
],
"$versioned_template.minecraft:random_ticking": [
{
"$if": "$format_version >= 1.16.100",
"$data": {
"on_tick": "$block.general.event_defintion"
"on_tick": "$block.general.event_definition"
}
}
],
Expand Down
92 changes: 92 additions & 0 deletions packages/auto_completions/block/event.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"@meta": {
"expand_path_exceptions": ["decrement_stack"]
},
"randomize": {
"$dynamic.list.next_index": {
"weight": "$general.number",
"$load": "$block.event"
}
},
"sequence": {
"$dynamic.list.next_index": {
"$load": "$block.event"
}
},
"transform_item": {
"transform": "$general.item_identifier"
},
"run_command": {
"command": {
"$dynamic.list.next_index": "$function.embedded_no_slash"
},
"target": ["self", "other"]
},
"add_mob_effect": {
"effect": "$general.effect_name",
"target": ["other", "self"],
"duration": "$general.number",
"amplifier": "$general.number"
},
"remove_mob_effect": {
"effect": "$general.effect_name",
"target": ["self", "other"]
},
"set_block_property": {
"$dynamic.block.property": {
"$dynamic_template": {
"$key": "$dynamic.currentNodeKey",
"$load": "$dynamic.block.property_obj"
}
}
},
"teleport": {
"target": ["self", "other"],
"avoid_water": "$general.boolean",
"destintion": {
"$dynamic.list.index_triple": "$general.number"
},
"land_on_block": "$general.boolean",
"max_range": {
"$dynamic.list.index_triple": "$general.number"
}
},
"damage": {
"amount": "$general.number",
"target": ["other", "self"],
"type": "$general.damage_type"
},
"decrement_stack": {},
"die": {
"target": ["self", "other"]
},
"play_effect": {
"data": "$general.number",
"target": ["self", "other"],
"effect": {
"@import.value.particle": "$dynamic.cache.particle.ids",
"@import.value": "$vanilla.particle_identifier"
}
},
"play_sound": {
"target": ["self", "other"],
"sound": "$function.general.sound_definitions"
},
"set_block": {
"block_type": "$general.block_identifier"
},
"set_block_at_pos": {
"block_type": "$general.block_identifier",
"block_offset": {
"$dynamic.list.index_triple": "$general.number"
}
},
"spawn_loot": {
"table": "$dynamic.loot_table_files"
},
"trigger": {
"event": "asValue($dynamic.block.events)",
"target": ["self", "other"],
"condition": "$molang.embedded"
}
}
132 changes: 28 additions & 104 deletions packages/auto_completions/block/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,117 +5,41 @@
"description": {
"identifier": "$general.file_identifier and $general.block_identifier",
"is_experimental": "$general.boolean",
"properties": {
"$placeholder": {
"$dynamic.list.next_index": {
"@import.value.number": "$general.number",
"@import.value.boolean": "$general.boolean",
"@meta": { "validate": null }
"$versioned_template.properties": [
{
"$if": "$format_version >= 1.16.100",
"$data": {
"$placeholder": {
"$dynamic.list.next_index": {
"@import.value.number": "$general.number",
"@import.value.boolean": "$general.boolean",
"@meta": { "validate": null }
}
}
}
}
}
]
},

"permutations": {
"$dynamic.list.next_index": {
"condition": "$molang.embedded",
"components": "$block.components"
}
},
"components": "$block.components and $dynamic.plugins.block_custom_components",
"events": {
"$placeholder": {
"@meta": {
"expand_path_exceptions": ["decrement_stack"]
},
"randomize": {
"$dynamic.list.next_index": {
"weight": "$general.number",
"$load": "$block.main.minecraft:block.events.$placeholder"
}
},
"sequence": {
"$versioned_template.permutations": [
{
"$if": "$format_version >= 1.16.100",
"$data": {
"$dynamic.list.next_index": {
"$load": "$block.main.minecraft:block.events.$placeholder"
"condition": "$molang.embedded",
"components": "$block.components"
}
},
"transform_item": {
"transform": "$general.item_identifier"
},
"run_command": {
"command": {
"$dynamic.list.next_index": "$function.embedded_no_slash"
},
"target": ["self", "other"]
},
"add_mob_effect": {
"effect": "$general.effect_name",
"target": ["other", "self"],
"duration": "$general.number",
"amplifier": "$general.number"
},
"remove_mob_effect": {
"effect": "$general.effect_name",
"target": ["self", "other"]
},
"set_block_property": {
"$dynamic.block.property": {
"$dynamic_template": {
"$key": "$dynamic.currentNodeKey",
"$load": "$dynamic.block.property_obj"
}
}
},
"teleport": {
"target": ["self", "other"],
"avoid_water": "$general.boolean",
"destintion": {
"$dynamic.list.index_triple": "$general.number"
},
"land_on_block": "$general.boolean",
"max_range": {
"$dynamic.list.index_triple": "$general.number"
}
},
"damage": {
"amount": "$general.number",
"target": ["other", "self"],
"type": "$general.damage_type"
},
"decrement_stack": {},
"die": {
"target": ["self", "other"]
},
"play_effect": {
"data": "$general.number",
"target": ["self", "other"],
"effect": {
"@import.value.particle": "$dynamic.cache.particle.ids",
"@import.value": "$vanilla.particle_identifier"
}
},
"play_sound": {
"target": ["self", "other"],
"sound": "$function.general.sound_definitions"
},
"set_block": {
"block_type": "$general.block_identifier"
},
"set_block_at_pos": {
"block_type": "$general.block_identifier",
"block_offset": {
"$dynamic.list.index_triple": "$general.number"
}
},
"spawn_loot": {
"table": "$dynamic.loot_table_files"
},
"trigger": {
"event": "asValue($dynamic.block.events)",
"target": ["self", "other"],
"condition": "$molang.embedded"
}
}
}
],
"components": "$block.components and $dynamic.plugins.block_custom_components",
"$versioned_template.events": [
{
"$if": "$format_version >= 1.16.100",
"$data": {
"$placeholder": "$block.event"
}
}
]
}
}
2 changes: 1 addition & 1 deletion packages/auto_completions/entity/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,7 @@
"$dynamic.list.index_pair": "$general.decimal"
},
"random_time_choices": {
"$dynamic.list.index_pair": {
"$dynamic.list.next_index": {
"weight": "$general.number",
"value": "$general.number"
}
Expand Down
57 changes: 57 additions & 0 deletions packages/auto_completions/item/event.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"@meta": {
"expand_path_exceptions": ["swing", "decrement_stack"]
},
"randomize": {
"$dynamic.list.next_index": {
"weight": "$general.number",
"$load": "$item.event"
}
},
"shoot": {
"projectile": "$general.entity_identifier",
"launch_power": "$general.number",
"angle_offset": "$general.number and $molang.embedded"
},
"swing": {},
"decrement_stack": {},
"damage": {
"type": "$general.damage_type",
"amount": "$general.number"
},
"add_mob_effect": {
"effect": "$general.effect_name",
"target": ["holder"],
"duration": "$general.number",
"amplifier": "$general.number"
},
"remove_mob_effect": {
"effect": "$general.effect_name",
"target": ["holder"]
},
"transform_item": {
"transform": "$general.item_identifier"
},
"sequence": {
"$dynamic.list.next_index": {
"$load": "$item.event"
}
},
"teleport": {
"target": ["holder"],
"avoid_water": "$general.boolean",
"destintion": {
"$dynamic.list.index_triple": "$general.number"
},
"land_on_block": "$general.boolean",
"max_range": {
"$dynamic.list.index_triple": "$general.number"
}
},
"run_command": {
"command": {
"$dynamic.list.next_index": "$function.embedded_no_slash"
},
"target": ["other", "holder"]
}
}
Loading

0 comments on commit f3613f8

Please sign in to comment.