Skip to content

Commit

Permalink
Update to preview
Browse files Browse the repository at this point in the history
  • Loading branch information
ExDrill committed Nov 5, 2024
1 parent 737dd94 commit 46fb085
Show file tree
Hide file tree
Showing 9 changed files with 100 additions and 17 deletions.
2 changes: 1 addition & 1 deletion dist/minecraftBedrock/fileDefinitions.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions packages/minecraftBedrock/fileDefinition/gameTest.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// @minecraft/server
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.17.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.17.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand All @@ -34,7 +34,7 @@
},
{
"moduleName": "@minecraft/server",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.16.0-rc.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server@1.16.0-rc.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -256,7 +256,7 @@
// @minecraft/server-gametest
{
"moduleName": "@minecraft/server-gametest",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-gametest@1.0.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-gametest@1.0.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -297,7 +297,7 @@
// @minecraft/server-ui
{
"moduleName": "@minecraft/server-ui",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-ui@1.4.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-ui@1.4.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -360,7 +360,7 @@
// @server-admin
{
"moduleName": "@minecraft/server-admin",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-admin@1.0.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-admin@1.0.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -388,7 +388,7 @@
// @server-net
{
"moduleName": "@minecraft/server-net",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-net@1.0.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-net@1.0.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -417,7 +417,7 @@
// @server-editor
{
"moduleName": "@minecraft/server-editor",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-editor@0.1.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/server-editor@0.1.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down Expand Up @@ -446,7 +446,7 @@
// @debug-utilities
{
"moduleName": "@minecraft/debug-utilities",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/debug-utilities@1.0.0-beta.1.21.50-preview.25/index.d.ts",
"definition": "https://cdn.jsdelivr.net/npm/@minecraft/debug-utilities@1.0.0-beta.1.21.50-preview.26/index.d.ts",
"requires": {
"dependencies": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@
}
}
},
{
"$ref": "../../../project/experimentalGameplay/upcomingCreatorFeatures.json",
"then": {
"properties": {
"minecraft:item_visual": {
"$ref": "../../v1.21.50/components/item_visual.json"
},
"minecraft:liquid_detection": {
"$ref": "../../v1.21.50/components/liquid_detection.json"
}
}
}
},
{
// Deprecated
"properties": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"title": "Item Visual",
"description": "The description identifier of the geometry and material used to render the item of this block.",
"type": "object",
"properties": {
"geometry": {
"description": "The 'minecraft:geometry' component that will be used for the item.",
"$ref": "../../v1.20.60/components/geometry.json"
},
"material_instances": {
"description": "The 'minecraft:material_instances' component that will be used for the item.",
"$ref": "../../v1.19.40/components/material_instances.json"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"title": "Liquid Detection",
"description": "The definitions for how a block behaves when detecting liquid. Only one rule definition is allowed per liquid type - if multiple are specified, the first will be used and the rest will be ignored.",
"properties": {
"detection_rules": {
"title": "Detection Rules",
"type": "array",
"items": {
"can_contain_liquid": {
"title": "Can Contain Liquid",
"description": "Whether this block can contain the liquid. For example, if the liquid type is `water`, this means the block can be waterlogged.",
"type": "boolean",
"default": false
},
"liquid_type": {
"title": "Liquid Type",
"description": "The type of liquid this detection rule is for. ",
"type": "string",
"enum": ["water"]
},
"on_liquid_touches": {
"title": "On Liquid Touches",
"description": "How the block reacts to flowing water.",
"type": "string",
"enum": ["blocking", "broken", "no_reaction"]
},
"stops_liquid_flowing_from_direction": {
"title": "Stops Liquid Flowing From Direction",
"description": "When a block contains a liquid, controls the directions in which the liquid can't flow out from the block. Also controls the directions in which a block can stop liquid flowing into it if `no_reaction` is set for the `on_liquid_touches` field.",
"type": "array",
"items": {
"type": "string",
"enum": ["up", "down", "north", "south", "east", "west"]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sound_event": {
"type": "string",
"description": "A string value correseponding to a sound event in the game code.",
"$ref": "../../../general/reference/soundDefinition.json"
"$ref": "../../../general/reference/soundEvent.json"
},
"duration": {
"type": "integer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
"description": "Makes an item wearable.",
"properties": {
"slot": {
"title": "Slot",
"$ref": "../../../general/itemWearableType.json"
},
"dispensable": {
"type": "boolean"
},
"protection": {
"title": "Protection",
"description": "How much protection does the wearable item have.",
"type": "integer",
"minimum": 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
"$ref": "../../v1.20.20/components/allow_off_hand.json"
},
"minecraft:block_placer": {
"$ref": "../../v1.21.40/components/block_placer.json"
// Remove all of this and use the old version once 1.21.50 comes into stable
"$ref": "../../../project/experimentalGameplay/upcomingCreatorFeatures.json",
"then": {
"$ref": "../../v1.21.40/components/block_placer.json"
},
"else": {
"$ref": "../../v1.20.10/components/block_placer.json"
}
},
"minecraft:bundle_interaction": {
"$ref": "../../v1.21.30/components/bundle_interaction.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
"minecraft:can_destroy_in_creative": {
"$ref": "../../v1.20.10/components/can_destroy_in_creative.json"
},
"minecraft:compostable": {
"$ref": "../../v1.21.50/components/compostable.json"
},
"minecraft:custom_components": {
"$ref": "../../v1.21.10/components/custom_components.json"
},
Expand Down Expand Up @@ -114,6 +111,17 @@
}
}
},
{
// Experimental
"$ref": "../../../project/experimentalGameplay/upcomingCreatorFeatures.json",
"then": {
"properties": {
"minecraft:compostable": {
"$ref": "../../v1.21.50/components/compostable.json"
}
}
}
},
{
// Deprecated
"properties": {
Expand Down

0 comments on commit 46fb085

Please sign in to comment.