Material grabber functional

Construct [BP]/scripts/classes/Builder/Builder.js

@@ -2,7 +2,7 @@ import { BuilderOptions } from "./BuilderOptions";
 
 export class Builder {
     playerId;
-    materialInstanceName;
+    materialInstanceName = void 0;
 
     constructor(playerId) {
         this.playerId = playerId;

Construct [BP]/scripts/classes/Instance/StructureInstance.js

@@ -27,20 +27,21 @@ export class StructureInstance {
         delete this.structure;
         delete this.outliner;
         delete this.verifier;
+        delete this.materials;
     }
 
     refreshBox() {
-        if (!this.materials)
-            this.materials = new StructureMaterials(this);
-        this.materials.refresh();
         if (!this.hasLocation())
             return;
         if (!this.outliner)
             this.outliner = new StructureOutliner(this);
         if (!this.verifier)
             this.verifier = new StructureVerifier(this, { isEnabled: this.options.verifier.isEnabled, trackPlayerDistance: this.options.verifier.trackPlayerDistance });
+        if (!this.materials)
+            this.materials = new StructureMaterials(this);
         this.outliner.refresh();
         this.verifier.refresh();
+        this.materials.refresh();
     }
 
     getName() {
@@ -186,8 +187,8 @@ export class StructureInstance {
     }
 
     place(dimensionId, worldLocation) {
-        this.move(dimensionId, worldLocation);
         this.enable();
+        this.move(dimensionId, worldLocation);
     }
 
     move(dimensionId, worldLocation) {

Construct [BP]/scripts/classes/Materials/MaterialsForm.js

@@ -1,6 +1,7 @@
 import { MaterialsFormBuilder } from './MaterialsFormBuilder';
 import { forceShow } from '../../utils';
 import { Builders } from '../Builder/Builders';
+import { structureCollection } from '../Structure/StructureCollection';
 
 export class MaterialsForm {
     constructor(player) {
@@ -10,14 +11,13 @@ export class MaterialsForm {
 
     show() {
         try {
-            return forceShow(this.player, MaterialsFormBuilder.buildInstanceSelector()).then((response) => {
+            return forceShow(this.player, MaterialsFormBuilder.buildInstanceSelector(this.player)).then((response) => {
                 if (response.canceled)
                     return;
-                let selection = response.selection;
-                const selectedInstanceName = structureCollection.getInstanceNames()[selection];
+                const selectedInstanceName = structureCollection.getInstanceNames()[response.selection];
                 if (selectedInstanceName) {
                     this.setActiveInstance(selectedInstanceName);
-                    this.player.sendMessage(`§8Selected instance for material grabber: §2${selectedInstanceName}`);
+                    this.player.sendMessage(`§7Selected instance for material grabber: §2${selectedInstanceName}`);
                     return;
                 }
             });

Construct [BP]/scripts/classes/Materials/MaterialsFormBuilder.js

@@ -1,12 +1,22 @@
+import { ActionFormData } from "@minecraft/server-ui";
 import { MenuFormBuilder } from "../MenuFormBuilder";
+import { structureCollection } from "../Structure/StructureCollection";
+import { Builders } from "../Builder/Builders";
 
-export class InstanceFormBuilder {
-    menuTitle = MenuFormBuilder.menuTitle + ' Material Grabber';
+export class MaterialsFormBuilder {
+    static menuTitle = MenuFormBuilder.menuTitle + ' Material Grabber';
 
-    static buildInstanceSelector() {
+    static buildInstanceSelector(player) {
         const allInstanceNameForm = new ActionFormData()
-            .title(this.menuTitle)
-            .body('Select an instance:');
+            .title(this.menuTitle);
+        const currInstanceName = Builders.get(player.id).materialInstanceName;
+        let body = '§7Current instance: ';
+        if (currInstanceName)
+            body += `§2${currInstanceName}`;
+        else
+            body += '§7None';
+        body += '\n§7Select an instance:';
+        allInstanceNameForm.body(body);
         structureCollection.getInstanceNames().forEach(instanceName => {
             allInstanceNameForm.button(`§2${instanceName}`);
         });

Construct [BP]/scripts/classes/Materials/StructureMaterials.js

@@ -9,12 +9,45 @@ class StructureMaterials {
 
     refresh() {
         this.clear();
-        this.populateActive();
+        this.populateInstance();
+    }
+
+    populateInstance() {
+        try {
+            if (this.instance.hasLocation())
+                this.populateActive();
+            else
+                this.populateAll();
+        } catch (e) {
+            if (e.name === 'InstanceNotPlacedError')
+                this.clear();
+            else
+                throw e;
+        }
+    }
+
+    get(itemType) {
+        return this.materials[itemType];
+    }
+
+    isEmpty() {
+        return Object.keys(this.materials).length === 0;
+    }
+
+    has(itemType) {
+        return this.materials[itemType] !== undefined;
+    }
+
+    remove(itemType, amount) {
+        if (!this.materials[itemType]) return;
+        this.materials[itemType].count -= amount;
+        if (this.materials[itemType].count <= 0)
+            delete this.materials[itemType];
     }
 
     populateAll() {
-        for (const layer = 0; layer < this.instance.getMaxLayer(); layer++)
-            this.getLayer(layer)
+        for (let layer = 0; layer < this.instance.getMaxLayer(); layer++)
+            this.populateLayer(layer)
     }
 
     populateLayer(layer) {

Construct [BP]/scripts/classes/MenuForm.js

@@ -59,7 +59,14 @@ export class MenuForm {
             const structureId = await this.getStructureId();
             if (!structureId)
                 return;
-            structureCollection.add(instanceName, structureId);
+            try {
+                structureCollection.add(instanceName, structureId);
+            } catch (e) {
+                if (e.name === 'InvalidInstanceError') {
+                    this.player.sendMessage(`§cInstance '${instanceName}' already exists. Try again with a new name.`);
+                    return void 0;
+                }
+            }
             return instanceName;
         });
     }