add showStructBlockInfo, fastEasyPlace, and add arrow slot for easyPlace
This commit is contained in:
@@ -0,0 +1,48 @@
|
|||||||
|
import { world } from "@minecraft/server";
|
||||||
|
import { structureCollection } from "./StructureCollection";
|
||||||
|
|
||||||
|
export class Raycaster {
|
||||||
|
static STEP_SIZE = 0.2;
|
||||||
|
|
||||||
|
static getStructureBlocks(dimension, startLocation, direction, { maxDistance, getFirst = true, collideWithWorldBlocks = true }) {
|
||||||
|
// Can probably be optimized by the fact that we only need full blocks and aren't checking for partial blocks
|
||||||
|
const blocks = [];
|
||||||
|
let location = startLocation;
|
||||||
|
let distance = 0;
|
||||||
|
while (distance < maxDistance) {
|
||||||
|
const locatedStructures = structureCollection.getStructuresAtLocation(location);
|
||||||
|
if (locatedStructures.length !== 0) {
|
||||||
|
const structure = locatedStructures[0];
|
||||||
|
const block = structure.getBlock(structure.toStructureCoords(location));
|
||||||
|
if (collideWithWorldBlocks && !dimension.getBlock(location)?.isAir)
|
||||||
|
break;
|
||||||
|
if (block?.type.id !== 'minecraft:air') {
|
||||||
|
blocks.push({
|
||||||
|
permutation: block,
|
||||||
|
location: location
|
||||||
|
});
|
||||||
|
if (getFirst)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
location = {
|
||||||
|
x: location.x + (direction.x*this.STEP_SIZE),
|
||||||
|
y: location.y + (direction.y*this.STEP_SIZE),
|
||||||
|
z: location.z + (direction.z*this.STEP_SIZE)
|
||||||
|
};
|
||||||
|
distance += this.STEP_SIZE;
|
||||||
|
}
|
||||||
|
// world.getDimension('minecraft:overworld').spawnParticle('minecraft:villager_happy', location);
|
||||||
|
return blocks;
|
||||||
|
}
|
||||||
|
|
||||||
|
static getTargetedStructureBlock(player, { isFirst = true, collideWithWorldBlocks = true }) {
|
||||||
|
const startLocation = player.getHeadLocation();
|
||||||
|
const direction = player.getViewDirection();
|
||||||
|
const maxDistance = 7;
|
||||||
|
const blocks = this.getStructureBlocks(player.dimension, startLocation, direction, { maxDistance, getFirst: isFirst, collideWithWorldBlocks });
|
||||||
|
if (blocks.length === 0)
|
||||||
|
return void 0;
|
||||||
|
return isFirst ? blocks[0] : blocks[blocks.length - 1];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,6 +33,14 @@ class StructureCollection {
|
|||||||
getStructuresAtLocation(location) {
|
getStructuresAtLocation(location) {
|
||||||
return Object.values(this.#structures).filter(structure => structure.isLocationActive(structure.toStructureCoords(location)));
|
return Object.values(this.#structures).filter(structure => structure.isLocationActive(structure.toStructureCoords(location)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fetchStructureBlock(location) {
|
||||||
|
const locatedStructures = this.getStructuresAtLocation(location);
|
||||||
|
if (locatedStructures.length === 0)
|
||||||
|
return void 0;
|
||||||
|
const structure = locatedStructures[0];
|
||||||
|
return structure.getBlock(structure.toStructureCoords(location));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const structureCollection = new StructureCollection();
|
export const structureCollection = new StructureCollection();
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Command } from '../lib/canopy/CanopyExtension';
|
import { Command } from '../lib/canopy/CanopyExtension';
|
||||||
import { extension } from '../config';
|
import { extension } from '../config';
|
||||||
import { structureCollection } from '../classes/StructureCollection';
|
import { structureCollection } from '../classes/StructureCollection';
|
||||||
import { system } from '@minecraft/server';
|
|
||||||
import { MaterialCounter } from '../classes/MaterialCounter';
|
import { MaterialCounter } from '../classes/MaterialCounter';
|
||||||
|
|
||||||
const structCmd = new Command({
|
const structCmd = new Command({
|
||||||
|
|||||||
@@ -39,37 +39,6 @@ export const resetToBlockStates = {
|
|||||||
cluster_count: 0
|
cluster_count: 0
|
||||||
};
|
};
|
||||||
|
|
||||||
export const chainedStatePlacements = {
|
|
||||||
cauldron: {
|
|
||||||
cauldron_liquid: {
|
|
||||||
water: ['water_bucket'],
|
|
||||||
lava: ['lava_bucket']
|
|
||||||
}
|
|
||||||
},
|
|
||||||
sea_pickle: {
|
|
||||||
cluster_count: {
|
|
||||||
1: ['sea_pickle'],
|
|
||||||
2: ['sea_pickle', 'sea_pickle'],
|
|
||||||
3: ['sea_pickle', 'sea_pickle', 'sea_pickle']
|
|
||||||
}
|
|
||||||
},
|
|
||||||
turtle_egg: {
|
|
||||||
turtle_egg_count: {
|
|
||||||
two_eggs: ['turtle_egg'],
|
|
||||||
three_eggs: ['turtle_egg', 'turtle_egg'],
|
|
||||||
four_eggs: ['turtle_egg', 'turtle_egg', 'turtle_egg']
|
|
||||||
}
|
|
||||||
},
|
|
||||||
respawn_anchor: {
|
|
||||||
respawn_anchor_charge: {
|
|
||||||
1: ['glowstone'],
|
|
||||||
2: ['glowstone', 'glowstone'],
|
|
||||||
3: ['glowstone', 'glowstone', 'glowstone'],
|
|
||||||
4: ['glowstone', 'glowstone', 'glowstone', 'glowstone']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const blockIdToItemStackMap = {
|
export const blockIdToItemStackMap = {
|
||||||
'water': 'water_bucket',
|
'water': 'water_bucket',
|
||||||
'lava': 'lava_bucket',
|
'lava': 'lava_bucket',
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
// Rules
|
// Rules
|
||||||
import './rules/easyPlace';
|
import './rules/easyPlace';
|
||||||
|
import './rules/fastEasyPlace';
|
||||||
|
import './rules/showStructBlockInfo';
|
||||||
|
|
||||||
// Commands
|
// Commands
|
||||||
import './commands/struct';
|
import './commands/struct';
|
||||||
|
|||||||
@@ -5,9 +5,11 @@ import { structureCollection } from '../classes/StructureCollection';
|
|||||||
import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions,
|
import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions,
|
||||||
blockIdToItemStackMap } from '../data';
|
blockIdToItemStackMap } from '../data';
|
||||||
|
|
||||||
|
const ARROW_SLOT = 35;
|
||||||
|
|
||||||
const easyPlace = new Rule({
|
const easyPlace = new Rule({
|
||||||
identifier: 'easyPlace',
|
identifier: 'easyPlace',
|
||||||
description: { text: 'Places a structure with ease.' },
|
description: { text: 'Simplifies placing blocks in a structure (arrow in bottom right inventory slot).' },
|
||||||
onEnableCallback: () => { world.beforeEvents.playerPlaceBlock.subscribe(onPlayerPlaceBlock); },
|
onEnableCallback: () => { world.beforeEvents.playerPlaceBlock.subscribe(onPlayerPlaceBlock); },
|
||||||
onDisableCallback: () => { world.beforeEvents.playerPlaceBlock.unsubscribe(onPlayerPlaceBlock); }
|
onDisableCallback: () => { world.beforeEvents.playerPlaceBlock.unsubscribe(onPlayerPlaceBlock); }
|
||||||
})
|
})
|
||||||
@@ -15,13 +17,21 @@ extension.addRule(easyPlace);
|
|||||||
|
|
||||||
function onPlayerPlaceBlock(event) {
|
function onPlayerPlaceBlock(event) {
|
||||||
const { player, block } = event;
|
const { player, block } = event;
|
||||||
if (!player || !block) return;
|
if (!player || !block || !hasArrowInCorrectSlot(player)) return;
|
||||||
const structureBlock = fetchStructureBlock(block.location);
|
const structureBlock = fetchStructureBlock(block.location);
|
||||||
if (!structureBlock)
|
if (!structureBlock)
|
||||||
return;
|
return;
|
||||||
tryPlaceBlock(event, player, block, structureBlock);
|
tryPlaceBlock(event, player, block, structureBlock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasArrowInCorrectSlot(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';
|
||||||
|
}
|
||||||
|
|
||||||
function fetchStructureBlock(location) {
|
function fetchStructureBlock(location) {
|
||||||
const locatedStructures = structureCollection.getStructuresAtLocation(location);
|
const locatedStructures = structureCollection.getStructuresAtLocation(location);
|
||||||
if (locatedStructures.length === 0)
|
if (locatedStructures.length === 0)
|
||||||
@@ -77,7 +87,7 @@ function tryConvertToDefaultState(structureBlock) {
|
|||||||
|
|
||||||
function tryPlaceBlockSurvival(event, player, block, structureBlock) {
|
function tryPlaceBlockSurvival(event, player, block, structureBlock) {
|
||||||
const placeableItemStack = getPlaceableItemStack(structureBlock);
|
const placeableItemStack = getPlaceableItemStack(structureBlock);
|
||||||
console.warn(`Looking for item to place ${structureBlock?.type.id} (${placeableItemStack?.typeId})...`);
|
// console.warn(`Looking for item to place ${structureBlock?.type.id} (${placeableItemStack?.typeId})...`);
|
||||||
const itemSlotToUse = fetchMatchingItemSlot(player, placeableItemStack?.typeId);
|
const itemSlotToUse = fetchMatchingItemSlot(player, placeableItemStack?.typeId);
|
||||||
if (itemSlotToUse) {
|
if (itemSlotToUse) {
|
||||||
event.cancel = true;
|
event.cancel = true;
|
||||||
|
|||||||
@@ -0,0 +1,140 @@
|
|||||||
|
import { Rule } from '../lib/canopy/CanopyExtension';
|
||||||
|
import { extension } from '../config';
|
||||||
|
import { BlockPermutation, EntityComponentTypes, EquipmentSlot, GameMode, ItemStack, system, world } from '@minecraft/server';
|
||||||
|
import { bannedBlocks, bannedToValidBlockMap, whitelistedBlockStates, resetToBlockStates, bannedDimensionBlocks, specialItemPlacementConversions,
|
||||||
|
blockIdToItemStackMap } from '../data';
|
||||||
|
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.' },
|
||||||
|
onEnableCallback: () => { runner = system.runInterval(onTick, 2); },
|
||||||
|
onDisableCallback: () => { system.clearRun(runner); }
|
||||||
|
})
|
||||||
|
extension.addRule(easyPlace);
|
||||||
|
|
||||||
|
function onTick() {
|
||||||
|
for (const player of world.getAllPlayers()) {
|
||||||
|
if (!player)
|
||||||
|
continue;
|
||||||
|
processEasyPlace(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function processEasyPlace(player) {
|
||||||
|
if (!player || !isHoldingArrow(player)) return;
|
||||||
|
const structureBlock = Raycaster.getTargetedStructureBlock(player, { isFirst: true });
|
||||||
|
if (!structureBlock)
|
||||||
|
return;
|
||||||
|
const worldBlock = player.dimension.getBlock(structureBlock.location);
|
||||||
|
tryPlaceBlock(player, worldBlock, structureBlock.permutation);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isHoldingArrow(player) {
|
||||||
|
const mainhandItemStack = player.getComponent(EntityComponentTypes.Equippable).getEquipment(EquipmentSlot.Mainhand);
|
||||||
|
if (!mainhandItemStack)
|
||||||
|
return false;
|
||||||
|
return mainhandItemStack.typeId === 'minecraft:arrow';
|
||||||
|
}
|
||||||
|
|
||||||
|
function tryPlaceBlock(player, worldBlock, structureBlock) {
|
||||||
|
if (isBannedBlock(player, structureBlock) || !locationIsPlaceable(worldBlock)) return;
|
||||||
|
structureBlock = tryConvertBannedToValidBlock(structureBlock);
|
||||||
|
if (player.getGameMode() === GameMode.creative) {
|
||||||
|
placeBlock(worldBlock, structureBlock);
|
||||||
|
} else if (player.getGameMode() === GameMode.survival) {
|
||||||
|
structureBlock = tryConvertToDefaultState(structureBlock);
|
||||||
|
tryPlaceBlockSurvival(player, worldBlock, structureBlock);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function locationIsPlaceable(worldBlock) {
|
||||||
|
return worldBlock.isAir;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isBannedBlock(player, structureBlock) {
|
||||||
|
const blockId = structureBlock.type.id.replace('minecraft:', '');
|
||||||
|
if (bannedBlocks.includes(blockId))
|
||||||
|
return true;
|
||||||
|
if (bannedDimensionBlocks[player.dimension.id.replace('minecraft:', '')]?.includes(blockId))
|
||||||
|
return true;
|
||||||
|
const allowedStates = whitelistedBlockStates[blockId];
|
||||||
|
if (allowedStates) {
|
||||||
|
for (const [stateKey, stateValue] of Object.entries(allowedStates)) {
|
||||||
|
if (structureBlock.getState(stateKey) !== stateValue)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tryConvertBannedToValidBlock(structureBlock) {
|
||||||
|
const blockId = structureBlock.type.id.replace('minecraft:', '');
|
||||||
|
if (Object.keys(bannedToValidBlockMap).includes(blockId))
|
||||||
|
return BlockPermutation.resolve(bannedToValidBlockMap[blockId], structureBlock.getAllStates());
|
||||||
|
return structureBlock;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tryConvertToDefaultState(structureBlock) {
|
||||||
|
const newStates = {};
|
||||||
|
for (const [stateKey, stateValue] of Object.entries(structureBlock.getAllStates())) {
|
||||||
|
if (resetToBlockStates[stateKey] !== void 0 && stateValue !== resetToBlockStates[stateKey])
|
||||||
|
newStates[stateKey] = resetToBlockStates[stateKey];
|
||||||
|
else
|
||||||
|
newStates[stateKey] = stateValue;
|
||||||
|
}
|
||||||
|
return BlockPermutation.resolve(structureBlock.type.id, newStates);
|
||||||
|
}
|
||||||
|
|
||||||
|
function tryPlaceBlockSurvival(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) {
|
||||||
|
placeBlock(block, structureBlock, itemSlotToUse);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPlaceableItemStack(structureBlock) {
|
||||||
|
const blockId = structureBlock.type.id.replace('minecraft:', '');
|
||||||
|
const newItemId = blockIdToItemStackMap[blockId];
|
||||||
|
return newItemId ? new ItemStack(newItemId) : structureBlock.getItemStack();
|
||||||
|
}
|
||||||
|
|
||||||
|
function fetchMatchingItemSlot(player, itemToMatchId) {
|
||||||
|
if (!itemToMatchId)
|
||||||
|
return void 0;
|
||||||
|
const inventory = player.getComponent(EntityComponentTypes.Inventory)?.container;
|
||||||
|
if (!inventory)
|
||||||
|
return void 0;
|
||||||
|
for (let index = 0; index < inventory.size; index++) {
|
||||||
|
const itemSlot = inventory.getSlot(index);
|
||||||
|
if (itemSlot.hasItem() && itemSlot?.typeId === itemToMatchId)
|
||||||
|
return itemSlot;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function placeBlock(block, structureBlock, itemSlot) {
|
||||||
|
system.run(() => {
|
||||||
|
if (itemSlot) {
|
||||||
|
consumeItem(itemSlot);
|
||||||
|
}
|
||||||
|
block.setPermutation(structureBlock);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function consumeItem(itemSlot) {
|
||||||
|
if (specialItemPlacementConversions[itemSlot.typeId.replace('minecraft:', '')]) {
|
||||||
|
consumeSpecial(itemSlot);
|
||||||
|
} else {
|
||||||
|
if (itemSlot.amount === 1)
|
||||||
|
itemSlot.setItem(void 0);
|
||||||
|
else
|
||||||
|
itemSlot.amount--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function consumeSpecial(itemSlot) {
|
||||||
|
itemSlot.setItem(new ItemStack(specialItemPlacementConversions[itemSlot.typeId.replace('minecraft:', '')]));
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import { Rule } from '../lib/canopy/CanopyExtension';
|
||||||
|
import { extension } from '../config';
|
||||||
|
import { system, world } from '@minecraft/server';
|
||||||
|
import { Raycaster } from '../classes/Raycaster';
|
||||||
|
|
||||||
|
let runner = void 0;
|
||||||
|
const showStructBlockInfo = new Rule({
|
||||||
|
identifier: 'showStructBlockInfo',
|
||||||
|
description: { text: 'Shows block and state info for structure blocks you are looking at.' },
|
||||||
|
onEnableCallback: () => { runner = system.runInterval(onTick); },
|
||||||
|
onDisableCallback: () => { system.clearRun(runner); }
|
||||||
|
})
|
||||||
|
extension.addRule(showStructBlockInfo);
|
||||||
|
|
||||||
|
function onTick() {
|
||||||
|
for (const player of world.getAllPlayers()) {
|
||||||
|
if (!player)
|
||||||
|
continue;
|
||||||
|
showStructureBlockInfo(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showStructureBlockInfo(player) {
|
||||||
|
const block = Raycaster.getTargetedStructureBlock(player, { isFirst: true, collideWithWorldBlocks: true });
|
||||||
|
if (!block)
|
||||||
|
return;
|
||||||
|
player.onScreenDisplay.setActionBar({ text: getFormattedBlockInfo(block.permutation) });
|
||||||
|
}
|
||||||
|
|
||||||
|
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())}`;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user