From 6d7db482c00432ae3653c4de482b25f4c8344ff8 Mon Sep 17 00:00:00 2001 From: ForestOfLight Date: Mon, 21 Apr 2025 00:44:36 -0700 Subject: [PATCH] init material grabber --- .../scripts/classes/Builder/Builder.js | 3 + .../classes/Instance/StructureInstance.js | 9 ++ .../classes/Materials/MaterialsForm.js | 37 ++++++ .../classes/Materials/MaterialsFormBuilder.js | 15 +++ ...terialCounter.js => StructureMaterials.js} | 51 +++---- .../scripts/options/materialGrabber.js | 124 +++++++++++++++++- 6 files changed, 204 insertions(+), 35 deletions(-) create mode 100644 Construct [BP]/scripts/classes/Materials/MaterialsForm.js create mode 100644 Construct [BP]/scripts/classes/Materials/MaterialsFormBuilder.js rename Construct [BP]/scripts/classes/Materials/{MaterialCounter.js => StructureMaterials.js} (52%) diff --git a/Construct [BP]/scripts/classes/Builder/Builder.js b/Construct [BP]/scripts/classes/Builder/Builder.js index afadf1e..68f4aa6 100644 --- a/Construct [BP]/scripts/classes/Builder/Builder.js +++ b/Construct [BP]/scripts/classes/Builder/Builder.js @@ -1,6 +1,9 @@ import { BuilderOptions } from "./BuilderOptions"; export class Builder { + playerId; + materialInstanceName; + constructor(playerId) { this.playerId = playerId; } diff --git a/Construct [BP]/scripts/classes/Instance/StructureInstance.js b/Construct [BP]/scripts/classes/Instance/StructureInstance.js index 76d7738..de6fba6 100644 --- a/Construct [BP]/scripts/classes/Instance/StructureInstance.js +++ b/Construct [BP]/scripts/classes/Instance/StructureInstance.js @@ -5,12 +5,14 @@ import { Structure } from "../Structure/Structure"; import { InstanceOptions } from "./InstanceOptions"; import { TicksPerSecond } from "@minecraft/server"; import { InstanceNotPlacedError } from "../Errors/InstanceNotPlacedError"; +import { StructureMaterials } from "../Materials/StructureMaterials"; export class StructureInstance { options; structure = void 0; verifier = void 0; outliner = void 0; + materials = void 0; constructor(instanceName, structureId) { this.structure = new Structure(structureId); @@ -28,6 +30,9 @@ export class StructureInstance { } refreshBox() { + if (!this.materials) + this.materials = new StructureMaterials(this); + this.materials.refresh(); if (!this.hasLocation()) return; if (!this.outliner) @@ -134,6 +139,10 @@ export class StructureInstance { return this.structure.getAllLocations(); } + getActiveMaterials() { + return this.materials; + } + isEnabled() { return this.options.isEnabled; } diff --git a/Construct [BP]/scripts/classes/Materials/MaterialsForm.js b/Construct [BP]/scripts/classes/Materials/MaterialsForm.js new file mode 100644 index 0000000..2f5d088 --- /dev/null +++ b/Construct [BP]/scripts/classes/Materials/MaterialsForm.js @@ -0,0 +1,37 @@ +import { MaterialsFormBuilder } from './MaterialsFormBuilder'; +import { forceShow } from '../../utils'; +import { Builders } from '../Builder/Builders'; + +export class MaterialsForm { + constructor(player) { + this.player = player; + this.show(); + } + + show() { + try { + return forceShow(this.player, MaterialsFormBuilder.buildInstanceSelector()).then((response) => { + if (response.canceled) + return; + let selection = response.selection; + const selectedInstanceName = structureCollection.getInstanceNames()[selection]; + if (selectedInstanceName) { + this.setActiveInstance(selectedInstanceName); + this.player.sendMessage(`§8Selected instance for material grabber: §2${selectedInstanceName}`); + return; + } + }); + } catch (e) { + if (e.message === 'Menu timed out.') { + this.player.sendMessage('§8Menu timed out.'); + return; + } + throw e; + } + } + + setActiveInstance(instanceName) { + const builder = Builders.get(this.player.id); + builder.materialInstanceName = instanceName; + } +} \ No newline at end of file diff --git a/Construct [BP]/scripts/classes/Materials/MaterialsFormBuilder.js b/Construct [BP]/scripts/classes/Materials/MaterialsFormBuilder.js new file mode 100644 index 0000000..724bba7 --- /dev/null +++ b/Construct [BP]/scripts/classes/Materials/MaterialsFormBuilder.js @@ -0,0 +1,15 @@ +import { MenuFormBuilder } from "../MenuFormBuilder"; + +export class InstanceFormBuilder { + menuTitle = MenuFormBuilder.menuTitle + ' Material Grabber'; + + static buildInstanceSelector() { + const allInstanceNameForm = new ActionFormData() + .title(this.menuTitle) + .body('Select an instance:'); + structureCollection.getInstanceNames().forEach(instanceName => { + allInstanceNameForm.button(`§2${instanceName}`); + }); + return allInstanceNameForm; + } +} \ No newline at end of file diff --git a/Construct [BP]/scripts/classes/Materials/MaterialCounter.js b/Construct [BP]/scripts/classes/Materials/StructureMaterials.js similarity index 52% rename from Construct [BP]/scripts/classes/Materials/MaterialCounter.js rename to Construct [BP]/scripts/classes/Materials/StructureMaterials.js index 1cb2aec..d83b7ca 100644 --- a/Construct [BP]/scripts/classes/Materials/MaterialCounter.js +++ b/Construct [BP]/scripts/classes/Materials/StructureMaterials.js @@ -1,5 +1,5 @@ -class MaterialCounter { - instance +class StructureMaterials { + instance; materials; constructor(instance) { @@ -7,6 +7,11 @@ class MaterialCounter { this.materials = {}; } + refresh() { + this.clear(); + this.populateActive(); + } + populateAll() { for (const layer = 0; layer < this.instance.getMaxLayer(); layer++) this.getLayer(layer) @@ -32,47 +37,33 @@ class MaterialCounter { } clear() { - this.materials = {}; // does this leak memory?? + for (const key in this.materials) + delete this.materials[key]; } toString() { - const materials = {}; - for (const block of this.instance.getAllBlocks()) { - const itemStack = block?.getItemStack(); - const typeId = itemStack?.typeId.replace('minecraft:', ''); - if (!typeId) continue; - if (!materials[typeId]) { - materials[typeId] = { count: 0, maxStack: itemStack.maxAmount }; - } - materials[typeId].count++; - } let message = []; - for (const blockType in materials) { - let count = materials[blockType].count; + for (const blockType in this.materials) { + let count = this.materials[blockType].count; let countStr = ''; - const maxStack = materials[blockType].maxStack; - const fullShulker = 27 * maxStack; - if (count >= fullShulker) { + const stackSize = this.materials[blockType].stackSize; + const fullShulker = 27 * stackSize; + if (count >= fullShulker) countStr = `${Math.floor(count / fullShulker)} sb`; - } - if (count > fullShulker) { + if (count > fullShulker) countStr += ' + '; - } count %= fullShulker; - if (count >= maxStack) { - countStr += `${Math.floor(count / maxStack)} stack`; - } - if (count > maxStack) { + if (count >= stackSize) + countStr += `${Math.floor(count / stackSize)} stack`; + if (count > stackSize) countStr += ' + '; - } - count %= maxStack; - if (count > 0) { + count %= stackSize; + if (count > 0) countStr += count; - } message.push(` ${blockType}: ${countStr}`); } return message.sort().join('\n'); } } -export { MaterialCounter }; \ No newline at end of file +export { StructureMaterials }; \ No newline at end of file diff --git a/Construct [BP]/scripts/options/materialGrabber.js b/Construct [BP]/scripts/options/materialGrabber.js index e11fec3..3ce8970 100644 --- a/Construct [BP]/scripts/options/materialGrabber.js +++ b/Construct [BP]/scripts/options/materialGrabber.js @@ -1,5 +1,8 @@ import { BuilderOption } from '../classes/Builder/BuilderOption'; -import { world } from '@minecraft/server'; +import { EntityComponentTypes, ItemStack, Player, world, system } from '@minecraft/server'; +import { MaterialsForm } from '../classes/Materials/MaterialsForm'; +import { Builders } from '../classes/Builder/Builders'; +import { structureCollection } from '../classes/Structure/StructureCollection'; const builderOption = new BuilderOption({ identifier: 'materialGrabber', @@ -8,12 +11,123 @@ const builderOption = new BuilderOption({ howToUse: "Interact with inventories using a paper named 'Material Grabber' to pull structure items from them.", }); +world.beforeEvents.itemUse.subscribe(onItemUse); world.beforeEvents.playerInteractWithBlock.subscribe(onPlayerInteract); world.beforeEvents.playerInteractWithEntity.subscribe(onPlayerInteract); +function onItemUse(event) { + if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.source.id)) + return; + event.cancel = true; + new MaterialsForm(event.source); +} + function onPlayerInteract(event) { - // get inventory - // analyze active structure items if not analyzed -- there needs to be a way to refresh this that is efficient - // find items in inventory that match items in structure - // transfer to player + if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.player.id)) + return; + const player = event.player; + const target = event.block || event.target; + if (target instanceof Player) + return; + const materials = getActiveMaterials(player); + const targetContainer = target.getComponent(EntityComponentTypes.Inventory)?.container; + const playerContainer = player.getComponent(EntityComponentTypes.Inventory)?.container; + if (!targetContainer || !playerContainer) + return; + event.cancel = true; + system.run(() => { + transferMaterialsToPlayer(targetContainer, playerContainer, materials); + }); +} + +function isActionItem(itemStack) { + return itemStack?.typeId === 'minecraft:paper' && itemStack?.nameTag === 'Material Grabber'; +} + +function getActiveMaterials(player) { + const focusedInstanceName = Builders.get(player.id).materialInstanceName; + const structure = structureCollection.get(focusedInstanceName); + if (!structure) + return []; + return structure.getActiveMaterials(); +} + +function transferMaterialsToPlayer(targetContainer, playerContainer, materials) { + for (let slotIndex = 0; slotIndex < targetContainer.size; slotIndex++) { + const slot = targetContainer.getSlot(slotIndex); + tryTransferToPlayer(slot, playerContainer, materials); + } +} + +function tryTransferToPlayer(slot, playerContainer, materials) { + if (slot.hasItem() && materials[slot.typeId]) { + const grabAmount = Math.min(slot.amount, materials[slot.typeId].count); + if (grabAmount > 0) + tryTransferAmountToPlayer(slot, playerContainer, materials, grabAmount); + } +} + +function tryTransferAmountToPlayer(slot, playerContainer, materials, grabAmount) { + const itemStack = slot.getItem(); + if (canAddItem(playerContainer, itemStack)) { + addItem(playerContainer, itemStack); + materials[slot.typeId].count -= grabAmount; + removeAmount(slot, grabAmount); + } +} + +function removeAmount(slot, amount) { + if (amount === slot.amount) { + slot.setItem(void 0); + } else { + slot.amount -= amount; + slot.setItem(slot.getItem()); + } +} + +function canAddItem(inventory, itemStack) { + if (inventory.emptySlotsCount !== 0) return true; + for (let i = 0; i < inventory.size; i++) { + const slot = inventory.getSlot(i); + if (itemFitsInPartiallyFilledSlot(slot, itemStack)) return true; + } + return false; +} + +function itemFitsInPartiallyFilledSlot(slot, itemStack) { + return slot.hasItem() && slot.isStackableWith(itemStack) && slot.amount + itemStack.amount <= slot.maxAmount; +} + +function addItem(inventory, itemStack) { + const isItemDeposited = partiallyFilledSlotPass(inventory, itemStack); + if (!isItemDeposited) + emptySlotPass(inventory, itemStack); + +} + +function partiallyFilledSlotPass(inventory, itemStack) { + for (let slotNum = 0; slotNum < inventory.size; slotNum++) { + const slot = inventory.getSlot(slotNum); + if (isSlotAvailableForStacking(slot, itemStack)) { + const remainderAmount = Math.max(0, (slot.amount + itemStack.amount) - slot.maxAmount); + slot.amount += itemStack.amount - remainderAmount; + if (remainderAmount > 0) { + const remainderStack = new ItemStack(itemStack.typeId, remainderAmount); + addItem(inventory, remainderStack); + } + return true; + } + } + return false; +} + +function emptySlotPass(inventory, itemStack) { + for (let slotNum = 0; slotNum < inventory.size; slotNum++) { + const slot = inventory.getSlot(slotNum); + if (!slot.hasItem()) { + slot.setItem(itemStack); + return true; + } + } + return false; } \ No newline at end of file