优化脚手架放置

Author: goumo

src/main/java/com/teammoeg/frostedheart/bootstrap/common/FHBlocks.java

@@ -1942,6 +1942,7 @@ private static boolean never(BlockState state, BlockGetter getter, BlockPos pos)
             .blockstate(FHBlockStateGen.simpleCubeAll("concrete/concrete_cracked_"+i))
             .simpleItem()
             .register());
+
     public static final BlockEntry<FHScaffoldingStairsBlock> METAL_SCAFFOLDING_STAIRS = REGISTRATE.block("metal_scaffolding_stairs", FHScaffoldingStairsBlock::new)
             .properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GRAY)
                     .requiresCorrectToolForDrops()
@@ -1958,8 +1959,10 @@ private static boolean never(BlockState state, BlockGetter getter, BlockPos pos)
             .properties(BlockBehaviour.Properties::dynamicShape)
             .tag(FHTags.Blocks.SCAFFOLDING.tag, BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_STONE_TOOL, BlockTags.CLIMBABLE, AllTags.AllBlockTags.WRENCH_PICKUP.tag)
             .blockstate(existed())
-            .simpleItem()
+            .item(FHScaffoldingBlockItem::new)
+            .build()
             .register();
+
     public static final BlockEntry<FHScaffoldingStairsBlock> WOODEN_SCAFFOLDING_STAIRS = REGISTRATE.block("wooden_scaffolding_stairs", FHScaffoldingStairsBlock::new)
             .properties(p -> p.mapColor(MapColor.PODZOL)
                     .sound(SoundType.WOOD)
@@ -1976,8 +1979,10 @@ private static boolean never(BlockState state, BlockGetter getter, BlockPos pos)
             .properties(BlockBehaviour.Properties::dynamicShape)
             .tag(FHTags.Blocks.SCAFFOLDING.tag, BlockTags.MINEABLE_WITH_AXE, BlockTags.CLIMBABLE, AllTags.AllBlockTags.WRENCH_PICKUP.tag)
             .blockstate(existed())
-            .simpleItem()
+            .item(FHScaffoldingBlockItem::new)
+            .build()
             .register();
+
     public static final BlockEntry<FHScaffoldingStairsBlock> TIMBER_METAL_SCAFFOLDING_STAIRS = REGISTRATE.block("timber_metal_scaffolding_stairs", FHScaffoldingStairsBlock::new)
             .properties(p -> p.mapColor(MapColor.PODZOL)
                     .noOcclusion()
@@ -1993,7 +1998,8 @@ private static boolean never(BlockState state, BlockGetter getter, BlockPos pos)
             .properties(BlockBehaviour.Properties::dynamicShape)
             .tag(FHTags.Blocks.SCAFFOLDING.tag, BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.MINEABLE_WITH_AXE, BlockTags.CLIMBABLE, AllTags.AllBlockTags.WRENCH_PICKUP.tag)
             .blockstate(existed())
-            .simpleItem()
+            .item(FHScaffoldingBlockItem::new)
+            .build()
             .register();
 
     public static final BlockEntry<WarehouseStorageRackBlock> WAREHOUSE_STORAGE_RACK = REGISTRATE.block("warehouse_storage_rack", WarehouseStorageRackBlock::new)

src/main/java/com/teammoeg/frostedheart/content/decoration/FHScaffoldingBlock.java

@@ -1,26 +1,14 @@
 package com.teammoeg.frostedheart.content.decoration;
 
-import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
-import com.simibubi.create.foundation.placement.IPlacementHelper;
-import com.simibubi.create.foundation.placement.PlacementHelpers;
-import com.simibubi.create.foundation.placement.PlacementOffset;
-import com.simibubi.create.infrastructure.config.AllConfigs;
 import com.teammoeg.chorda.block.CBlock;
 import com.teammoeg.chorda.util.struct.FastEnumMap;
 import com.teammoeg.frostedheart.bootstrap.reference.FHTags;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.ai.attributes.AttributeInstance;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SimpleWaterloggedBlock;
@@ -30,19 +18,17 @@
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.EntityCollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraftforge.common.ForgeMod;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
 
 public class FHScaffoldingBlock extends CBlock implements SimpleWaterloggedBlock {
     public static final BooleanProperty SURFACE = BooleanProperty.create("surface");
@@ -69,8 +55,6 @@ public class FHScaffoldingBlock extends CBlock implements SimpleWaterloggedBlock
 
     private static final ConcurrentHashMap<BlockState, VoxelShape> shapeCache = new ConcurrentHashMap<>();
 
-    public static final int PLACEMENT_HELPER_ID = PlacementHelpers.register(new ScaffoldingPlacementHelper());
-
     public FHScaffoldingBlock(Properties blockProps) {
         super(blockProps);
         registerDefaultState(stateDefinition.any()
@@ -99,7 +83,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 
     @Override
     public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) {
-        return isScaffolding(pState) ? Shapes.block() : shapeCache.computeIfAbsent(pState, this::computeShape);
+        return isHoldingScaffolding(pState, pLevel, pPos, pContext) ? Shapes.block() : shapeCache.computeIfAbsent(pState, this::computeShape);
     }
 
     private VoxelShape computeShape(BlockState state) {
@@ -138,24 +122,6 @@ public FluidState getFluidState(BlockState pState) {
         return pState.getValue(BlockStateProperties.WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(pState);
     }
 
-    @Override
-    public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand, BlockHitResult pHit) {
-        var heldItem = pPlayer.getItemInHand(pHand);
-
-        if (heldItem.is(FHTags.forgeTag(ForgeRegistries.ITEMS, "rods"))) {
-            pLevel.setBlock(pPos, pState.setValue(HANDRAIL, !pState.getValue(HANDRAIL)), 2);
-            pLevel.playSound((Player)null, pPos, SoundEvents.COPPER_PLACE, SoundSource.BLOCKS, 1.0F, 0.8F + pLevel.random.nextFloat() * 0.4F);
-            return InteractionResult.SUCCESS;
-        }
-
-        IPlacementHelper helper = PlacementHelpers.get(PLACEMENT_HELPER_ID);
-        if (helper.matchesItem(heldItem))
-            return helper.getOffset(pPlayer, pLevel, pState, pPos, pHit)
-                    .placeInWorld(pLevel, (BlockItem) heldItem.getItem(), pPlayer, pHand, pHit);
-
-        return super.use(pState, pLevel, pPos, pPlayer, pHand, pHit);
-    }
-
     @Override
     public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState, LevelAccessor pLevel, BlockPos pPos, BlockPos pNeighborPos) {
         if (pState.getValue(BlockStateProperties.WATERLOGGED)) {
@@ -217,78 +183,23 @@ public static boolean isScaffolding(BlockState state) {
         return state.is(FHTags.Blocks.SCAFFOLDING.get());
     }
 
+    public static boolean isHoldingScaffolding(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+        if (context instanceof EntityCollisionContext ecc) {
+            if (ecc.getEntity() instanceof LivingEntity entity && entity.getMainHandItem().getItem() instanceof BlockItem bi) {
+                return isScaffolding(bi.getBlock().defaultBlockState());
+            }
+            return false;
+        }
+
+        var tags = ForgeRegistries.BLOCKS.tags();
+        return tags != null && tags.getTag(FHTags.Blocks.SCAFFOLDING.tag).stream().anyMatch(b -> context.isHoldingItem(b.asItem()));
+    }
+
     public static FastEnumMap<Direction, BlockPos> getNeighbors(BlockPos pos) {
         FastEnumMap<Direction, BlockPos> map = new FastEnumMap<>(Direction.values());
         for (Direction dir : Direction.values()) {
             map.put(dir, pos.relative(dir));
         }
         return map;
     }
-
-    public static class ScaffoldingPlacementHelper implements IPlacementHelper {
-
-        @Override
-        public Predicate<ItemStack> getItemPredicate() {
-            return i -> i.getItem() instanceof BlockItem
-                    && ((BlockItem) i.getItem()).getBlock() instanceof FHScaffoldingBlock;
-        }
-
-        @Override
-        public Predicate<BlockState> getStatePredicate() {
-            return FHScaffoldingBlock::isScaffolding;
-        }
-
-        private boolean canExtendToward(BlockState state, Direction side) {
-            return getStatePredicate().test(state) && side.getAxis() == Direction.Axis.Y;
-        }
-
-        private int attachedBlocks(Level world, BlockPos pos, Direction direction) {
-            BlockPos checkPos = pos.relative(direction);
-            int count = 0;
-            while (getStatePredicate().test(world.getBlockState(checkPos))) {
-                count++;
-                checkPos = checkPos.relative(direction);
-            }
-            return count;
-        }
-
-        @Override
-        public PlacementOffset getOffset(Player player, Level world, BlockState state, BlockPos pos, BlockHitResult ray) {
-            List<Direction> directions;
-
-            if (player != null && ray.getDirection() == Direction.UP) {
-                Direction facing = player.getDirection();
-                directions = List.of(facing);
-            } else {
-                directions = IPlacementHelper.orderedByDistance(pos, ray.getLocation(),
-                        dir -> canExtendToward(state, dir));
-            }
-
-            int range = AllConfigs.server().equipment.placementAssistRange.get();
-            if (player != null) {
-                AttributeInstance reach = player.getAttribute(ForgeMod.BLOCK_REACH.get());
-                if (reach != null && reach.hasModifier(ExtendoGripItem.singleRangeAttributeModifier))
-                    range += 4;
-            }
-
-            for (Direction dir : directions) {
-                int poles = attachedBlocks(world, pos, dir);
-                if (poles >= range)
-                    continue;
-
-                BlockPos newPos = pos.relative(dir, poles + 1);
-                int newY = newPos.getY();
-                if (newY <= world.getMinBuildHeight() || newY >= world.getMaxBuildHeight())
-                    continue;
-                BlockState newState = world.getBlockState(newPos);
-                if (!newState.canBeReplaced())
-                    continue;
-
-                return PlacementOffset.success(newPos,
-                        bState -> calcState(bState, newPos, world));
-            }
-
-            return PlacementOffset.fail();
-        }
-    }
 }

src/main/java/com/teammoeg/frostedheart/content/decoration/FHScaffoldingBlockItem.java

@@ -0,0 +1,132 @@
+package com.teammoeg.frostedheart.content.decoration;
+
+import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
+import com.simibubi.create.foundation.mixin.accessor.UseOnContextAccessor;
+import com.simibubi.create.foundation.placement.IPlacementHelper;
+import com.simibubi.create.foundation.placement.PlacementHelpers;
+import com.simibubi.create.foundation.placement.PlacementOffset;
+import com.simibubi.create.infrastructure.config.AllConfigs;
+import com.teammoeg.frostedheart.item.FHBlockItem;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraftforge.common.ForgeMod;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.function.Predicate;
+
+public class FHScaffoldingBlockItem extends FHBlockItem {
+
+    public FHScaffoldingBlockItem(Block pBlock, Properties pProperties) {
+        super(pBlock, pProperties);
+    }
+
+    @Override
+    public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) {
+        var result = helperPlace(stack, context, PLACEMENT_HELPER_ID);
+        if (result != null) return result;
+
+        return super.onItemUseFirst(stack, context);
+    }
+
+    @Nullable
+    public static InteractionResult helperPlace(ItemStack stack, UseOnContext context, int helperId) {
+        var player = context.getPlayer();
+        if (player != null && !player.isShiftKeyDown()) {
+            var level = context.getLevel();
+            var pos = context.getClickedPos();
+            var state = level.getBlockState(pos);
+            IPlacementHelper helper = PlacementHelpers.get(helperId);
+            if (helper.matchesItem(stack) && helper.matchesState(state)) {
+                var hit = ((UseOnContextAccessor)context).create$getHitResult();
+                var result = helper.getOffset(player, level, state, pos, hit)
+                        .placeInWorld(level, (BlockItem) stack.getItem(), player, context.getHand(), hit);
+                if (result == InteractionResult.PASS) {
+                    return InteractionResult.FAIL;
+                }
+                return result;
+            }
+        }
+
+        return null;
+    }
+
+    public static final int PLACEMENT_HELPER_ID = PlacementHelpers.register(new ScaffoldingPlacementHelper());
+
+    public static class ScaffoldingPlacementHelper implements IPlacementHelper {
+
+        @Override
+        public Predicate<ItemStack> getItemPredicate() {
+            return i -> i.getItem() instanceof BlockItem
+                    && ((BlockItem) i.getItem()).getBlock() instanceof FHScaffoldingBlock;
+        }
+
+        @Override
+        public Predicate<BlockState> getStatePredicate() {
+            return FHScaffoldingBlock::isScaffolding;
+        }
+
+        private boolean canExtendToward(BlockState state, Direction side) {
+            return getStatePredicate().test(state) && side.getAxis() == Direction.Axis.Y;
+        }
+
+        private int attachedBlocks(Level world, BlockPos pos, Direction direction) {
+            BlockPos checkPos = pos.relative(direction);
+            int count = 0;
+            while (getStatePredicate().test(world.getBlockState(checkPos))) {
+                count++;
+                checkPos = checkPos.relative(direction);
+            }
+            return count;
+        }
+
+        @Override
+        public PlacementOffset getOffset(Player player, Level world, BlockState state, BlockPos pos, BlockHitResult ray) {
+            List<Direction> directions;
+
+            if (player != null && ray.getDirection() == Direction.UP) {
+                Direction facing = player.getDirection();
+                directions = List.of(facing);
+            } else {
+                directions = IPlacementHelper.orderedByDistance(pos, ray.getLocation(),
+                        dir -> canExtendToward(state, dir));
+            }
+
+            int range = AllConfigs.server().equipment.placementAssistRange.get();
+            if (player != null) {
+                AttributeInstance reach = player.getAttribute(ForgeMod.BLOCK_REACH.get());
+                if (reach != null && reach.hasModifier(ExtendoGripItem.singleRangeAttributeModifier))
+                    range += 4;
+            }
+
+            for (Direction dir : directions) {
+                int poles = attachedBlocks(world, pos, dir);
+                if (poles >= range)
+                    continue;
+
+                BlockPos newPos = pos.relative(dir, poles + 1);
+                int newY = newPos.getY();
+                if (newY <= world.getMinBuildHeight() || newY >= world.getMaxBuildHeight())
+                    continue;
+                BlockState newState = world.getBlockState(newPos);
+                if (!newState.canBeReplaced())
+                    continue;
+
+                return PlacementOffset.success(newPos,
+                        bState -> FHScaffoldingBlock.calcState(bState, newPos, world));
+            }
+
+            return PlacementOffset.fail();
+        }
+    }
+}