add custom items for tool picker, easy place, & material grabber

Construct[BP]/items/easy_place.json

@@ -0,0 +1,22 @@
+{
+  "format_version": "1.20.30",
+  "minecraft:item": {
+    "description": {
+      "identifier": "construct:easy_place",
+      "category": "Items"
+    },
+    "components": {
+      "minecraft:max_stack_size": 1,
+      "minecraft:icon": {
+        "texture": "construct:easy_place"
+      },
+      "minecraft:display_name": {
+        "value": "Easy Place"
+      },
+      "minecraft:wearable": {
+        "dispensable": true,
+        "slot": "slot.weapon.offhand"
+      }
+    }
+  }
+}

Construct[BP]/items/material_grabber.json

@@ -0,0 +1,22 @@
+{
+  "format_version": "1.20.30",
+  "minecraft:item": {
+    "description": {
+      "identifier": "construct:material_grabber",
+      "category": "Items"
+    },
+    "components": {
+      "minecraft:max_stack_size": 1,
+      "minecraft:icon": {
+        "texture": "construct:material_grabber"
+      },
+      "minecraft:display_name": {
+        "value": "Material Grabber"
+      },
+      "minecraft:wearable": {
+        "dispensable": true,
+        "slot": "slot.weapon.offhand"
+      }
+    }
+  }
+}

Construct[BP]/items/tool_picker.json

@@ -0,0 +1,22 @@
+{
+  "format_version": "1.20.30",
+  "minecraft:item": {
+    "description": {
+      "identifier": "construct:tool_picker",
+      "category": "Items"
+    },
+    "components": {
+      "minecraft:max_stack_size": 1,
+      "minecraft:icon": {
+        "texture": "construct:tool_picker"
+      },
+      "minecraft:display_name": {
+        "value": "Construct Tool Picker"
+      },
+      "minecraft:wearable": {
+        "dispensable": true,
+        "slot": "slot.weapon.offhand"
+      }
+    }
+  }
+}

Construct[BP]/scripts/options/easyPlace.js

@@ -1,5 +1,5 @@
 import { BuilderOption } from '../classes/Builder/BuilderOption';
-import { BlockPermutation, EntityComponentTypes, GameMode, ItemStack, system, world } from '@minecraft/server';
+import { BlockPermutation, EntityComponentTypes, EquipmentSlot, GameMode, ItemStack, system, world } from '@minecraft/server';
 import { structureCollection } from '../classes/Structure/StructureCollection';
 import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions, 
     blockIdToItemStackMap } from '../data';
@@ -11,29 +11,25 @@ const builderOption = new BuilderOption({
     identifier: 'easyPlace',
     displayName: 'Easy Place',
     description: 'Always place the correct structure block.',
-    howToUse: "Name a paper 'Easy Place', then put it in the inventory slot above your first hotbar slot to always place the correct blocks in a structure."
+    howToUse: "Hold the Easy Place item in your offhand to always place the correct blocks in a structure."
 });
 
 world.beforeEvents.playerPlaceBlock.subscribe(onPlayerPlaceBlock);
 
 function onPlayerPlaceBlock(event) {
     const { player, block } = event;
-    if (!player || !block || !builderOption.isEnabled(player.id) || !hasActionItemInCorrectSlot(player)) return;
+    if (!player || !block || !builderOption.isEnabled(player.id) || !isHoldingActionItem(player)) return;
     const structureBlock = structureCollection.fetchStructureBlock(block.dimension.id, block.location);
     if (!structureBlock)
         return;
     tryPlaceBlock(event, player, block, structureBlock);
 }
 
-function hasActionItemInCorrectSlot(player) {
-    const inventory = player.getComponent(EntityComponentTypes.Inventory)?.container;
-    if (!inventory)
+function isHoldingActionItem(player) {
+    const offhandItemStack = player.getComponent(EntityComponentTypes.Equippable).getEquipment(EquipmentSlot.Offhand);
+    if (!offhandItemStack)
         return false;
-    const actionSlot = inventory.getSlot(ACTION_SLOT);
-    return actionSlot.hasItem() 
-        && actionSlot.typeId === 'minecraft:paper'
-        && actionSlot.nameTag?.toLowerCase().includes('easy')
-        && actionSlot.nameTag?.toLowerCase().includes('place');
+    return offhandItemStack.typeId === 'construct:easy_place';
 }
 
 function tryPlaceBlock(event, player, block, structureBlock) {

Construct[BP]/scripts/options/fastEasyPlace.js

@@ -11,7 +11,7 @@ const builderOption = new BuilderOption({
     identifier: 'fastEasyPlace',
     displayName: 'Fast Easy Place',
     description: 'Place correct structure blocks just by looking at them.',
-    howToUse: "Hold a paper named 'Easy Place' in your hand and look at blocks in a structure to place them."
+    howToUse: "Hold the Easy Place item in your main hand and look at blocks in a structure to place them."
 });
 
 system.runInterval(onTick, PROCESS_INTERVAL);
@@ -37,9 +37,7 @@ function isHoldingActionItem(player) {
     const mainhandItemStack = player.getComponent(EntityComponentTypes.Equippable).getEquipment(EquipmentSlot.Mainhand);
     if (!mainhandItemStack)
         return false;
-    return mainhandItemStack.typeId === 'minecraft:paper'
-        && mainhandItemStack.nameTag?.toLowerCase().includes('easy')
-        && mainhandItemStack.nameTag?.toLowerCase().includes('place');
+    return mainhandItemStack.typeId === 'construct:easy_place';
 }
 
 function tryPlaceBlock(player, worldBlock, structureBlock) {

Construct[BP]/scripts/options/materialGrabber.js

@@ -16,14 +16,14 @@ world.beforeEvents.playerInteractWithBlock.subscribe(onPlayerInteract);
 world.beforeEvents.playerInteractWithEntity.subscribe(onPlayerInteract);
 
 function onItemUse(event) {
-    if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.source.id))
+    if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.source?.id))
         return;
     event.cancel = true;
     system.run(() => new MaterialGrabberForm(event.source));
 }
 
 function onPlayerInteract(event) {
-    if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.player.id))
+    if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.player?.id))
         return;
     const player = event.player;
     const target = event.block || event.target;
@@ -40,8 +40,7 @@ function onPlayerInteract(event) {
 }
 
 function isActionItem(itemStack) {
-    return itemStack?.nameTag?.toLowerCase().includes('material')
-        && itemStack?.nameTag?.toLowerCase().includes('grabber');
+    return itemStack.typeId === 'construct:material_grabber';
 }
 
 function getActiveMaterials(player) {