Updates for Minecraft release 1.21.50-preview.20

dye-brush/dye-brush.ts

@@ -3,6 +3,7 @@
 import {
     ActionTypes,
     ColorPickerPropertyItemVariant,
+    CursorProperties,
     CursorTargetMode,
     IDropdownItem,
     IModalTool,
@@ -138,6 +139,7 @@ interface DyeBrushStorage {
     currentColor: EntityColor;
     brushColor: IObservable<RGBA>;
     brushSize: number;
+    backedUpCursorProps: CursorProperties | undefined;
 }
 
 type DyeBrushSession = IPlayerUISession<DyeBrushStorage>;
@@ -162,12 +164,11 @@ function addDyeBrushPane(uiSession: DyeBrushSession, tool: IModalTool) {
 
     const pane = uiSession.createPropertyPane({
         title: 'sample.dyeBrush.pane.title',
+        infoTooltip: { description: ['sample.dyebrush.tool.tooltip'] },
     });
 
     const entityBrush = makeObservable(EntityColor.White);
 
-    onColorUpdated(brushColor.value, uiSession);
-
     pane.addDropdown(entityBrush, {
         title: 'Brush',
         entries: Object.values(EntityColor).reduce<IDropdownItem[]>((list, dye, index) => {
@@ -312,7 +313,15 @@ function addDyeBrushPane(uiSession: DyeBrushSession, tool: IModalTool) {
 
     tool.onModalToolActivation.subscribe((evt: ModalToolLifecycleEventPayload) => {
         if (evt.isActiveTool) {
+            if (uiSession.scratchStorage && !uiSession.scratchStorage.backedUpCursorProps) {
+                uiSession.scratchStorage.backedUpCursorProps = uiSession.extensionContext.cursor.getProperties();
+            }
             onColorUpdated(brushColor.value, uiSession);
+        } else {
+            if (uiSession.scratchStorage && uiSession.scratchStorage.backedUpCursorProps) {
+                uiSession.extensionContext.cursor.setProperties(uiSession.scratchStorage.backedUpCursorProps);
+                uiSession.scratchStorage.backedUpCursorProps = undefined;
+            }
         }
         uiSession.scratchStorage?.previewSelection?.clear();
     });
@@ -345,6 +354,7 @@ export function registerDyeBrushExtension() {
                 currentColor: EntityColor.White,
                 brushColor: makeObservable<RGBA>({ red: 1, green: 1, blue: 1, alpha: 0.5 }),
                 brushSize: 4,
+                backedUpCursorProps: undefined,
             };
             uiSession.scratchStorage = storage;
 

farm-generator/farm-generator.ts

@@ -377,7 +377,7 @@ function addFarmGeneratorTool(uiSession: IPlayerUISession) {
     const toolToggleAction = uiSession.actionManager.createAction({
         actionType: ActionTypes.NoArgsAction,
         onExecute: () => {
-            uiSession.toolRail.setSelectedOptionId(tool.id, true);
+            uiSession.toolRail.setSelectedToolId(tool.id);
         },
     });
 

portal-generator/portal-generator.ts

@@ -87,7 +87,7 @@ class PortalGenerator implements IDisposable {
         const toolToggleAction = uiSession.actionManager.createAction({
             actionType: ActionTypes.NoArgsAction,
             onExecute: () => {
-                uiSession.toolRail.setSelectedOptionId(tool.id, true);
+                uiSession.toolRail.setSelectedToolId(tool.id);
             },
         });
 

simple-empty/SimpleEmptyTool.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Mojang AB.  All rights reserved.
 
 import {
-    EditorStatusBarAlignment,
     IObservable,
     IPlayerUISession,
     ISimpleToolOptions,
@@ -12,6 +11,7 @@ import {
     KeyboardKey,
     SimpleToolStatusBarVisibility,
     SimpleToolWrapper,
+    StatusBarAlignment,
     bindDataSource,
     makeObservable,
     registerEditorExtension,
@@ -213,8 +213,8 @@ export class SimpleEmptyTool extends SimpleToolWrapper {
         // only works if there's a ISimpleToolPropertyPane component added to the tool, otherwise it will be ignored and the
         // status bar will always be visible.
         const statusBarOptions: ISimpleToolStatusBarOptions = {
-            alignment: EditorStatusBarAlignment.Left,
-            displayAltText: 'Simple Empty Status',
+            alignment: StatusBarAlignment.Left,
+            text: 'Simple Empty Status',
             size: 50,
             visibility: SimpleToolStatusBarVisibility.VisibleWhenActive,
             onFinalize: statusBar => {

tree-generator/tree-generator.ts

@@ -220,43 +220,49 @@ export class SimpleTree implements ITree {
     }
 }
 
-function createLeaf1Block(leafType: string): BlockPermutation {
-    return BlockPermutation.resolve(MinecraftBlockTypes.Leaves, {
-        old_leaf_type: leafType,
-    });
-}
-
-function createLeaf2Block(leafType: string): BlockPermutation {
-    return BlockPermutation.resolve(MinecraftBlockTypes.Leaves2, {
-        new_leaf_type: leafType,
-    });
-}
-
 const TreeTypes = [
     {
         name: 'Oak',
-        type: new SimpleTree(BlockPermutation.resolve(MinecraftBlockTypes.OakLog), createLeaf1Block('oak')),
+        type: new SimpleTree(
+            BlockPermutation.resolve(MinecraftBlockTypes.OakLog),
+            BlockPermutation.resolve(MinecraftBlockTypes.OakLeaves)
+        ),
     },
     {
         name: 'Spruce',
-        type: new SimpleTree(BlockPermutation.resolve(MinecraftBlockTypes.SpruceLog), createLeaf1Block('spruce')),
+        type: new SimpleTree(
+            BlockPermutation.resolve(MinecraftBlockTypes.SpruceLog),
+            BlockPermutation.resolve(MinecraftBlockTypes.SpruceLeaves)
+        ),
     },
     {
         name: 'Birch',
-        type: new SimpleTree(BlockPermutation.resolve(MinecraftBlockTypes.BirchLog), createLeaf1Block('birch')),
+        type: new SimpleTree(
+            BlockPermutation.resolve(MinecraftBlockTypes.BirchLog),
+            BlockPermutation.resolve(MinecraftBlockTypes.BirchLeaves)
+        ),
     },
     {
         name: 'Jungle',
-        type: new SimpleTree(BlockPermutation.resolve(MinecraftBlockTypes.JungleLog), createLeaf1Block('jungle')),
+        type: new SimpleTree(
+            BlockPermutation.resolve(MinecraftBlockTypes.JungleLog),
+            BlockPermutation.resolve(MinecraftBlockTypes.JungleLeaves)
+        ),
     },
 
     {
         name: 'Acacia',
-        type: new SimpleTree(BlockPermutation.resolve(MinecraftBlockTypes.AcaciaLog), createLeaf2Block('acacia')),
+        type: new SimpleTree(
+            BlockPermutation.resolve(MinecraftBlockTypes.AcaciaLog),
+            BlockPermutation.resolve(MinecraftBlockTypes.AcaciaLeaves)
+        ),
     },
     {
         name: 'Dark Oak',
-        type: new SimpleTree(BlockPermutation.resolve(MinecraftBlockTypes.DarkOakLog), createLeaf2Block('dark_oak')),
+        type: new SimpleTree(
+            BlockPermutation.resolve(MinecraftBlockTypes.DarkOakLog),
+            BlockPermutation.resolve(MinecraftBlockTypes.DarkOakLeaves)
+        ),
     },
 ];
 
@@ -392,7 +398,7 @@ function addTool(uiSession: IPlayerUISession) {
     const toolToggleAction = uiSession.actionManager.createAction({
         actionType: ActionTypes.NoArgsAction,
         onExecute: () => {
-            uiSession.toolRail.setSelectedOptionId(tool.id, true);
+            uiSession.toolRail.setSelectedToolId(tool.id);
         },
     });