Skip to content

Commit

Permalink
[v1.1.20] Merge pull request #14 from bridge-core/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@Joelant05
Joelant05 authored Nov 3, 2020
2 parents 5eb80d3 + a064bb2 commit c1bda56
Show file tree
Hide file tree
Showing 10 changed files with 168 additions and 167 deletions.
2 changes: 1 addition & 1 deletion dist/auto-completions.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/auto-completions.json
View file

Large diffs are not rendered by default.

110 changes: 57 additions & 53 deletions packages/auto_completions/animation/rp_main.json
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,58 @@
{
"format_version": "$general.format_version",
"animations": {
"@meta": { "validate": "validateIDs.js" },
"$placeholder": {
"anim_time_update": "$molang.embedded",
"animation_length": "$general.number",
"blend_weight": "$general.decimal",
"override_previous_animation": "$general.boolean",
"loop": "$animation.general.loop_type",
"bones": {
"$placeholder": {
"rotation": {
"$dynamic.list.index_triple": {
"@meta": { "is_molang": true, "is_value": true },
"@import.value.query": "$general.degree and $molang.general.boolean and ('query.' + $molang.general.query)"
}
},
"scale": {
"$dynamic.list.index_triple": {
"@meta": { "is_molang": true, "is_value": true },
"@import.value.query": "$general.degree and $molang.general.boolean and ('query.' + $molang.general.query)"
}
},
"position": {
"$dynamic.list.index_triple": {
"@meta": { "is_molang": true, "is_value": true },
"@import.value.query": "$general.number and $molang.general.boolean and ('query.' + $molang.general.query)"
}
}
}
},
"particle_effects": {
"$general.decimal": {},
"@meta": { "validate": null },
"$placeholder": {
"$dynamic.list.next_index": {
"effect": "$dynamic.cache.client_entity.particle_references",
"locator": {
"@meta": {
"is_value": true
}
}
}
}
},
"sound_effects": {
"$dynamic.list.next_index": {
"$placeholder": "$dynamic.cache.client_entity.sound_references"
}
}
}
}
}
"format_version": "$general.format_version",
"animations": {
"@meta": { "validate": "validateIDs.js" },
"$placeholder": {
"anim_time_update": "$molang.embedded",
"animation_length": "$general.number",
"blend_weight": "$general.decimal",
"override_previous_animation": "$general.boolean",
"loop": "$animation.general.loop_type",
"bones": {
"$placeholder": {
"rotation": {
"$dynamic.list.index_triple": {
"@meta": { "is_molang": true, "is_value": true },
"@import.value.query": "$general.degree and $molang.general.boolean and ('query.' + $molang.general.query)"
}
},
"scale": {
"$dynamic.list.index_triple": {
"@meta": { "is_molang": true, "is_value": true },
"@import.value.query": "$general.degree and $molang.general.boolean and ('query.' + $molang.general.query)"
}
},
"position": {
"$dynamic.list.index_triple": {
"@meta": { "is_molang": true, "is_value": true },
"@import.value.query": "$general.number and $molang.general.boolean and ('query.' + $molang.general.query)"
}
}
}
},
"particle_effects": {
"$general.decimal": {},
"@meta": { "validate": null },
"$placeholder": {
"$dynamic.list.next_index": {
"effect": "$dynamic.cache.client_entity.particle_references",
"locator": {
"@meta": {
"is_value": true
}
}
}
}
},
"sound_effects": {
"$general.decimal": {},
"@meta": { "validate": null },
"$placeholder": {
"$dynamic.list.next_index": {
"effect": "$dynamic.cache.client_entity.sound_references"
}
}
}
}
}
}
96 changes: 48 additions & 48 deletions packages/auto_completions/animation_controller/rp_main.json
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{
"format_version": "$general.format_version",
"animation_controllers": {
"@meta": { "validate": "validateIDs.js" },
"$placeholder": {
"initial_state": "$dynamic.animation_controller.current_states",
"states": {
"default": {
"blend_transition": "$general.decimal",
"blend_via_shortest_path": "$general.boolean",
"parameters": {
"$dynamic.list.next_index": "$molang.embedded"
},
"variables": {
"$placeholder": {
"input": "$molang.embedded",
"remap_curve": {
"$general.decimal": "$general.decimal"
}
}
},
"format_version": "$general.format_version",
"animation_controllers": {
"@meta": { "validate": "validateIDs.js" },
"$placeholder": {
"initial_state": "$dynamic.animation_controller.current_states",
"states": {
"default": {
"blend_transition": "$general.decimal",
"blend_via_shortest_path": "$general.boolean",
"parameters": {
"$dynamic.list.next_index": "$molang.embedded"
},
"variables": {
"$placeholder": {
"input": "$molang.embedded",
"remap_curve": {
"$general.decimal": "$general.decimal"
}
}
},

"animations": {
"$dynamic.list.next_index": {
"$dynamic.cache.client_entity.animation_references": {},
"$placeholder": "$molang.embedded",
"@import.value.anim_refs": "$dynamic.cache.client_entity.animation_references"
}
},
"transitions": {
"$dynamic.list.next_index": {
"$dynamic.animation_controller.current_states": "$molang.embedded"
}
},
"particle_effects": {
"$dynamic.list.next_index": {
"effect": "$dynamic.cache.client_entity.particle_references",
"locator": { "@meta": { "is_value": true } }
}
},
"sound_effects" : {
"$dynamic.list.next_index": {
"$placeholder": "$dynamic.cache.client_entity.sound_references"
}
}
},
"$placeholder": "$animation_controller.rp_main.animation_controllers.$placeholder.states.default"
}
}
}
"animations": {
"$dynamic.list.next_index": {
"$dynamic.cache.client_entity.animation_references": {},
"$placeholder": "$molang.embedded",
"@import.value.anim_refs": "$dynamic.cache.client_entity.animation_references"
}
},
"transitions": {
"$dynamic.list.next_index": {
"$dynamic.animation_controller.current_states": "$molang.embedded"
}
},
"particle_effects": {
"$dynamic.list.next_index": {
"effect": "$dynamic.cache.client_entity.particle_references",
"locator": { "@meta": { "is_value": true } }
}
},
"sound_effects": {
"$dynamic.list.next_index": {
"effect": "$dynamic.cache.client_entity.sound_references"
}
}
},
"$placeholder": "$animation_controller.rp_main.animation_controllers.$placeholder.states.default"
}
}
}
}
21 changes: 6 additions & 15 deletions packages/auto_completions/client_entity/main.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
},
"geometry": {
"$placeholder": {
"@meta": { "is_value": true },
"@import.value": "$dynamic.cache.model.identifiers"
}
"@meta": { "is_value": true },
"@import.value": "$dynamic.cache.model.identifiers"
}
},
"animations": {
"$placeholder": {
Expand Down Expand Up @@ -104,25 +104,18 @@
"$if": "$format_version >= 1.16.100",
"$data": {
"$placeholder": ["public"]

}
}
]
},
"sound_effects": {
"$placeholder": {
"@meta": {
"is_value": true
}
}
"$placeholder": "$function.general.sound_definitions"
},
"render_controllers": {
"$dynamic.list.next_index": {
"@meta": {
"is_value": true,
"definitions": [
"render_controller"
]
"definitions": ["render_controller"]
},
"@import.value.render_controller": "$dynamic.cache.render_controller.ids"
}
Expand All @@ -131,9 +124,7 @@
"$placeholder": {
"@meta": {
"is_value": true,
"definitions": [
"particle"
]
"definitions": ["particle"]
},
"@import.value.particle": "$dynamic.cache.particle.ids",
"@import.value": "$vanilla.particle_identifier"
Expand Down
7 changes: 2 additions & 5 deletions packages/auto_completions/client_item/main.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@

"components": {
"minecraft:icon": {
"texture": {
"@meta": { "is_value": true },
"@import.value": "$dynamic.rp.item_textures"
},
"frame_index": "$general.number"
"@meta": { "is_value": true },
"@import.value": "$dynamic.rp.item_textures"
},
"minecraft:use_animation": [
"bow",
Expand Down
10 changes: 2 additions & 8 deletions packages/auto_completions/entity/components.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,18 +418,12 @@
"$data": {
"triggers": {
"$dynamic.list.next_index": {
"on_damage": "$entity.general.event_definition",
"cause": "$general.damage_type",
"deals_damage": "$general.boolean",
"damage_multiplier": "$general.decimal",
"damage_modifier": "$general.decimal",
"on_damage_sound_event": "$general.sound"
"damage_modifier": "$general.decimal"
}
}
}
},
{
"$if": "$format_version < 1.16.0",
"$data": {
"triggers": {
"$dynamic.list.next_index": {
Expand Down Expand Up @@ -1446,7 +1440,7 @@
},
"minecraft:timer": {
"looping": "$general.boolean",
"random_interval": "$general.boolean",
"randomInterval": "$general.boolean",
"time": {
"@import.value.decimal": "$general.decimal",
"@meta": {
Expand Down
21 changes: 18 additions & 3 deletions packages/auto_completions/feature/main.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,24 @@
"grounded": {},
"unburied": {},
"block_intersection": {
"block_allowlist": {
"$dynamic.list.next_index": "$feature.general.block_reference"
}
"$versioned_template": [
{
"$if": "$format_version < 1.16.100",
"$data": {
"block_whitelist": {
"$dynamic.list.next_index": "$feature.general.block_reference"
}
}
},
{
"$if": "$format_version >= 1.16.100",
"$data": {
"block_allowlist": {
"$dynamic.list.next_index": "$feature.general.block_reference"
}
}
}
]
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auto_completions/item/event.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"teleport": {
"target": ["holder"],
"avoid_water": "$general.boolean",
"destintion": {
"destination": {
"$dynamic.list.index_triple": "$general.number"
},
"land_on_block": "$general.boolean",
Expand Down
Loading

0 comments on commit c1bda56

Please sign in to comment.