[v1.1.16] Merge pull request #9 from bridge-core/dev

bridge-core · Oct 17, 2020 · 67af1b4 · 67af1b4
2 parents a24af24 + abd1ddb
commit 67af1b4
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 16 deletions.
diff --git a/dist/auto-completions.js b/dist/auto-completions.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bridge-data",
-	"version": "1.1.15",
+	"version": "1.1.16",
 	"description": "Provide data for the bridge. editor",
 	"main": "dist/auto-completions.js",
 	"scripts": {

diff --git a/packages/auto_completions/block/components.json b/packages/auto_completions/block/components.json
@@ -1,4 +1,7 @@
 {
+	"@meta": {
+		"expand_path_exceptions": ["minecraft:unit_cube"]
+	},
 	"$versioned_template.minecraft:destroy_time": [
 		{
 			"$if": "$format_version < 1.16.0",

diff --git a/packages/auto_completions/block/main.json b/packages/auto_completions/block/main.json
@@ -25,6 +25,9 @@
 		"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",

diff --git a/packages/auto_completions/entity/components.json b/packages/auto_completions/entity/components.json
@@ -1072,11 +1072,16 @@
 			},
 			"definition_event": {
 				"affect_projectile": "$general.boolean",
+				"affect_shooter": "$general.boolean",
+				"affect_target": "$general.boolean",
+				"affect_splash_area": "$general.boolean",
+				"splash_area": "$general.number",
 				"event_trigger": "$entity.general.event_definition"
 			},
 			"grant_xp": {
 				"minXP": "$general.number",
-				"maxXP": "$general.number"
+				"maxXP": "$general.number",
+				"xp": "$general.number"
 			},
 			"spawn_aoe_cloud": {
 				"radius": "$general.number",
@@ -1091,11 +1096,7 @@
 				"reapplication_delay": "$general.number"
 			},
 			"impact_damage": {
-				"filter": {
-					"@meta": {
-						"is_value": true
-					}
-				},
+				"filter": "$molang.embedded",
 				"damage": {
 					"$dynamic.list.index_pair": "$general.number"
 				},
@@ -1105,11 +1106,15 @@
 				"max_critical_damage": "$general.number",
 				"min_critical_damage": "$general.number",
 				"power_multiplier": "$general.decimal",
-				"should_bounce": "$general.boolean"
+				"should_bounce": "$general.boolean",
+				"channeling": "$general.boolean",
+				"set_last_hurt_requires_damage": "$general.boolean",
+				"destroy_on_hit_requres_damage": "$general.boolean"
 			},
 			"spawn_chance": {
 				"first_spawn_percent_chance": "$general.number",
 				"first_spawn_chance": "$general.number",
+				"second_spawn_percent_chance": "$general.number",
 				"second_spawn_chance": "$general.number",
 				"first_spawn_count": "$general.number",
 				"second_spawn_count": "$general.number",
@@ -1123,6 +1128,7 @@
 			},
 			"mob_effect": {
 				"effect": "$general.effect_name",
+				"duration": "$general.number",
 				"duration_easy": "$general.number",
 				"duration_normal": "$general.number",
 				"duration_hard": "$general.number",

diff --git a/packages/auto_completions/function/general.json b/packages/auto_completions/function/general.json
@@ -42,6 +42,7 @@
 		"180_degrees",
 		"270_degrees"
 	],
+	"structure_animations": ["block_by_block", "layer_by_layer"],
 	"mirror": ["x", "z", "xz"],
 	"teleport_rules": ["teleport_rider", "teleport_ride"],
 	"how_to_fill": ["if_group_fits", "until_full"],

diff --git a/packages/auto_completions/function/main.json b/packages/auto_completions/function/main.json
@@ -408,10 +408,23 @@
 		},
 		"load": {
 			"$placeholder": {
-				"$function.general.structure_rotations": {
-					"$function.general.mirror": {
-						"$general.boolean": {
-							"$general.boolean": "$general.number"
+				"$function.general.location": {
+					"$function.general.location": {
+						"$function.general.location": {
+							"$function.general.structure_rotations": {
+								"$function.general.mirror": {
+									"$general.boolean": {
+										"$general.boolean": "$general.number"
+									},
+									"$function.general.structure_animations": {
+										"$general.number": {
+											"$general.boolean": {
+												"$general.boolean": "$general.number"
+											}
+										}
+									}
+								}
+							}
 						}
 					}
 				}

diff --git a/packages/auto_completions/item/components.json b/packages/auto_completions/item/components.json
@@ -206,7 +206,10 @@
 			"$if": "$format_version >= 1.16.100",
 			"$data": {
 				"block": "$general.block_identifier",
-				"use_block_description": "$general.boolean"
+				"use_block_description": "$general.boolean",
+				"use_on": {
+					"$dynamic.list.next_index": "$general.block_identifier"
+				}
 			}
 		}
 	],

diff --git a/packages/auto_completions/item/main.json b/packages/auto_completions/item/main.json
@@ -18,6 +18,12 @@
 				"$if": "$format_version >= 1.16.100",
 				"$data": {
 					"$placeholder": {
+						"@meta": {
+							"expand_path_exceptions": [
+								"swing",
+								"decrement_stack"
+							]
+						},
 						"randomize": {
 							"$dynamic.list.next_index": {
 								"weight": "$general.number",
@@ -30,6 +36,7 @@
 							"angle_offset": "$general.number and $molang.embedded"
 						},
 						"swing": {},
+						"decrement_stack": {},
 						"damage": {
 							"type": "$general.damage_type",
 							"amount": "$general.number"
@@ -63,11 +70,11 @@
 								"$dynamic.list.index_triple": "$general.number"
 							}
 						},
-						"execute_command": {
+						"run_command": {
 							"command": {
 								"$dynamic.list.next_index": "$function.embedded_no_slash"
 							},
-							"target": ["other"]
+							"target": ["other", "holder"]
 						}
 					}
 				}