Merge pull request #76 from bridge-core/dev

Update to v1.20.30.21
bridge-core · Aug 2, 2024 · e1fb624 · e1fb624
2 parents b60c5e7 + b043254
commit e1fb624
Show file tree

Hide file tree

Showing 29 changed files with 1,054 additions and 17 deletions.
diff --git a/dist/minecraftBedrock/fileDefinitions.json b/dist/minecraftBedrock/fileDefinitions.json
diff --git a/packages/minecraftBedrock/fileDefinition/gameTest.json b/packages/minecraftBedrock/fileDefinition/gameTest.json
@@ -18,6 +18,33 @@
 	 */
 	"types": [
 		// @minecraft/server
+		{
+			"moduleName": "@minecraft/server",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
+			"requires": {
+				"dependencies": [
+					{
+						"module_name": "@minecraft/server",
+						"version": "1.15.0-beta"
+					}
+				],
+				"experimentalGameplay": ["enableGameTestFramework"],
+				"targetVersion": [">=", "1.21.30"]
+			}
+		},
+		{
+			"moduleName": "@minecraft/server",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
+			"requires": {
+				"dependencies": [
+					{
+						"module_name": "@minecraft/server",
+						"version": "1.14.0"
+					}
+				],
+				"targetVersion": [">=", "1.21.30"]
+			}
+		},
 		{
 			"moduleName": "@minecraft/server",
 			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
@@ -42,7 +69,6 @@
 						"version": "1.13.0"
 					}
 				],
-				"experimentalGameplay": ["enableGameTestFramework"],
 				"targetVersion": [">=", "1.21.20"]
 			}
 		},
@@ -234,7 +260,7 @@
 		// @minecraft/server-gametest
 		{
 			"moduleName": "@minecraft/server-gametest",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].20-preview.23/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].30-preview.21/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
@@ -261,7 +287,21 @@
 		// @minecraft/server-ui
 		{
 			"moduleName": "@minecraft/server-ui",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
+			"requires": {
+				"dependencies": [
+					{
+						"module_name": "@minecraft/server-ui",
+						"version": "1.4.0-beta"
+					}
+				],
+				"experimentalGameplay": ["enableGameTestFramework"],
+				"targetVersion": [">=", "1.21.30"]
+			}
+		},
+		{
+			"moduleName": "@minecraft/server-ui",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected]/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
@@ -275,7 +315,7 @@
 		},
 		{
 			"moduleName": "@minecraft/server-ui",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].20-preview.23/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].30-preview.21/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
@@ -327,7 +367,7 @@
 		// @server-admin
 		{
 			"moduleName": "@minecraft/server-admin",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].20-preview.23/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].30-preview.21/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{
@@ -369,7 +409,7 @@
 		// @server-editor
 		{
 			"moduleName": "@minecraft/server-editor",
-			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].20-preview.23/index.d.ts",
+			"definition": "https://cdn.jsdelivr.net/npm/@minecraft/[email protected].30-preview.21/index.d.ts",
 			"requires": {
 				"dependencies": [
 					{

diff --git a/packages/minecraftBedrock/formatVersions.json b/packages/minecraftBedrock/formatVersions.json
@@ -41,6 +41,7 @@
 		"1.20.80",
 		"1.21.0",
 		"1.21.10",
-		"1.21.20"
+		"1.21.20",
+		"1.21.30"
 	]
 }
diff --git a/packages/minecraftBedrock/minEngineVersionMap.json b/packages/minecraftBedrock/minEngineVersionMap.json
@@ -18,5 +18,6 @@
 	"1.20.80": "1.20.80",
 	"1.21.0": "1.21.0",
 	"1.21.10": "1.21.0",
-	"1.21.20": "1.21.0"
+	"1.21.20": "1.21.0",
+	"1.21.30": "1.21.0"
 }
diff --git a/packages/minecraftBedrock/schema/block/main.json b/packages/minecraftBedrock/schema/block/main.json
@@ -237,6 +237,18 @@
 			"then": {
 				"$ref": "./v1.21.10/main.json"
 			}
+		},
+		{
+			"if": {
+				"properties": {
+					"format_version": {
+						"enum": ["1.21.30"]
+					}
+				}
+			},
+			"then": {
+				"$ref": "./v1.21.30/main.json"
+			}
 		}
 	]
 }
diff --git a/packages/minecraftBedrock/schema/block/v1.19.80/components/part_visibility.json b/packages/minecraftBedrock/schema/block/v1.19.80/components/part_visibility.json
@@ -3,5 +3,5 @@
 	"additionalProperties": false,
 	"title": "Part Visibility",
 	"doNotSuggest": true,
