Merge branch 'main' into upd

bridge-core · Sep 29, 2023 · 70654c3 · 70654c3
2 parents f4bbf5d + 7df51ed
commit 70654c3
Show file tree

Hide file tree

Showing 16 changed files with 238 additions and 174 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,9 @@ Provides data such as schemas, file definitions or themes for bridge. v2
 1. Create a .env file. Add `EDITOR_DIR=path/to/bridgev2/repo` to it. This path should point to the cloned [bridge-core/editor](https://github.com/bridge-core/editor) repo
 2. Run `deno task dev`
 
+**Note**
+To view the local data packages ensure that `Force Data Download` is enabled inside of Bridge's developer settings
+
 ## Build for production
 
 This repo hosts a GitHub action that automatically builds the packages folder and commits it to the `dev` branch of our [bridge-core/editor](https://github.com/bridge-core/editor) repo. You can manually trigger a build by running `deno task build`.
diff --git a/deno.lock b/deno.lock
diff --git a/packages/minecraftBedrock/preset/block/blank/block.json b/packages/minecraftBedrock/preset/block/blank/block.json
@@ -1,9 +1,9 @@
 {
-	"format_version": "1.16.100",
+	"format_version": "1.20.0",
 	"minecraft:block": {
 		"description": {
 			"identifier": "{{PROJECT_PREFIX}}:{{IDENTIFIER}}"
 		},
 		"components": {}
 	}
-}
+}
diff --git a/packages/minecraftBedrock/preset/block/blank/manifest.json b/packages/minecraftBedrock/preset/block/blank/manifest.json
@@ -5,8 +5,14 @@
 	"category": "fileType.block",
 	"showIfDisabled": false,
 	"requires": {
-		"targetVersion": [">=", "1.16.100"],
-		"packTypes": ["behaviorPack", "resourcePack"]
+		"targetVersion": [
+			">=",
+			"1.20.0"
+		],
+		"packTypes": [
+			"behaviorPack",
+			"resourcePack"
+		]
 	},
 	"additionalModels": {
 		"DEFAULT_TEXTURE": "texture.png",
@@ -16,23 +22,44 @@
 		[
 			"Image (Optional)",
 			"TEXTURE",
-			{ "type": "fileInput", "accept": "image/png", "optional": true }
+			{
+				"type": "fileInput",
+				"accept": "image/png",
+				"optional": true
+			}
 		],
 		[
 			"Identifier",
 			"IDENTIFIER",
-			{ "validate": ["required", "alphanumeric", "lowercase"] }
+			{
+				"validate": [
+					"required",
+					"alphanumeric",
+					"lowercase"
+				]
+			}
 		],
-		["Display Name", "IDENTIFIER_NAME", { "validate": ["required"] }]
+		[
+			"Display Name",
+			"IDENTIFIER_NAME",
+			{
+				"validate": [
+					"required"
+				]
+			}
+		]
 	],
-
 	"createFiles": [
 		"presetScript/blockImages.js",
 		[
 			"block.json",
 			"blocks/{{PRESET_PATH}}{{IDENTIFIER}}.json",
 			{
-				"inject": ["IDENTIFIER", "PROJECT_PREFIX", "PRESET_PATH"],
+				"inject": [
+					"IDENTIFIER",
+					"PROJECT_PREFIX",
+					"PRESET_PATH"
+				],
 				"openFile": true,
 				"packPath": "behaviorPack"
 			}
@@ -43,17 +70,24 @@
 			"clientBlock.json",
 			"blocks.json",
 			{
-				"inject": ["IDENTIFIER", "PROJECT_PREFIX"],
+				"inject": [
+					"IDENTIFIER",
+					"PROJECT_PREFIX"
+				],
 				"packPath": "resourcePack"
 			}
 		],
 		[
 			"en_US.lang",
 			"texts/en_US.lang",
 			{
-				"inject": ["IDENTIFIER", "IDENTIFIER_NAME", "PROJECT_PREFIX"],
+				"inject": [
+					"IDENTIFIER",
+					"IDENTIFIER_NAME",
+					"PROJECT_PREFIX"
+				],
 				"packPath": "resourcePack"
 			}
 		]
 	]
-}
+}
diff --git a/packages/minecraftBedrock/preset/block/customGeometry/manifest.json b/packages/minecraftBedrock/preset/block/customGeometry/manifest.json
@@ -4,22 +4,45 @@
 	"description": "Creates a new, basic block with custom geometry.",
 	"category": "fileType.block",
 	"requires": {
-		"targetVersion": [">=", "1.16.100"],
-		"packTypes": ["behaviorPack", "resourcePack"]
+		"targetVersion": [
+			">=",
+			"1.19.50"
+		],
+		"packTypes": [
+			"behaviorPack",
+			"resourcePack"
+		]
 	},
 	"additionalModels": {
 		"DEFAULT_TEXTURE": "texture.png",
-		"MODEL_SAVE_PATH": ["resourcePack", "models/blocks/"],
+		"MODEL_SAVE_PATH": [
+			"resourcePack",
+			"models/blocks/"
+		],
 		"DEFAULT_MODEL": "geometry.json",
 		"PRESET_PATH": ""
 	},
 	"fields": [
 		[
 			"Identifier",
 			"IDENTIFIER",
-			{ "validate": ["required", "alphanumeric", "lowercase"] }
+			{
+				"validate": [
+					"required",
+					"alphanumeric",
+					"lowercase"
+				]
+			}
+		],
+		[
+			"Display Name",
+			"IDENTIFIER_NAME",
+			{
+				"validate": [
+					"required"
+				]
+			}
 		],
-		["Display Name", "IDENTIFIER_NAME", { "validate": ["required"] }],
 		[
 			"Block Model",
 			"MODEL",
@@ -41,13 +64,16 @@
 			}
 		]
 	],
