Cleaning up worms some more.

This commit is contained in:
Flanks255 2023-05-15 19:23:26 -05:00
parent 097803020c
commit 1fb8b80ee4

View file

@ -38,38 +38,40 @@ public class ItemWorm extends ItemBase {
public ActionResultType useOn(ItemUseContext context) { public ActionResultType useOn(ItemUseContext context) {
BlockPos pos = context.getClickedPos(); BlockPos pos = context.getClickedPos();
ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); ItemStack stack = context.getPlayer().getItemInHand(context.getHand());
BlockState state = context.getLevel().getBlockState(pos); World level = context.getLevel();
if (EntityWorm.canWormify(context.getLevel(), context.getClickedPos(), state)) { BlockState state = level.getBlockState(pos);
List<EntityWorm> worms = context.getLevel().getEntitiesOfClass(EntityWorm.class, new AxisAlignedBB(pos.getX() - 1, pos.getY(), pos.getZ() - 1, pos.getX() + 2, pos.getY() + 1, pos.getZ() + 2));
if (worms.isEmpty()) { if (level.isClientSide || !EntityWorm.canWormify(level, context.getClickedPos(), state))
if (!context.getLevel().isClientSide) { return super.useOn(context);
EntityWorm worm = new EntityWorm(ActuallyAdditions.ENTITY_WORM.get(), context.getLevel());
worm.setPos(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); List<EntityWorm> worms = level.getEntitiesOfClass(EntityWorm.class, new AxisAlignedBB(pos.getX() - 1, pos.getY(), pos.getZ() - 1, pos.getX() + 2, pos.getY() + 1, pos.getZ() + 2));
worm.setCustomName(stack.getHoverName()); if (!worms.isEmpty())
context.getLevel().addFreshEntity(worm); return super.useOn(context);
if (!context.getPlayer().isCreative()) {
stack.shrink(1); EntityWorm worm = new EntityWorm(ActuallyAdditions.ENTITY_WORM.get(), level);
} worm.setPos(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
} worm.setCustomName(stack.getHoverName());
return ActionResultType.SUCCESS; level.addFreshEntity(worm);
} if (!context.getPlayer().isCreative())
} stack.shrink(1);
return super.useOn(context);
return ActionResultType.SUCCESS;
} }
public static void onHoe(UseHoeEvent event) { public static void onHoe(UseHoeEvent event) {
if (CommonConfig.Other.WORMS.get() && event.getResult() != Event.Result.DENY) { World level = event.getEntity().level;
World world = event.getEntity().level;
if (!world.isClientSide) { if (level.isClientSide || !CommonConfig.Other.WORMS.get() || event.getResult() == Event.Result.DENY)
BlockPos pos = event.getContext().getClickedPos(); return;
if (world.isEmptyBlock(pos.above())) {
BlockState state = world.getBlockState(pos); BlockPos pos = event.getContext().getClickedPos();
if (state.getBlock() == Blocks.GRASS_BLOCK && world.random.nextFloat() >= 0.95F) { if (level.isEmptyBlock(pos.above())) {
ItemStack stack = new ItemStack(ActuallyItems.WORM.get(), world.random.nextInt(2) + 1); BlockState state = level.getBlockState(pos);
ItemEntity item = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, stack); if (state.getBlock() == Blocks.GRASS_BLOCK && level.random.nextFloat() >= 0.95F) {
world.addFreshEntity(item); ItemStack stack = new ItemStack(ActuallyItems.WORM.get(), level.random.nextInt(2) + 1);
} ItemEntity item = new ItemEntity(level, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, stack);
}
level.addFreshEntity(item);
} }
} }
} }