[v1.1.29] Merge pull request #24 from bridge-core/dev

bridge-core · Apr 7, 2021 · aae20cd · aae20cd
2 parents ee33f56 + ddf91c2
commit aae20cd
Show file tree

Hide file tree

Showing 11 changed files with 234 additions and 17 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.28",
+	"version": "1.1.29",
 	"description": "Provide data for the bridge. editor",
 	"main": "dist/auto-completions.js",
 	"scripts": {

diff --git a/packages/auto_completions/biome/components.json b/packages/auto_completions/biome/components.json
@@ -181,5 +181,20 @@
 				}
 			}
 		}
-	}
+	},
+	"$versioned_template.minecraft:mountain_parameters": [
+		{
+			"$if": "$format_version >= 1.16.210",
+			"$data": {
+				"top_slide": {
+					"enabled": "$general.boolean"
+				},
+				"steep_material_adjustment": {
+					"material": "$general.block_identifier",
+					"north_slopes": "$general.boolean",
+					"east_slopes": "$general.boolean"
+				}
+			}
+		}
+	]
 }
diff --git a/packages/auto_completions/block/event.json b/packages/auto_completions/block/event.json
@@ -56,7 +56,9 @@
 		"target": ["other", "self"],
 		"type": "$general.damage_type"
 	},
-	"decrement_stack": {},
+	"decrement_stack": {
+		"ignore_game_mode": "$general.boolean"
+	},
 	"die": {
 		"target": ["self", "other"]
 	},

diff --git a/packages/auto_completions/entity/behavior.json b/packages/auto_completions/entity/behavior.json
@@ -803,6 +803,24 @@
 		"priority": "$general.number",
 		"speed_multiplier": "$general.decimal"
 	},
+	"$versioned_template.minecraft:play_dead": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"priority": "$general.number",
+				"duration": "$general.number",
+				"force_below_health": "$general.number",
+				"random_start_chance": "$general.decimal",
+				"random_damage_range": {
+					"$dynamic.list.index_pair": "$general.number"
+				},
+				"damage_sources": {
+					"$dynamic.list.next_index": "$general.damage_type"
+				},
+				"apply_regeneration": "$general.boolean"
+			}
+		}
+	],
 	"minecraft:behavior.player_ride_tamed": {
 		"priority": "$general.number"
 	},

diff --git a/packages/auto_completions/entity/components.json b/packages/auto_completions/entity/components.json
@@ -292,6 +292,12 @@
 				"require_tame": "$general.boolean",
 				"require_full_health": "$general.boolean"
 			}
+		},
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"transform_to_item": "$general.item_identifier"
+			}
 		}
 	],
 	"$versioned_template.minecraft:bribeable": [
@@ -397,6 +403,14 @@
 	"minecraft:color2": {
 		"value": "$general.number"
 	},
+	"$versioned_template.minecraft:combat_regeneration": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"regeneration_duration": "$general.number"
+			}
+		}
+	],
 	"minecraft:custom_hit_test": {
 		"hitboxes": {
 			"$dynamic.list.next_index": {

diff --git a/packages/auto_completions/entity/main.json b/packages/auto_completions/entity/main.json
@@ -68,7 +68,9 @@
 				"$versioned_template.decrement_stack": [
 					{
 						"$if": "$format_version >= 1.16.100",
-						"$data": {}
+						"$data": {
+							"ignore_game_mode": "$general.boolean"
+						}
 					}
 				],
 				"$versioned_template.die": [

diff --git a/packages/auto_completions/feature/main.json b/packages/auto_completions/feature/main.json
@@ -23,16 +23,38 @@
 			}
 		}
 	},
-	"minecraft:ore_feature": {
-		"description": {
-			"identifier": "$general.file_identifier"
+	"$versioned_template.minecraft:ore_feature": [
+		{
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"count": "$general.number",
+				"places_block": "$feature.general.block_reference"
+			}
 		},
-		"count": "$general.number",
-		"places_block": "$feature.general.block_reference",
-		"may_replace": {
-			"$dynamic.list.next_index": "$feature.general.block_reference"
+		{
+			"$if": "$format_version < 1.16.220",
+			"$data": {
+				"may_replace": {
+					"$dynamic.list.next_index": "$feature.general.block_reference"
+				}
+			}
+		},
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"replace_rules": {
+					"$dynamic.list.next_index": {
+						"places_block": "$feature.general.block_reference",
+						"may_replace": {
+							"$dynamic.list.next_index": "$feature.general.block_reference"
+						}
+					}
+				}
+			}
 		}
-	},
+	],
 	"minecraft:scatter_feature": {
 		"description": {
 			"identifier": "$general.file_identifier"
@@ -311,5 +333,145 @@
 				}
 			}
 		}
