mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-15 00:12:53 +00:00

- Simplify how the turtle's inventory is processed. We now copy all items into the player inventory, attempt to place, and then copy the items back. This also fixes the problem where turtle.place() wouldn't (always) update the item which was placed. I'm also hoping this is more "correct" in how we process drops from entities and whatnot. Though I've not had any reports of issues, so it's probably fine. - Replace the "error message" string array with an actual object. It'd be nicer all these functions returned a TurtleCommandResult, but merging error messages from that is a little harder. Fun facts: the test suite was actually helpful here, and caught the fact that hoeing was broken!
155 lines
5.7 KiB
Java
155 lines
5.7 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
package dan200.computercraft.shared.turtle.core;
|
|
|
|
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
import dan200.computercraft.api.turtle.ITurtleCommand;
|
|
import dan200.computercraft.api.turtle.TurtleAnimation;
|
|
import dan200.computercraft.api.turtle.TurtleCommandResult;
|
|
import dan200.computercraft.api.turtle.event.TurtleInventoryEvent;
|
|
import dan200.computercraft.shared.util.InventoryUtil;
|
|
import net.minecraft.entity.item.ItemEntity;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.util.Direction;
|
|
import net.minecraft.util.EntityPredicates;
|
|
import net.minecraft.util.math.AxisAlignedBB;
|
|
import net.minecraft.util.math.BlockPos;
|
|
import net.minecraft.world.World;
|
|
import net.minecraftforge.common.MinecraftForge;
|
|
import net.minecraftforge.items.IItemHandler;
|
|
|
|
import javax.annotation.Nonnull;
|
|
import java.util.List;
|
|
|
|
public class TurtleSuckCommand implements ITurtleCommand
|
|
{
|
|
private final InteractDirection direction;
|
|
private final int quantity;
|
|
|
|
public TurtleSuckCommand( InteractDirection direction, int quantity )
|
|
{
|
|
this.direction = direction;
|
|
this.quantity = quantity;
|
|
}
|
|
|
|
@Nonnull
|
|
@Override
|
|
public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle )
|
|
{
|
|
// Sucking nothing is easy
|
|
if( quantity == 0 )
|
|
{
|
|
turtle.playAnimation( TurtleAnimation.WAIT );
|
|
return TurtleCommandResult.success();
|
|
}
|
|
|
|
// Get world direction from direction
|
|
Direction direction = this.direction.toWorldDir( turtle );
|
|
|
|
// Get inventory for thing in front
|
|
World world = turtle.getWorld();
|
|
BlockPos turtlePosition = turtle.getPosition();
|
|
BlockPos blockPosition = turtlePosition.relative( direction );
|
|
Direction side = direction.getOpposite();
|
|
|
|
IItemHandler inventory = InventoryUtil.getInventory( world, blockPosition, side );
|
|
|
|
// Fire the event, exiting if it is cancelled.
|
|
TurtlePlayer player = TurtlePlayer.getWithPosition( turtle, turtlePosition, direction );
|
|
TurtleInventoryEvent.Suck event = new TurtleInventoryEvent.Suck( turtle, player, world, blockPosition, inventory );
|
|
if( MinecraftForge.EVENT_BUS.post( event ) )
|
|
{
|
|
return TurtleCommandResult.failure( event.getFailureMessage() );
|
|
}
|
|
|
|
if( inventory != null )
|
|
{
|
|
// Take from inventory of thing in front
|
|
ItemStack stack = InventoryUtil.takeItems( quantity, inventory );
|
|
if( stack.isEmpty() ) return TurtleCommandResult.failure( "No items to take" );
|
|
|
|
// Try to place into the turtle
|
|
ItemStack remainder = InventoryUtil.storeItems( stack, turtle.getItemHandler(), turtle.getSelectedSlot() );
|
|
if( !remainder.isEmpty() )
|
|
{
|
|
// Put the remainder back in the inventory
|
|
InventoryUtil.storeItems( remainder, inventory );
|
|
}
|
|
|
|
// Return true if we consumed anything
|
|
if( remainder != stack )
|
|
{
|
|
turtle.playAnimation( TurtleAnimation.WAIT );
|
|
return TurtleCommandResult.success();
|
|
}
|
|
else
|
|
{
|
|
return TurtleCommandResult.failure( "No space for items" );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Suck up loose items off the ground
|
|
AxisAlignedBB aabb = new AxisAlignedBB(
|
|
blockPosition.getX(), blockPosition.getY(), blockPosition.getZ(),
|
|
blockPosition.getX() + 1.0, blockPosition.getY() + 1.0, blockPosition.getZ() + 1.0
|
|
);
|
|
List<ItemEntity> list = world.getEntitiesOfClass( ItemEntity.class, aabb, EntityPredicates.ENTITY_STILL_ALIVE );
|
|
if( list.isEmpty() ) return TurtleCommandResult.failure( "No items to take" );
|
|
|
|
for( ItemEntity entity : list )
|
|
{
|
|
// Suck up the item
|
|
ItemStack stack = entity.getItem().copy();
|
|
|
|
ItemStack storeStack;
|
|
ItemStack leaveStack;
|
|
if( stack.getCount() > quantity )
|
|
{
|
|
storeStack = stack.split( quantity );
|
|
leaveStack = stack;
|
|
}
|
|
else
|
|
{
|
|
storeStack = stack;
|
|
leaveStack = ItemStack.EMPTY;
|
|
}
|
|
|
|
ItemStack remainder = InventoryUtil.storeItems( storeStack, turtle.getItemHandler(), turtle.getSelectedSlot() );
|
|
|
|
if( remainder != storeStack )
|
|
{
|
|
if( remainder.isEmpty() && leaveStack.isEmpty() )
|
|
{
|
|
entity.remove();
|
|
}
|
|
else if( remainder.isEmpty() )
|
|
{
|
|
entity.setItem( leaveStack );
|
|
}
|
|
else if( leaveStack.isEmpty() )
|
|
{
|
|
entity.setItem( remainder );
|
|
}
|
|
else
|
|
{
|
|
leaveStack.grow( remainder.getCount() );
|
|
entity.setItem( leaveStack );
|
|
}
|
|
|
|
// Play fx
|
|
world.globalLevelEvent( 1000, turtlePosition, 0 ); // BLOCK_DISPENSER_DISPENSE
|
|
turtle.playAnimation( TurtleAnimation.WAIT );
|
|
return TurtleCommandResult.success();
|
|
}
|
|
}
|
|
|
|
|
|
return TurtleCommandResult.failure( "No space for items" );
|
|
}
|
|
}
|
|
}
|