diff --git a/scripts/classes/BlockInfo.js b/scripts/classes/BlockInfo.js index 5d6c30c..c063592 100644 --- a/scripts/classes/BlockInfo.js +++ b/scripts/classes/BlockInfo.js @@ -1,24 +1,28 @@ import { system, world } from '@minecraft/server'; import { Raycaster } from '../classes/Raycaster'; -system.runInterval(() => { - for (const player of world.getAllPlayers()) { - if (!player) - continue; - showStructureBlockInfo(player); +class BlockInfo { + static onTick() { + for (const player of world.getAllPlayers()) { + if (!player) + continue; + this.showStructureBlockInfo(player); + } } -}); -function showStructureBlockInfo(player) { - const block = Raycaster.getTargetedStructureBlock(player, { isFirst: true, collideWithWorldBlocks: true }); - if (!block) - return; - player.onScreenDisplay.setActionBar({ text: getFormattedBlockInfo(block.permutation) }); + static showStructureBlockInfo(player) { + const block = Raycaster.getTargetedStructureBlock(player, { isFirst: true, collideWithWorldBlocks: true }); + if (!block) + return; + player.onScreenDisplay.setActionBar({ text: this.getFormattedBlockInfo(block.permutation) }); + } + + static getFormattedBlockInfo(block) { + const states = block.getAllStates(); + if (Object.keys(states).length === 0) + return `Structure:\n§a${block.type.id}`; + return `Structure:\n§a${block.type.id}\n§7${JSON.stringify(block.getAllStates())}`; + } } -function getFormattedBlockInfo(block) { - const states = block.getAllStates(); - if (Object.keys(states).length === 0) - return `Structure:\n§a${block.type.id}`; - return `Structure:\n§a${block.type.id}\n§7${JSON.stringify(block.getAllStates())}`; -} \ No newline at end of file +system.runInterval(() => BlockInfo.onTick()); \ No newline at end of file diff --git a/scripts/rules/easyPlace.js b/scripts/rules/easyPlace.js index 3a983da..28b744f 100644 --- a/scripts/rules/easyPlace.js +++ b/scripts/rules/easyPlace.js @@ -5,11 +5,11 @@ import { structureCollection } from '../classes/StructureCollection'; import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions, blockIdToItemStackMap } from '../data'; -const ARROW_SLOT = 35; +const ACTION_SLOT = 35; const easyPlace = new Rule({ identifier: 'easyPlace', - description: { text: 'Simplifies placing blocks in a structure (arrow in bottom right inventory slot).' }, + description: { text: 'Simplifies placing blocks in a structure (paper in bottom right inventory slot).' }, onEnableCallback: () => { world.beforeEvents.playerPlaceBlock.subscribe(onPlayerPlaceBlock); }, onDisableCallback: () => { world.beforeEvents.playerPlaceBlock.unsubscribe(onPlayerPlaceBlock); } }) @@ -17,19 +17,19 @@ extension.addRule(easyPlace); function onPlayerPlaceBlock(event) { const { player, block } = event; - if (!player || !block || !hasArrowInCorrectSlot(player)) return; + if (!player || !block || !hasActionItemInCorrectSlot(player)) return; const structureBlock = fetchStructureBlock(block.location); if (!structureBlock) return; tryPlaceBlock(event, player, block, structureBlock); } -function hasArrowInCorrectSlot(player) { +function hasActionItemInCorrectSlot(player) { const inventory = player.getComponent(EntityComponentTypes.Inventory)?.container; if (!inventory) return false; - const arrowSlot = inventory.getSlot(ARROW_SLOT); - return arrowSlot.hasItem() && arrowSlot.typeId === 'minecraft:arrow'; + const actionSlot = inventory.getSlot(ACTION_SLOT); + return actionSlot.hasItem() && actionSlot.typeId === 'minecraft:paper'; } function fetchStructureBlock(location) { diff --git a/scripts/rules/fastEasyPlace.js b/scripts/rules/fastEasyPlace.js index c7c15de..f941bda 100644 --- a/scripts/rules/fastEasyPlace.js +++ b/scripts/rules/fastEasyPlace.js @@ -8,7 +8,7 @@ import { Raycaster } from '../classes/Raycaster'; let runner = void 0; const easyPlace = new Rule({ identifier: 'fastEasyPlace', - description: { text: 'Looking at structure blocks with an arrow in your hand will place them.' }, + description: { text: 'Looking at structure blocks with paper in your hand will place them.' }, onEnableCallback: () => { runner = system.runInterval(onTick, 2); }, onDisableCallback: () => { system.clearRun(runner); } }) @@ -23,7 +23,7 @@ function onTick() { } function processEasyPlace(player) { - if (!player || !isHoldingArrow(player)) return; + if (!player || !isHoldingActionItem(player)) return; const structureBlock = Raycaster.getTargetedStructureBlock(player, { isFirst: true }); if (!structureBlock) return; @@ -31,11 +31,11 @@ function processEasyPlace(player) { tryPlaceBlock(player, worldBlock, structureBlock.permutation); } -function isHoldingArrow(player) { +function isHoldingActionItem(player) { const mainhandItemStack = player.getComponent(EntityComponentTypes.Equippable).getEquipment(EquipmentSlot.Mainhand); if (!mainhandItemStack) return false; - return mainhandItemStack.typeId === 'minecraft:arrow'; + return mainhandItemStack.typeId === 'minecraft:paper'; } function tryPlaceBlock(player, worldBlock, structureBlock) {