Editor v0.4 Update (#274)

* add editor module in dependencies

* Delete scripts/editor-extensions directory

* wqergtbjlk;p

* Fix tsconfig

* e

* Update cl.yml

Recursive

* Update cl.yml

* update vanilla data bundle to v1.20.20

* qwqwDEFV

* tsconfig again

---------

Co-authored-by: xKingDark <[email protected]>

Author: JaylyDev

Diff for: .github/workflows/cl.yml

@@ -24,10 +24,12 @@ jobs:
           find ./docs/* -maxdepth 5 -name package.json -execdir sh -c 'pwd && npm install' \;
 
       - name: Type Check
-        run: tsc --build --verbose
+        run: | 
+          tsc --build --verbose
+          cp -r dist/* .
 
       - name: Format Check
-        run: node ./tools/index.js
+        run: node ./dist/tools/index.js
         env:
           event_name: ${{ github.event_name }}
 

Diff for: .github/workflows/dependency-update.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Update dependency
         id: update
-        run: node ./tools/dependency.js
+        run: node ./dist/tools/dependency.js
 
       - name: Create Pull Request
         id: cpr

Diff for: .gitignore

@@ -1,11 +1,3 @@
-# Dependency directories
-node_modules/
-
-# Tools build files
-tools/**/*.js
-tools/**/*.js.map
-tools/**/*.d.ts
-
 # Logs
 logs
 *.log
@@ -15,5 +7,127 @@ yarn-error.log*
 lerna-debug.log*
 .pnpm-debug.log*
 
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
 # TypeScript cache
 *.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+# scriptapi
+tools/*.js

Diff for: scripts/editor-fullbright/README.md renamed to editorExtensions/editor-fullbright/README.md

@@ -19,4 +19,11 @@ registerEditorExtension('nightVision', (uiSession) => {
   uiSession.toolRail.show();
   // Add selection functionality
   new FullbrightToggle(uiSession, createMenu(uiSession));
-})
+  return [
+    {
+      teardown() {
+        this.uiSession.log.debug("Shutting down FullbrightToggle behavior\n");
+      }
+    }
+  ];
+}, () => {});

Diff for: scripts/editor-fullbright/index.js renamed to editorExtensions/editor-fullbright/index.js

@@ -15,7 +15,7 @@ import {
 import {
   KeyboardKey,
   IPlayerUISession,
-  MouseRay,
+  Ray,
   IModalTool,
   Action,
   ActionTypes,
@@ -32,7 +32,10 @@ import {
   IPropertyPane,
   IPropertyItem,
   ExtensionContext,
-  CursorProperties
+  CursorProperties,
+  PropertyBag,
+  RegisteredAction,
+  NoArgsAction
 } from "@minecraft/server-editor";
 import {
   getRotationCorrectedDirectionVector,
@@ -65,7 +68,7 @@ const Controls = {
   Clear: KeyboardKey.KEY_D,
 };
 
-interface SettingsObject {
+interface SettingsObject extends PropertyBag {
   origin: Vector3;
   size: Vector3;
   block: BlockType;
@@ -78,7 +81,7 @@ export class SelectionBehavior {
   tool: IModalTool;
   uiSession: IPlayerUISession;
   fnUnregisterToolBindings: () => void;
-  singleClick: (uiSession: IPlayerUISession, mouseRay: MouseRay, shiftPressed: boolean, ctrlPressed: boolean, altPressed: boolean) => void;
+  singleClick: (uiSession: IPlayerUISession, mouseRay: Ray, shiftPressed: boolean, ctrlPressed: boolean, altPressed: boolean) => void;
   lastAnchorPosition: Vector3;
   moveTopSelection: (uiSession: IPlayerUISession, lastAnchor: Vector3, direction: Direction) => Vector3;
   moveBlockCursorManually: (uiSession: IPlayerUISession, direction: Direction) => void;
@@ -90,14 +93,14 @@ export class SelectionBehavior {
   onTickRefresh: (uiSession: IPlayerUISession, tool: IModalTool) => void;
   tickRefreshHandle: number;
   settingsObject: SettingsObject;
-  originPropertyItem: IPropertyItem;
-  sizePropertyItem: IPropertyItem;
+  originPropertyItem: IPropertyItem<SettingsObject, 'origin'>;
+  sizePropertyItem: IPropertyItem<SettingsObject, 'size'>;
   addSettingsPane: (uiSession: IPlayerUISession) => void;
   pane: IPropertyPane;
   addTool: (uiSession: IPlayerUISession) => IModalTool;
   bindGlobalActivationShortcut: (uiSession: IPlayerUISession, storage: Record<string, any>) => void;
   performFillOperation: (context: ExtensionContext, fillType: BlockType) => Promise<void>;
-  executeFillAction: Action<ActionTypes.NoArgsAction>;
+  executeFillAction: RegisteredAction<NoArgsAction>;
   get toolId() {
     return this.tool.id;
   }
@@ -106,7 +109,7 @@ export class SelectionBehavior {
     this.fnUnregisterToolBindings = () => {
       this.tool.unregisterInputBindings();
     };
-    this.singleClick = (uiSession: IPlayerUISession, mouseRay: MouseRay, shiftPressed: boolean, ctrlPressed: boolean, altPressed: boolean) => {
+    this.singleClick = (uiSession: IPlayerUISession, mouseRay: Ray, shiftPressed: boolean, ctrlPressed: boolean, altPressed: boolean) => {
       const clickLoc = mouseRay.cursorBlockLocation;
       // Nothing pressed, then clear the stack and create a single 1x1x1
       if (!shiftPressed && !ctrlPressed && !altPressed) {
@@ -685,13 +688,11 @@ export class SelectionBehavior {
             value: SelectionCursorMode.AdjacentFace,
           },
         ],
-        onChange: (_obj, _property, _oldValue, _newValue) => {
-          const oldVal = _oldValue;
-          const newVal = _newValue;
+        onChange: (_obj, _property, _oldValue: any, _newValue: any) => {
           let cursorControlMode = CursorControlMode.KeyboardAndMouse;
           let cursorTargetMode = CursorTargetMode.Block;
-          if (oldVal !== newVal) {
-            switch (newVal) {
+          if (_oldValue !== _newValue) {
+            switch (_newValue) {
               case SelectionCursorMode.Freeform:
                 cursorControlMode = CursorControlMode.KeyboardAndMouse;
                 cursorTargetMode = CursorTargetMode.Block;
@@ -775,7 +776,7 @@ export class SelectionBehavior {
         titleStringId: getLocalizationId('selectionTool.fillPane.title'),
         titleAltText: 'Fill Selection',
       });
-      const blockPickers: IPropertyItem[] = [];
+      const blockPickers: IPropertyItem<SettingsObject, 'block'>[] = [];
       subPaneFill.addNumber(bindDataSource(subPaneFill, {
         size: 1,
       }), 'size', {
@@ -784,26 +785,26 @@ export class SelectionBehavior {
         min: 1,
         max: 16,
         showSlider: true,
-        onChange: async (_obj, _property, _oldValue, _newValue) => {
-          console.warn(_property, _oldValue, _newValue, blockPickers.length);
-          while (blockPickers.length < _newValue) {
-            await null; // using await null in an async function to avoid making the server hangs
-
-            blockPickers.push(subPaneFill.addBlockPicker(this.settingsObject, 'block', {
-              titleAltText: 'Block Type',
-              allowedBlocks
-            }));
-          }
-          while (blockPickers.length > _newValue) {
-            await null; // using await null in an async function to avoid making the server hangs
-
-            const lastBlockPicker = blockPickers[blockPickers.length - 1];
-            lastBlockPicker.visible = false;
-            lastBlockPicker.enable = false;
-            lastBlockPicker.dispose();
-            blockPickers.pop();
+        onChange: (_obj, _property, _oldValue: any, _newValue: any) => {
+          function adjustBlockPickers() {
+            if (blockPickers.length < _newValue) {
+              blockPickers.push(subPaneFill.addBlockPicker(this.settingsObject, 'block', {
+                titleAltText: 'Block Type',
+                allowedBlocks
+              }));
+            } else if (blockPickers.length > _newValue) {
+              const lastBlockPicker = blockPickers[blockPickers.length - 1];
+              lastBlockPicker.visible = false;
+              lastBlockPicker.enable = false;
+              lastBlockPicker.dispose();
+              blockPickers.pop();
+            }
+          
+            if (blockPickers.length === _newValue) {
+              system.clearRun(id);
+            }
           }
-          subPaneFill.update(true);
+          const id = system.runInterval(adjustBlockPickers);
         },
       });
       subPaneFill.addButton(this.executeFillAction, {
@@ -828,7 +829,7 @@ export class SelectionBehavior {
     // Add a modal tool to the tool rail and set up an activation subscription to set/unset the cursor states
     this.addTool = (uiSession: IPlayerUISession) => {
       const tool = uiSession.toolRail.addTool({
-        displayStringId: 'Random Fill (CTRL + S)',
+        displayAltText: 'Random Fill (CTRL + S)',
         icon: 'pack://textures/editor/Select-Fill.png?filtering=point',
         tooltipStringId: 'Random Fill Tool',
       });
@@ -896,6 +897,7 @@ export class SelectionBehavior {
     // Create pane.
     this.pane = uiSession.createPropertyPane({
       titleAltText: 'Random Fill',
+      titleStringId: getLocalizationId('selectionTool.title'),
     });
     /**
      * Allowed blocks for the block picker
@@ -948,5 +950,13 @@ registerEditorExtension('randomFill', (uiSession) => {
   // Initialize tool rail.
   uiSession.toolRail.show();
   // Add selection functionality
-  new SelectionBehavior(uiSession);
+  return [
+    new SelectionBehavior(uiSession)
+  ]
+}, (uiSession) => {
+  uiSession.log.info('Shutting down minecraft::selection behavior');
+  // Shutdown
+  uiSession.scratchStorage = undefined;
+}, {
+  description: 'Randomly fills blocks in the selection',
 });

Diff for: scripts/editor-fullbright/index.ts renamed to editorExtensions/editor-fullbright/index.ts

@@ -1,7 +1,8 @@
 // Script example for ScriptAPI
-// Author: Mojang <https://github.com/Mojang>
+// Author: Mojang's Editor Team <https://github.com/Mojang>
 // Project: https://github.com/DarkGamerYT/Bedrock-Editor-Extension
-import * as _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__ from '@minecraft/server'
+import { Vector } from '@minecraft/server';
+
 
 /**
  * Direction
@@ -26,12 +27,12 @@ var Direction = {
  * it down.  I blame Tom's dodgy code, tbh.
  */
 const directionLookup = {
-    [Direction.Forward]: _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__.Vector.forward,
-    [Direction.Right]: _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__.Vector.left,
-    [Direction.Back]: _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__.Vector.back,
-    [Direction.Left]: _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__.Vector.right,
-    [Direction.Up]: _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__.Vector.up,
-    [Direction.Down]: _minecraft_server_wrapper__WEBPACK_IMPORTED_MODULE_0__.Vector.down,
+    [Direction.Forward]: Vector.forward,
+    [Direction.Right]: Vector.left,
+    [Direction.Back]: Vector.back,
+    [Direction.Left]: Vector.right,
+    [Direction.Up]: Vector.up,
+    [Direction.Down]: Vector.down,
 };
 /**
  * getRotationCorrectedDirection