-	}
+	},
+	"$versioned_template.minecraft:cave_carver_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"fill_with": "$feature.general.block_reference",
+				"width_modifier": "$general.number"
+			}
+		}
+	],
+	"$versioned_template.minecraft:hell_cave_carver_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"fill_with": "$feature.general.block_reference",
+				"width_modifier": "$general.number"
+			}
+		}
+	],
+	"$versioned_template.minecraft:underwater_cave_carver_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"fill_with": "$feature.general.block_reference",
+				"width_modifier": "$general.number",
+				"replace_air_with": "$feature.general.block_reference"
+			}
+		}
+	],
+	"$versioned_template.minecraft:growing_plant_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"height_distribution": {
+					"$dynamic.list.next_index": {
+						"0": {
+							"@meta": { "is_molang": true },
+							"@import.value.molang": "$molang.general.boolean and ('query.' + $molang.general.query)"
+						},
+						"1": "$general.number"
+					}
+				},
+				"allow_water": "$general.boolean",
+				"growth_direction": ["UP", "DOWN"],
+				"age": {
+					"@meta": { "is_molang": true },
+					"@import.value.molang": "$molang.general.boolean and ('query.' + $molang.general.query)"
+				},
+				"body_blocks": {
+					"$dynamic.list.next_index": {
+						"0": "$general.block_identifier",
+						"1": "$general.number"
+					}
+				},
+				"head_blocks": {
+					"$dynamic.list.next_index": {
+						"0": "$general.block_identifier",
+						"1": "$general.number"
+					}
+				}
+			}
+		}
+	],
+	"$versioned_template.minecraft:snap_to_surface_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"feature_to_snap": {
+					"@meta": { "is_value": true },
+					"@import.value.feature_ref": "$dynamic.biome.feature_references"
+				},
+				"vertical_search_range": "$general.number",
+				"surface": ["ceiling", "floor"]
+			}
+		}
+	],
+	"$versioned_template.minecraft:vegetation_patch_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"replaceable_blocks": {
+					"$dynamic.list.next_index": "$feature.general.block_reference"
+				},
+				"ground_block": "$feature.general.block_reference",
+				"vegetation_feature": {
+					"@meta": { "is_value": true },
+					"@import.value.feature_ref": "$dynamic.biome.feature_references"
+				},
+				"surface": ["floor", "ceiling"],
+				"depth": {
+					"@import.value": "$general.number",
+					"range_min": "$general.number",
+					"range_max": "$general.number"
+				},
+				"extra_deep_block_chance": "$general.number",
+				"vertical_range": "$general.number",
+				"vegetation_chance": "$general.number",
+				"horizontal_radius": {
+					"@import.value": "$general.number",
+					"range_min": "$general.number",
+					"range_max": "$general.number"
+				},
+				"extra_edge_column_chance": "$general.number",
+				"waterlogged": "$general.boolean"
+			}
+		}
+	],
+	"$versioned_template.minecraft:multiplace_feature": [
+		{
+			"$if": "$format_version >= 1.16.220",
+			"$data": {
+				"description": {
+					"identifier": "$general.file_identifier"
+				},
+				"places_block": "$feature.general.block_reference",
+				"search_range": "$general.number",
+				"can_place_on_floor": "$general.boolean",
+				"can_place_on_ceiling": "$general.boolean",
+				"can_place_on_wall": "$general.boolean",
+				"chance_of_spreading": "$general.number",
+				"can_place_on": {
+					"$dynamic.list.next_index": "$feature.general.block_reference"
+				}
+			}
+		}
+	]
 }
diff --git a/packages/auto_completions/general.json b/packages/auto_completions/general.json
@@ -119,7 +119,9 @@
 			"1.14.0",
 			"1.16.0",
 			"1.16.100",
-			"1.16.200"
+			"1.16.200",
+			"1.16.210",
+			"1.16.220"
 		]
 	},
 	"translatable_text": {

diff --git a/packages/auto_completions/item/event.json b/packages/auto_completions/item/event.json
@@ -14,7 +14,9 @@
 		"angle_offset": "$general.number and $molang.embedded"
 	},
 	"swing": {},
-	"decrement_stack": {},
+	"decrement_stack": {
+		"ignore_game_mode": "$general.boolean"
+	},
 	"damage": {
 		"type": "$general.damage_type",
 		"amount": "$general.number",