diff --git a/src/minecraft/assemblyline/api/IArmbotUseable.java b/src/minecraft/assemblyline/api/IArmbotUseable.java index 22b6151e5..101cde7ff 100644 --- a/src/minecraft/assemblyline/api/IArmbotUseable.java +++ b/src/minecraft/assemblyline/api/IArmbotUseable.java @@ -15,6 +15,8 @@ public interface IArmbotUseable * touching. * * @param armbot - The Armbot instance. + * + * @return true if the use was completed correctly */ public boolean onUse(IArmbot armbot, String[] args); diff --git a/src/minecraft/assemblyline/common/armbot/command/CommandGive.java b/src/minecraft/assemblyline/common/armbot/command/CommandGive.java index 52f8c3551..2e85c256f 100644 --- a/src/minecraft/assemblyline/common/armbot/command/CommandGive.java +++ b/src/minecraft/assemblyline/common/armbot/command/CommandGive.java @@ -2,7 +2,6 @@ package assemblyline.common.armbot.command; import java.util.Iterator; -import universalelectricity.core.vector.Vector3; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/minecraft/assemblyline/common/armbot/command/CommandTake.java b/src/minecraft/assemblyline/common/armbot/command/CommandTake.java index fb9db385e..56e5d43b0 100644 --- a/src/minecraft/assemblyline/common/armbot/command/CommandTake.java +++ b/src/minecraft/assemblyline/common/armbot/command/CommandTake.java @@ -1,6 +1,5 @@ package assemblyline.common.armbot.command; -import net.minecraft.block.Block; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -82,7 +81,7 @@ public class CommandTake extends Command @Override public String toString() { - return "Take " + (stack != null ? stack.toString() : "1x???@??? ")+this.tileEntity.getGrabbedItems().size(); + return "Take " + (stack != null ? stack.toString() : "1x???@??? "); } @Override diff --git a/src/minecraft/assemblyline/common/armbot/command/CommandUse.java b/src/minecraft/assemblyline/common/armbot/command/CommandUse.java index 6ab7ae188..2d8e31ba8 100644 --- a/src/minecraft/assemblyline/common/armbot/command/CommandUse.java +++ b/src/minecraft/assemblyline/common/armbot/command/CommandUse.java @@ -3,7 +3,6 @@ package assemblyline.common.armbot.command; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ISidedInventory; import assemblyline.api.IArmbotUseable; public class CommandUse extends Command @@ -57,7 +56,9 @@ public class CommandUse extends Command this.curTimes++; if (this.curTimes >= this.times) + { return false; + } return true; } diff --git a/src/minecraft/assemblyline/common/block/TileEntityCrate.java b/src/minecraft/assemblyline/common/block/TileEntityCrate.java index 2b3350f95..83b934a22 100644 --- a/src/minecraft/assemblyline/common/block/TileEntityCrate.java +++ b/src/minecraft/assemblyline/common/block/TileEntityCrate.java @@ -9,11 +9,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityHopper; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import universalelectricity.prefab.implement.ITier; import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.network.PacketManager; diff --git a/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java b/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java index b13c6b668..7e0ee98f7 100644 --- a/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java +++ b/src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java @@ -1,7 +1,6 @@ package assemblyline.common.imprinter; import java.util.ArrayList; -import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -15,7 +14,6 @@ import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; @@ -428,6 +426,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv armbot.grabItem(this.imprinterMatrix[craftingOutputSlot].copy()); this.onPickUpFromSlot(null, 2, this.imprinterMatrix[craftingOutputSlot]); this.imprinterMatrix[craftingOutputSlot] = null; + return true; } return false;