tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

improved take command wording

Browse source 
Command wording now goes Take ID:Meta amount
ex Take 1:0 10
ex Take 5 20
This commit is contained in:
Robert Seifert 2013-05-25 23:36:55 -04:00
parent 42d292163f
commit 0d8c6560c4
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/minecraft/assemblyline/common/armbot/command/CommandTake.java
View file

@ -21,16 +21,22 @@ public class CommandTake extends Command
if (this.getArgs().length > 0)
{
id = this.getIntArg(0);
String block = this.getArg(0);
if (block.contains(":"))
{
String[] blockID = block.split(":");
id = Integer.parseInt(blockID[0]);
meta = Integer.parseInt(blockID[1]);
}
else
{
id = Integer.parseInt(block);
}
}
if (this.getArgs().length > 1)
{
count = this.getIntArg(1);
}
if (this.getArgs().length > 2)
{
meta = this.getIntArg(2);
}
if (id == 0)
{
stack = null;
@ -59,14 +65,15 @@ public class CommandTake extends Command
{
if (AutoCraftingManager.areStacksEqual(this.stack, slotStack) && inventory.canExtractItem(slots[i], this.stack, direction.getOpposite().ordinal()))
{
this.stack.stackSize = Math.min(this.stack.stackSize, slotStack.stackSize);
this.tileEntity.grabItem(this.stack);
inventory.setInventorySlotContents(slots[i], AutoCraftingManager.decrStackSize(slotStack, this.stack.stackSize));
ItemStack insertStack = this.stack.copy();
insertStack.stackSize = Math.min(this.stack.stackSize, slotStack.stackSize);
this.tileEntity.grabItem(insertStack);
inventory.setInventorySlotContents(slots[i], AutoCraftingManager.decrStackSize(slotStack, insertStack.stackSize));
return false;
}
}
}
}//TODO add a way to steal items from players
}// TODO add a way to steal items from players
}
return true;
@ -75,7 +82,7 @@ public class CommandTake extends Command
@Override
public String toString()
{
return "Take " + (stack != null ? stack.toString() : "1x???@???");
return "Take " + (stack != null ? stack.toString() : "1x???@??? ")+this.tileEntity.getGrabbedItems().size();
}
@Override