interactions for custom items
This commit is contained in:
@@ -4,16 +4,43 @@ import { structureCollection } from '../classes/Structure/StructureCollection';
|
||||
import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions,
|
||||
blockIdToItemStackMap } from '../data';
|
||||
import { fetchMatchingItemSlot } from '../utils';
|
||||
|
||||
const ACTION_SLOT = 27;
|
||||
import { Builders } from '../classes/Builder/Builders';
|
||||
|
||||
const builderOption = new BuilderOption({
|
||||
identifier: 'easyPlace',
|
||||
displayName: 'Easy Place',
|
||||
description: 'Always place the correct structure block.',
|
||||
howToUse: "Hold the Easy Place item in your offhand 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.",
|
||||
onEnableCallback: (playerId) => giveActionItem(playerId),
|
||||
onDisableCallback: (playerId) => removeActionItem(playerId)
|
||||
});
|
||||
|
||||
function giveActionItem(playerId) {
|
||||
const player = world.getEntity(playerId);
|
||||
const container = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
const itemStack = new ItemStack('construct:easy_place');
|
||||
if (!container.contains(itemStack))
|
||||
container.addItem(itemStack);
|
||||
}
|
||||
|
||||
function removeActionItem(playerId) {
|
||||
const builder = Builders.get(playerId);
|
||||
if (builder.isOptionEnabled('fastEasyPlace'))
|
||||
return;
|
||||
const player = world.getEntity(playerId);
|
||||
const container = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
for (let i = 0; i < container.size; i++) {
|
||||
const itemStack = container.getItem(i);
|
||||
if (itemStack?.typeId === 'construct:easy_place')
|
||||
container.setItem(i, void 0);
|
||||
}
|
||||
const equipment = player.getComponent(EntityComponentTypes.Equippable);
|
||||
const offhandItemStack = equipment?.getEquipment(EquipmentSlot.Offhand);
|
||||
if (offhandItemStack?.typeId === 'construct:easy_place') {
|
||||
equipment.setEquipment(EquipmentSlot.Offhand, void 0);
|
||||
}
|
||||
}
|
||||
|
||||
world.beforeEvents.playerPlaceBlock.subscribe(onPlayerPlaceBlock);
|
||||
|
||||
function onPlayerPlaceBlock(event) {
|
||||
@@ -91,7 +118,6 @@ function tryConvertToDefaultState(structureBlock) {
|
||||
|
||||
function tryPlaceBlockSurvival(event, player, block, structureBlock) {
|
||||
const placeableItemStack = getPlaceableItemStack(structureBlock);
|
||||
// console.warn(`Looking for item to place ${structureBlock?.type.id} (${placeableItemStack?.typeId})...`);
|
||||
const itemSlotToUse = fetchMatchingItemSlot(player, placeableItemStack?.typeId);
|
||||
if (itemSlotToUse) {
|
||||
event.cancel = true;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { BuilderOption } from '../classes/Builder/BuilderOption';
|
||||
import { BlockPermutation, EntityComponentTypes, EquipmentSlot, GameMode, ItemStack, system, world } from '@minecraft/server';
|
||||
import { BlockPermutation, EntityComponentTypes, EquipmentSlot, GameMode, InputMode, ItemStack, system, world } from '@minecraft/server';
|
||||
import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions,
|
||||
blockIdToItemStackMap } from '../data';
|
||||
import { Raycaster } from '../classes/Raycaster';
|
||||
import { Builders } from '../classes/Builder/Builders';
|
||||
|
||||
const PROCESS_INTERVAL = 2;
|
||||
|
||||
@@ -11,19 +12,55 @@ const builderOption = new BuilderOption({
|
||||
identifier: 'fastEasyPlace',
|
||||
displayName: 'Fast Easy Place',
|
||||
description: 'Place correct structure blocks just by looking at them.',
|
||||
howToUse: "Hold the Easy Place item in your main 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.",
|
||||
onEnableCallback: (playerId) => giveActionItem(playerId),
|
||||
onDisableCallback: (playerId) => removeActionItem(playerId)
|
||||
});
|
||||
|
||||
function giveActionItem(playerId) {
|
||||
const player = world.getEntity(playerId);
|
||||
const container = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
const itemStack = new ItemStack('construct:easy_place');
|
||||
if (!container.contains(itemStack))
|
||||
container.addItem(itemStack);
|
||||
}
|
||||
|
||||
function removeActionItem(playerId) {
|
||||
const builder = Builders.get(playerId);
|
||||
if (builder.isOptionEnabled('easyPlace'))
|
||||
return;
|
||||
const player = world.getEntity(playerId);
|
||||
const container = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
for (let i = 0; i < container.size; i++) {
|
||||
const itemStack = container.getItem(i);
|
||||
if (itemStack?.typeId === 'construct:easy_place')
|
||||
container.setItem(i, void 0);
|
||||
}
|
||||
const equipment = player.getComponent(EntityComponentTypes.Equippable);
|
||||
const offhandItemStack = equipment?.getEquipment(EquipmentSlot.Offhand);
|
||||
if (offhandItemStack?.typeId === 'construct:easy_place') {
|
||||
equipment.setEquipment(EquipmentSlot.Offhand, void 0);
|
||||
}
|
||||
}
|
||||
|
||||
system.runInterval(onTick, PROCESS_INTERVAL);
|
||||
|
||||
function onTick() {
|
||||
for (const player of world.getAllPlayers()) {
|
||||
if (!player || !builderOption.isEnabled(player.id))
|
||||
continue;
|
||||
processEasyPlace(player);
|
||||
if (player && builderOption.isEnabled(player.id) && player.inputInfo.lastInputModeUsed === InputMode.Touch)
|
||||
processEasyPlace(player);
|
||||
}
|
||||
}
|
||||
|
||||
world.beforeEvents.itemUse.subscribe(event => {
|
||||
const player = event.source;
|
||||
if (player && builderOption.isEnabled(event.source?.id) && player.inputInfo.lastInputModeUsed !== InputMode.Touch) {
|
||||
system.run(() => {
|
||||
processEasyPlace(event.source);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
function processEasyPlace(player) {
|
||||
if (!player || !isHoldingActionItem(player)) return;
|
||||
const structureBlock = Raycaster.getTargetedStructureBlock(player, { isFirst: true });
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { BuilderOption } from '../classes/Builder/BuilderOption';
|
||||
import { EntityComponentTypes, ItemStack, Player, world, system } from '@minecraft/server';
|
||||
import { EntityComponentTypes, ItemStack, Player, world, system, EquipmentSlot } from '@minecraft/server';
|
||||
import { MaterialGrabberForm } from '../classes/Materials/MaterialGrabberForm';
|
||||
import { Builders } from '../classes/Builder/Builders';
|
||||
import { structureCollection } from '../classes/Structure/StructureCollection';
|
||||
@@ -8,9 +8,34 @@ const builderOption = new BuilderOption({
|
||||
identifier: 'materialGrabber',
|
||||
displayName: 'Material Grabber',
|
||||
description: 'Pulls structure items from inventories.',
|
||||
howToUse: "Interact with inventories using an item named 'Material Grabber' to pull structure items from them."
|
||||
howToUse: "Interact with inventories using an item named 'Material Grabber' to pull structure items from them.",
|
||||
onEnableCallback: (playerId) => giveActionItem(playerId),
|
||||
onDisableCallback: (playerId) => removeActionItem(playerId)
|
||||
});
|
||||
|
||||
function giveActionItem(playerId) {
|
||||
const player = world.getEntity(playerId);
|
||||
const container = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
const itemStack = new ItemStack('construct:material_grabber');
|
||||
if (!container.contains(itemStack))
|
||||
container.addItem(itemStack);
|
||||
}
|
||||
|
||||
function removeActionItem(playerId) {
|
||||
const player = world.getEntity(playerId);
|
||||
const container = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
for (let i = 0; i < container.size; i++) {
|
||||
const itemStack = container.getItem(i);
|
||||
if (itemStack?.typeId === 'construct:material_grabber')
|
||||
container.setItem(i, void 0);
|
||||
}
|
||||
const equipment = player.getComponent(EntityComponentTypes.Equippable);
|
||||
const offhandItemStack = equipment?.getEquipment(EquipmentSlot.Offhand);
|
||||
if (offhandItemStack?.typeId === 'construct:material_grabber') {
|
||||
equipment.setEquipment(EquipmentSlot.Offhand, void 0);
|
||||
}
|
||||
}
|
||||
|
||||
world.beforeEvents.itemUse.subscribe(onItemUse);
|
||||
world.beforeEvents.playerInteractWithBlock.subscribe(onPlayerInteract);
|
||||
world.beforeEvents.playerInteractWithEntity.subscribe(onPlayerInteract);
|
||||
@@ -18,8 +43,7 @@ world.beforeEvents.playerInteractWithEntity.subscribe(onPlayerInteract);
|
||||
function onItemUse(event) {
|
||||
if (!isActionItem(event.itemStack) || !builderOption.isEnabled(event.source?.id))
|
||||
return;
|
||||
event.cancel = true;
|
||||
system.run(() => new MaterialGrabberForm(event.source));
|
||||
openInstanceSelectionForm(event.source, event);
|
||||
}
|
||||
|
||||
function onPlayerInteract(event) {
|
||||
@@ -27,9 +51,23 @@ function onPlayerInteract(event) {
|
||||
return;
|
||||
const player = event.player;
|
||||
const target = event.block || event.target;
|
||||
const focusedInstanceName = Builders.get(player.id).materialInstanceName;
|
||||
if (!focusedInstanceName) {
|
||||
openInstanceSelectionForm(player, event);
|
||||
} else {
|
||||
tryGrabMaterials(player, target, focusedInstanceName, event);
|
||||
}
|
||||
}
|
||||
|
||||
function openInstanceSelectionForm(player, event) {
|
||||
event.cancel = true;
|
||||
system.run(() => new MaterialGrabberForm(player));
|
||||
}
|
||||
|
||||
function tryGrabMaterials(player, target, focusedInstanceName, event) {
|
||||
if (target instanceof Player)
|
||||
return;
|
||||
const materials = getActiveMaterials(player);
|
||||
const materials = getActiveMaterials(focusedInstanceName);
|
||||
if (!materials)
|
||||
return;
|
||||
const targetContainer = target.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||
@@ -40,17 +78,12 @@ function onPlayerInteract(event) {
|
||||
}
|
||||
|
||||
function isActionItem(itemStack) {
|
||||
return itemStack.typeId === 'construct:material_grabber';
|
||||
return itemStack?.typeId === 'construct:material_grabber';
|
||||
}
|
||||
|
||||
function getActiveMaterials(player) {
|
||||
const focusedInstanceName = Builders.get(player.id).materialInstanceName;
|
||||
if (!focusedInstanceName)
|
||||
return void 0;
|
||||
const structure = structureCollection.get(focusedInstanceName);
|
||||
if (!structure)
|
||||
return void 0;
|
||||
return structure.getActiveMaterials();
|
||||
function getActiveMaterials(focusedInstanceName) {
|
||||
const instance = structureCollection.get(focusedInstanceName);
|
||||
return instance?.getActiveMaterials();
|
||||
}
|
||||
|
||||
function transferMaterialsToPlayer(player, targetContainer, materials) {
|
||||
|
||||
Reference in New Issue
Block a user