-
 	"createFiles": [
 		[
 			"block.json",
 			"blocks/{{PRESET_PATH}}{{IDENTIFIER}}.json",
 			{
-				"inject": ["IDENTIFIER", "PROJECT_PREFIX", "PRESET_PATH"],
+				"inject": [
+					"IDENTIFIER",
+					"PROJECT_PREFIX",
+					"PRESET_PATH"
+				],
 				"openFile": true,
 				"packPath": "behaviorPack"
 			}
@@ -60,17 +86,24 @@
 			"clientBlock.json",
 			"blocks.json",
 			{
-				"inject": ["IDENTIFIER", "PROJECT_PREFIX"],
+				"inject": [
+					"IDENTIFIER",
+					"PROJECT_PREFIX"
+				],
 				"packPath": "resourcePack"
 			}
 		],
 		[
 			"en_US.lang",
 			"texts/en_US.lang",
 			{
-				"inject": ["IDENTIFIER", "IDENTIFIER_NAME", "PROJECT_PREFIX"],
+				"inject": [
+					"IDENTIFIER",
+					"IDENTIFIER_NAME",
+					"PROJECT_PREFIX"
+				],
 				"packPath": "resourcePack"
 			}
 		]
 	]
-}
+}
diff --git a/packages/minecraftBedrock/schema/block/v1.19.80/components/_main.json b/packages/minecraftBedrock/schema/block/v1.19.80/components/_main.json
@@ -7,9 +7,6 @@
 			"then": {
 				"type": "object",
 				"properties": {
-					"minecraft:transformation": {
-						"$ref": "/data/packages/minecraftBedrock/schema/block/v1.19.80/components/transformation.json"
-					},
 					"minecraft:queued_ticking": {
 						"$ref": "/data/packages/minecraftBedrock/schema/block/v1.19.10/components/queued_ticking.json"
 					},
@@ -49,6 +46,9 @@
 		{
 			"type": "object",
 			"properties": {
+				"minecraft:transformation": {
+					"$ref": "/data/packages/minecraftBedrock/schema/block/v1.19.80/components/transformation.json"
+				},
 				"minecraft:placement_filter": {
 					"$ref": "../../v1.16.100/components/placement_filter.json"
 				},
@@ -160,4 +160,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/packages/minecraftBedrock/schema/block/v1.19.80/main.json b/packages/minecraftBedrock/schema/block/v1.19.80/main.json
@@ -4,7 +4,9 @@
 	"properties": {
 		"minecraft:block": {
 			"title": "Block Definition",
-			"required": ["description"],
+			"required": [
+				"description"
+			],
 			"type": "object",
 			"allOf": [
 				{
@@ -14,7 +16,6 @@
 							"title": "Description",
 							"$ref": "./description.json"
 						},
-
 						"components": {
 							"title": "Components",
 							"allOf": [
@@ -25,6 +26,34 @@
 									"$ref": "./components/_main.json"
 								}
 							]
+						},
+						"permutations": {
+							"title": "Permutations",
+							"description": "List of block permutations based on MoLang queries",
+							"type": "array",
+							"items": {
+								"type": "object",
+								"additionalProperties": false,
+								"properties": {
+									"condition": {
+										"title": "Condition",
+										"description": "MoLang condition",
+										"$ref": "/data/packages/minecraftBedrock/schema/molang/embedded.json"
+									},
+									"components": {
+										"title": "Components",
+										"description": "Components to add when the condition evaluates to 'true'",
+										"allOf": [
+											{
+												"$ref": "/data/packages/minecraftBedrock/schema/block/dynamic/customComponents.json"
+											},
+											{
+												"$ref": "./components/_main.json"
+											}
+										]
+									}
+								}
+							}
 						}
 					}
 				},
@@ -33,34 +62,6 @@
 					"then": {
 						"type": "object",
 						"properties": {
-							"permutations": {
-								"title": "Permutations",
-								"description": "List of block permutations based on MoLang queries",
-								"type": "array",
-								"items": {
-									"type": "object",
-									"additionalProperties": false,
-									"properties": {
-										"condition": {
-											"title": "Condition",
-											"description": "MoLang condition",
-											"$ref": "/data/packages/minecraftBedrock/schema/molang/embedded.json"
-										},
-										"components": {
-											"title": "Components",
-											"description": "Components to add when the condition evaluates to 'true'",
-											"allOf": [
-												{
-													"$ref": "/data/packages/minecraftBedrock/schema/block/dynamic/customComponents.json"
-												},
-												{
-													"$ref": "./components/_main.json"
-												}
-											]
-										}
-									}
-								}
-							},
 							"events": {
 								"title": "Events",
 								"type": "object",
@@ -86,4 +87,4 @@
 			]
 		}
 	}
-}
+}
diff --git a/packages/minecraftBedrock/schema/block/v1.20.0/components/_main.json b/packages/minecraftBedrock/schema/block/v1.20.0/components/_main.json
@@ -7,9 +7,6 @@
 			"then": {
 				"type": "object",
 				"properties": {
-					"minecraft:transformation": {
-						"$ref": "../../v1.19.80/components/transformation.json"
-					},
 					"minecraft:queued_ticking": {
 						"$ref": "../../v1.19.10/components/queued_ticking.json"
 					},
@@ -49,6 +46,9 @@
 		{
 			"type": "object",
 			"properties": {
+				"minecraft:transformation": {
+					"$ref": "/data/packages/minecraftBedrock/schema/block/v1.19.80/components/transformation.json"
+				},
 				"minecraft:placement_filter": {
 					"$ref": "../../v1.16.100/components/placement_filter.json"
 				},
@@ -160,4 +160,4 @@
 			}
 		}
 	]
-}
+}