Skip to content

Commit

Permalink
Merge branch 'main' into refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@outercloudstudio
outercloudstudio committed Jun 14, 2024
2 parents e54003f + 8e3c19a commit ce26314
Show file tree
Hide file tree
Showing 732 changed files with 18,284 additions and 2,744 deletions.
2 changes: 1 addition & 1 deletion dist/minecraftBedrock/fileDefinitions.json
View file

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions packages/minecraftBedrock/experimentalGameplay.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
"icon": "mdi-ab-testing",
"id": "enableGameTestFramework" // Beta APIs toggle
},
{
"icon": "mdi-alpha-m",
"id": "experimentalMolangFeatures"
},
{
"icon": "mdi-school-outline",
"id": "educationEdition"
Expand All @@ -30,5 +26,5 @@
* { "icon": "mdi-image-filter-hdr", "id": "cavesAndCliffs" } - 1.18.0
* { "icon": "mdi-plus-circle", "id": "additionalModdingCapabilities" } - 1.18.30
* { "icon": "mdi-pine-tree", "id": "theWildUpdate" } - 1.19.0
*
* { "icon": "md-alpha-m", "id": "experimentalMolangFeatures" } - 1.20.70
*/
18 changes: 18 additions & 0 deletions packages/minecraftBedrock/fileDefinition/blockCulling.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"id": "blockCulling",
"icon": "mdi-cube-scan",
"detect": {
"packType": "resourcePack",
"scope": "block_culling/",
"matcher": ["block_culling/**/*", "block_culling/*"],
"fileContent": ["minecraft:block_culling_rules"],
"fileExtensions": [".json"]
},
"schema": "file:///data/packages/minecraftBedrock/schema/blockCulling/main.json",
"lightningCache": "blockCulling.json",
"highlighterConfiguration": {
"variables": ["description"],
"typeIdentifiers": ["format_version", "identifier"],
"definitions": ["rules"]
}
}
168 changes: 119 additions & 49 deletions packages/minecraftBedrock/fileDefinition/gameTest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,118 @@
// @minecraft/server
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.8.0-beta.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.13.0-beta.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.8.0-beta"
"version": "1.13.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"]
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.21.10"]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.7.0-rc.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.12.0-rc.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.7.0"
"version": "1.12.0"
}
]
],
"targetVersion": [">=", "1.21.10"]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.7.0-beta.1.20.40-stable/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.12.0-beta.1.21.0-preview.23/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.7.0-beta"
"version": "1.12.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"]
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.21.0"]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.11.0-rc.1.21.0-preview.23/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.11.0"
}
],
"targetVersion": [">=", "1.21.0"]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.11.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.11.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.80"]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.10.0/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.10.0"
}
]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.9.0/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.9.0"
}
]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.8.0/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.8.0"
}
]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.7.0/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.7.0"
}
]
}
},
{
Expand All @@ -80,6 +158,18 @@
]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.4.0-beta.1.20.10-stable/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "1.4.0-beta"
}
]
}
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.4.0/index.d.ts",
Expand Down Expand Up @@ -140,25 +230,23 @@
]
}
},

// @minecraft/server-gametest
{
"moduleName": "@minecraft/server-gametest",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-gametest@1.0.0-beta.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-gametest@1.0.0-beta.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server-gametest",
"version": "1.0.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.50"]
"experimentalGameplay": ["enableGameTestFramework"]
}
},
{
"moduleName": "@minecraft/server-gametest",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-gametest@1.0.0-beta.1.20.40-stable/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-gametest@1.0.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -169,11 +257,10 @@
"experimentalGameplay": ["enableGameTestFramework"]
}
},

// @minecraft/server-ui
{
"moduleName": "@minecraft/server-ui",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-ui@1.2.0-beta.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-ui@1.2.0-beta.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -182,12 +269,12 @@
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.50"]
"targetVersion": [">=", "1.21.10"]
}
},
{
"moduleName": "@minecraft/server-ui",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-ui@1.2.0-beta.1.20.40-stable/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-ui@1.2.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -222,25 +309,23 @@
]
}
},

// @server-admin
{
"moduleName": "@minecraft/server-admin",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-admin@1.0.0-beta.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-admin@1.0.0-beta.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server-admin",
"version": "1.0.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.50"]
"experimentalGameplay": ["enableGameTestFramework"]
}
},
{
"moduleName": "@minecraft/server-admin",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-admin@1.0.0-beta.11940b24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-admin@1.0.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -255,21 +340,20 @@
// @server-net
{
"moduleName": "@minecraft/server-net",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-net@1.0.0-beta.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-net@1.0.0-beta.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server-net",
"version": "1.0.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.50"]
"experimentalGameplay": ["enableGameTestFramework"]
}
},
{
"moduleName": "@minecraft/server-net",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-net@1.0.0-beta.11940b24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-net@1.0.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -280,11 +364,10 @@
"experimentalGameplay": ["enableGameTestFramework"]
}
},

// @server-editor
{
"moduleName": "@minecraft/server-editor",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-editor@0.1.0-beta.1.20.50-preview.24/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-editor@0.1.0-beta.1.21.10-preview.22/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -293,12 +376,12 @@
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.50"]
"targetVersion": [">=", "1.21.0"]
}
},
{
"moduleName": "@minecraft/server-editor",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-editor@0.1.0-beta.1.20.40-stable/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-editor@0.1.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -309,28 +392,15 @@
"experimentalGameplay": ["enableGameTestFramework"]
}
},

// @vanilla-data
{
"moduleName": "@minecraft/vanilla-data",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/vanilla-data@1.20.50-preview.24/lib/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server"
}
],
"experimentalGameplay": ["enableGameTestFramework"],
"targetVersion": [">=", "1.20.50"]
}
},
// @debug-utilities
{
"moduleName": "@minecraft/vanilla-data",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/vanilla-data@1.20.40/lib/index.d.ts",
"moduleName": "@minecraft/debug-utilities",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/debug-utilities@1.0.0-beta.1.20.80-stable/index.d.ts",
"requires": {
"dependencies": [
{
"module_name": "@minecraft/server"
"module_name": "@minecraft/debug-utilities",
"version": "1.0.0-beta"
}
],
"experimentalGameplay": ["enableGameTestFramework"]
Expand Down
9 changes: 7 additions & 2 deletions packages/minecraftBedrock/formatVersions.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"currentStable": "1.20.40",
"currentStable": "1.20.80",
"formatVersions": [
"1.8.0",
"1.10.0",
Expand Down Expand Up @@ -35,6 +35,11 @@
"1.20.20",
"1.20.30",
"1.20.40",
"1.20.50"
"1.20.50",
"1.20.60",
"1.20.70",
"1.20.80",
"1.21.0",
"1.21.10"
]
}
Loading

0 comments on commit ce26314

Please sign in to comment.