[v1.1.33] Merge pull request #39 from bridge-core/dev

bridge-core · May 22, 2021 · 8f75169 · 8f75169
2 parents a2475ee + 67b0d82
commit 8f75169
Show file tree

Hide file tree

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

diff --git a/packages/auto_completions/block/event.json b/packages/auto_completions/block/event.json
@@ -54,7 +54,7 @@
 	},
 	"damage": {
 		"amount": "$general.number",
-		"target": ["other", "self"],
+		"target": ["item", "other", "self"],
 		"type": "$general.damage_type"
 	},
 	"decrement_stack": {

diff --git a/packages/auto_completions/entity/main.json b/packages/auto_completions/entity/main.json
@@ -28,12 +28,61 @@
 						"@import.value.refs": "$dynamic.entity.animation_references"
 					}
 				}
-			}
+			},
+			"$versioned_template.aliases": [
+				{
+					"$if": "$format_version >= 1.17.0",
+					"$data": {
+						"$placeholder": {
+							"$placeholder": {
+								"@meta": {
+									"is_value": true
+								}
+							}
+						}
+					}
+				}
+			],
+			"$versioned_template.properties": [
+				{
+					"$if": "$format_version >= 1.17.0",
+					"$data": {
+						"$placeholder": {
+							"values": {
+								"$dynamic.list.next_index": {
+									"@meta": {
+										"is_value": true
+									}
+								}
+							},
+							"min": "$general.number",
+							"max": "$general.number",
+							"default": {
+								"@meta": {
+									"is_value": true
+								}
+							},
+							"client_sync": "$general.boolean"
+						}
+					}
+				}
+			]
 		},
 		"component_groups": {
 			"$placeholder": "$entity.general.components"
 		},
 		"components": "$entity.general.components",
+		"$versioned_template.permutations": [
+			{
+				"$if": "$format_version >= 1.17.0",
+				"$data": {
+					"$dynamic.list.next_index": {
+						"condition": "$molang.embedded",
+						"components": "$entity.general.components"
+					}
+				}
+			}
+		],
 		"events": {
 			"$asObject": "$entity.general.built_in_event",
 			"$placeholder": {
@@ -196,6 +245,18 @@
 							}
 						}
 					}
+				],
+				"$versioned_template.set_actor_property": [
+					{
+						"$if": "$format_version >= 1.17.0",
+						"$data": {
+							"$placeholder": {
+								"@meta": {
+									"is_value": true
+								}
+							}
+						}
+					}
 				]
 			}
 		}

diff --git a/packages/auto_completions/feature/main.json b/packages/auto_completions/feature/main.json
@@ -446,7 +446,7 @@
 	],
 	"$versioned_template.minecraft:vegetation_patch_feature": [
 		{
-			"$if": "$format_version >= 1.16.220",
+			"$if": "$format_version >= 1.17.0",
 			"$data": {
 				"replaceable_blocks": {
 					"$dynamic.list.next_index": "$feature.general.block_reference"
@@ -479,7 +479,7 @@
 	],
 	"$versioned_template.minecraft:geode_feature": [
 		{
-			"$if": "$format_version >= 1.16.220",
+			"$if": "$format_version >= 1.17.0",
 			"$data": {
 				"description": {
 					"identifier": "$general.file_identifier"
@@ -512,7 +512,7 @@
 	],
 	"$versioned_template.minecraft:multiface_feature": [
 		{
-			"$if": "$format_version >= 1.16.220",
+			"$if": "$format_version >= 1.17.0",
 			"$data": {
 				"description": {
 					"identifier": "$general.file_identifier"

diff --git a/packages/auto_completions/item/components.json b/packages/auto_completions/item/components.json
@@ -320,7 +320,7 @@
 				"repair_items": {
 					"$dynamic.list.next_index": {
 						"items": {
-							"$dynamic.list.next_index": "$general.item_identifier"
+							"$dynamic.list.next_index": "$general.block_identifier and $general.item_identifier"
 						},
 						"repair_amount": "$general.number and $molang.embedded"
 					}

diff --git a/packages/auto_completions/item/main.json b/packages/auto_completions/item/main.json
@@ -1,5 +1,17 @@
 {
-	"format_version": "$general.format_version",
+	"format_version": {
+		"@import.value": "$general.format_version",
+		"@meta": {
+			"is_value": true,
+			"validate": {
+				"confirm": "Bridge.Version.compare(Bridge.Node.data, '1.16.100', '>')",
+				"then": {
+					"show": true,
+					"message": "Format version 1.16.200+ for items may produce unexpected results; use 1.16.100 instead"
+				}
+			}
+		}
+	},
 	"minecraft:item": {
 		"description": {
 			"identifier": "$general.file_identifier and $general.item_identifier",

diff --git a/packages/auto_completions/loot_table/main.json b/packages/auto_completions/loot_table/main.json
@@ -41,7 +41,7 @@
 					"$dynamic_template": {
 						"$key": "$dynamic.children.type",
 						"item": {
-							"name": "$general.item_identifier",
+							"name": "$general.block_identifier and $general.item_identifier",
 							"weight": "$general.number",
 							"functions": "$loot_table.functions",
 							"pools": "$loot_table.main.pools"
@@ -58,4 +58,4 @@
 			}
 		}
 	}
-}
+}