-	"deprecationMessage": "Deprecated as of v1.19.80 minecraft:bone_visbility (format_version: v1.19.80)."
-}
+	"deprecationMessage": "Deprecated as of v1.19.80 minecraft:bone_visibility (format_version: v1.19.80)."
+}
diff --git a/packages/minecraftBedrock/schema/block/v1.19.80/components/transformation.json b/packages/minecraftBedrock/schema/block/v1.19.80/components/transformation.json
@@ -1,10 +1,9 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"additionalProperties": false,
-	"type": "object",
 	"title": "Transformation",
 	"description": "Transforms a block",
-
+	"type": "object",
 	"properties": {
 		"translation": {
 			"title": "Translation",

diff --git a/packages/minecraftBedrock/schema/block/v1.20.80/components/entity_fall_on.json b/packages/minecraftBedrock/schema/block/v1.20.80/components/entity_fall_on.json
@@ -1,8 +1,12 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "Entity Fall On",
+	"description": "Defines the minimum fall distance for use in custom components.",
 	"type": "object",
 	"properties": {
 		"min_fall_distance": {
+			"title": "Minimum Fall Distance",
+			"description": "The minimum distance in blocks that an actor needs to fall to count as a valid fall.",
 			"type": "number",
 			"minimum": 0.0
 		}

diff --git a/packages/minecraftBedrock/schema/block/v1.20.80/components/tick.json b/packages/minecraftBedrock/schema/block/v1.20.80/components/tick.json
@@ -1,7 +1,8 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema",
-	"type": "object",
+	"title": "Tick",
 	"description": "Defines the tick interval for use in custom components.",
+	"type": "object",
 	"properties": {
 		"interval_range": {
 			"type": "array",

diff --git a/packages/minecraftBedrock/schema/block/v1.21.30/blockTraits.json b/packages/minecraftBedrock/schema/block/v1.21.30/blockTraits.json
@@ -0,0 +1,59 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"type": "object",
+	"additionalProperties": false,
+	"properties": {
+		"minecraft:placement_direction": {
+			"title": "Placement Direction Trait",
+			"description": "This can add states containing information about the player's rotation when the block is placed. For example, if a block using placement_direction is placed while the player is facing south, the state value will be \"south\".",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"enabled_states": {
+					"title": "Enabled States",
+					"description": "This can add states containing information about the player's rotation when the block is placed.\nminecraft:cardinal_direction is a 4-value state containing the cardinal-facing direction of the player when the block was placed. The values for this state are 'north', 'south', 'east', and 'west'.\nminecraft:facing_direction is a 6-value state containing the overall direction of the player when the block was placed. The values for this state are 'down', 'up', 'north', 'south', 'east', and 'west'.",
+					"type": "array",
+					"items": {
+						"type": "string",
+						"enum": [
+							"minecraft:cardinal_direction",
+							"minecraft:facing_direction"
+						]
+					},
+					// "uniqueItems": true,
+					"minItems": 1
+				},
+				"y_rotation_offset": {
+					"title": "Y Rotation Offset",
+					"description": "This is the amount of rotation the block will be rotated by when placed.\n(degrees)",
+					"type": "number",
+					"minimum": 0,
+					"maximum": 360,
+					"default": 0
+				}
+			}
+		},
+		"minecraft:placement_position": {
+			"title": "Placement Position Trait",
+			"description": "This contains information about where the player placed the block. This allows a block to replicate the upside-down placement of slabs and stairs, as well as the attachment behavior of torches and vines.",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"enabled_states": {
+					"title": "Enabled States",
+					"description": "This can add states containing information about the player's rotation when the block is placed.\nminecraft:block_face is a 6-value state representing the face on which the block was placed. Values for this state are 'up', 'down', 'north', 'south', 'east', and 'west'. For example, if a block using the minecraft:block_face is placed on the south face of a neighboring block, the state value will be 'south'.\nminecraft:vertical_half is a 2-value state specifying whether a block was placed in the top or bottom half of a block. The values for this state are 'bottom' and 'top'. For blocks using minecraft:vertical_half, if the block is placed on the 'down' face of a block or above the midline of a horizontal face, the state value will be 'top'.",
+					"type": "array",
+					"items": {
+						"type": "string",
+						"enum": [
+							"minecraft:block_face",
+							"minecraft:vertical_half"
+						]
+					},
+					// "uniqueItems": true,
+					"minItems": 1
+				}
+			}
+		}
+	}
+}