[v1.1.22] Merge pull request #16 from bridge-core/dev

bridge-core · Nov 20, 2020 · 5faa39b · 5faa39b
2 parents 2f764eb + 555d9c1
commit 5faa39b
Show file tree

Hide file tree

Showing 10 changed files with 324 additions and 209 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.21",
+	"version": "1.1.22",
 	"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
@@ -1,90 +1,104 @@
 {
-    "@meta": {
-        "expand_path_exceptions": [ "minecraft:nether_surface", "minecraft:the_end_surface" ]
-    },
+	"@meta": {
+		"expand_path_exceptions": [
+			"minecraft:nether_surface",
+			"minecraft:the_end_surface"
+		]
+	},
 
-    "minecraft:ignore_automatic_features": "$general.boolean",
-    "minecraft:climate": {
-        "downfall": "$general.decimal",
-        "snow_accumulation": {
-            "$dynamic.list.index_pair": "$general.decimal"
-        },
-        "temperature": "$general.decimal",
-        "red_spores": "$general.decimal",
-        "blue_spores": "$general.decimal",
-        "ash": "$general.decimal",
-        "white_ash": "$general.decimal"
-    },
-    "minecraft:nether_generation_rules": {
-        "target_temperature": "$general.decimal",
-        "target_humidity": "$general.decimal",
-        "target_altitude": "$general.decimal",
-        "target_weirdness": "$general.decimal",
-        "weight": "$general.decimal"
-    },
+	"minecraft:ignore_automatic_features": "$general.boolean",
+	"minecraft:climate": {
+		"downfall": "$general.decimal",
+		"snow_accumulation": {
+			"$dynamic.list.index_pair": "$general.decimal"
+		},
+		"temperature": "$general.decimal",
+		"red_spores": "$general.decimal",
+		"blue_spores": "$general.decimal",
+		"ash": "$general.decimal",
+		"white_ash": "$general.decimal"
+	},
+	"minecraft:nether_generation_rules": {
+		"target_temperature": "$general.decimal",
+		"target_humidity": "$general.decimal",
+		"target_altitude": "$general.decimal",
+		"target_weirdness": "$general.decimal",
+		"weight": "$general.decimal"
+	},
 
-    "minecraft:overworld_height": {
-        "noise_type": "$biome.general.noise_type",
-        "noise_params": {
-            "$dynamic.list.index_pair": "$general.decimal"
-        }
-    },
-    "minecraft:surface_parameters": {
-        "sea_floor_depth": "$general.number",
-        "sea_floor_material": "$general.block_identifier",
-        "sea_material": "$general.block_identifier",
-        "floor_depth": "$general.number",
-        "floor_material": "$general.block_identifier",
-        "foundation_material": "$general.block_identifier",
-        "mid_material": "$general.block_identifier",
-        "top_material": "$general.block_identifier"
-    },
-    "minecraft:swamp_surface": "$biome.components.minecraft:surface_parameters",
-    "minecraft:frozen_ocean_surface": "$biome.components.minecraft:surface_parameters",
-    "minecraft:mesa_surface": {
-        "$load": "$biome.components.minecraft:surface_parameters",
+	"minecraft:overworld_height": {
+		"noise_type": "$biome.general.noise_type",
+		"noise_params": {
+			"$dynamic.list.index_pair": "$general.decimal"
+		}
+	},
+	"minecraft:surface_parameters": {
+		"sea_floor_depth": "$general.number",
+		"sea_floor_material": "$general.block_identifier",
+		"sea_material": "$general.block_identifier",
+		"floor_depth": "$general.number",
+		"floor_material": "$general.block_identifier",
+		"foundation_material": "$general.block_identifier",
+		"mid_material": "$general.block_identifier",
+		"top_material": "$general.block_identifier"
+	},
+	"minecraft:swamp_surface": "$biome.components.minecraft:surface_parameters",
+	"minecraft:frozen_ocean_surface": "$biome.components.minecraft:surface_parameters",
+	"minecraft:capped_surface": {
+		"floor_materials": {
+			"$dynamic.list.next_index": "$general.block_identifier"
+		},
+		"ceiling_materials": {
+			"$dynamic.list.next_index": "$general.block_identifier"
+		},
+		"sea_material": "$general.block_identifier",
+		"foundation_material": "$general.block_identifier",
+		"beach_material": "$general.block_identifier"
+	},
+	"minecraft:mesa_surface": {
+		"$load": "$biome.components.minecraft:surface_parameters",
 
-        "clay_material": "$general.block_identifier",
-        "hard_clay_material": "$general.block_identifier",
-        "bryce_pillars": "$general.boolean",
-        "has_forest": "$general.boolean"
-    },
-    "minecraft:the_end_surface": {},
-    "minecraft:overworld_generation_rules": {
-        "hills_transformation": {
-            "$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
-        },
-        "mutate_transformation": {
-            "$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
-        },
-        "shore_transformation": {
-            "$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
-        },
-        "river_transformation": {
-            "$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
-        },
-        "generate_for_climates": {
-            "$dynamic.list.next_index": {
-                "0": "$biome.general.temperature",
-                "1": "$general.number"
-            }
-        }
-    },
-    "minecraft:surface_material_adjustments": {
-        "adjustments": {
-            "$dynamic.list.next_index": {
-                "materials": {
-                    "foundation_material": "$general.block_identifier",
-                    "sea_floor_material": "$general.block_identifier",
-                    "floor_material": "$general.block_identifier",
-                    "mid_material": "$general.block_identifier",
-                    "top_material": "$general.block_identifier"
-                },
-                "noise_range": {
-                    "$dynamic.list.index_pair": "$general.decimal"
-                },
-                "noise_frequency_scale": "$general.decimal"
-            }
-        }
-    }
-}
+		"clay_material": "$general.block_identifier",
+		"hard_clay_material": "$general.block_identifier",
+		"bryce_pillars": "$general.boolean",
+		"has_forest": "$general.boolean"
+	},
+	"minecraft:the_end_surface": {},
+	"minecraft:overworld_generation_rules": {
+		"hills_transformation": {
+			"$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
+		},
+		"mutate_transformation": {
+			"$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
+		},
+		"shore_transformation": {
+			"$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
+		},
+		"river_transformation": {
+			"$dynamic.list.next_index": "$dynamic.biome.name_references and $biome.general.vanilla_biomes"
+		},
+		"generate_for_climates": {
+			"$dynamic.list.next_index": {
+				"0": "$biome.general.temperature",
+				"1": "$general.number"
+			}
+		}
+	},
+	"minecraft:surface_material_adjustments": {
+		"adjustments": {
+			"$dynamic.list.next_index": {
+				"materials": {
+					"foundation_material": "$general.block_identifier",
+					"sea_floor_material": "$general.block_identifier",
+					"floor_material": "$general.block_identifier",
+					"mid_material": "$general.block_identifier",
+					"top_material": "$general.block_identifier"
+				},
+				"noise_range": {
+					"$dynamic.list.index_pair": "$general.decimal"
+				},
+				"noise_frequency_scale": "$general.decimal"
+			}
+		}
+	}
+}
diff --git a/packages/auto_completions/entity/behavior.json b/packages/auto_completions/entity/behavior.json
@@ -481,7 +481,7 @@
 	},
 	"$versioned_template.minecraft:behavior.jump_to_block": [
 		{
-			"$if": "$format_version >= 1.16.100",
+			"$if": "$format_version >= 1.16.200",
 			"$data": {
 				"priority": "$general.number",
 				"search_width": "$general.number",
@@ -892,7 +892,7 @@
 	},
 	"$versioned_template.minecraft:behavior.ram_attack": [
 		{
-			"$if": "$format_version >= 1.16.100",
+			"$if": "$format_version >= 1.16.200",
 			"$data": {
 				"priority": "$general.number",
 				"run_speed": "$general.decimal",

diff --git a/packages/auto_completions/entity/components.json b/packages/auto_completions/entity/components.json
@@ -414,7 +414,7 @@
 	},
 	"$versioned_template.minecraft:damage_sensor": [
 		{
-			"$if": "$format_version >= 1.16.100",
+			"$if": "$format_version >= 1.16.200",
 			"$data": {
 				"triggers": {
 					"$dynamic.list.next_index": {