diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java b/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java index 390ec37d..af81de98 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java +++ b/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java @@ -6,16 +6,20 @@ import java.util.Set; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; +import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.assemblyline.blocks.BlockAssembly; import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; import com.builtbroken.assemblyline.client.render.RenderArmbot; import com.builtbroken.common.Pair; +import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.interfaces.IMultiBlock; import cpw.mods.fml.relauncher.Side; @@ -26,6 +30,7 @@ public class BlockArmbot extends BlockAssembly public BlockArmbot() { super("armbot", UniversalElectricity.machine); + DarkCore.requestMultiBlock(AssemblyLine.MOD_ID); } @Override @@ -67,6 +72,12 @@ public class BlockArmbot extends BlockAssembly super.breakBlock(world, x, y, z, par5, par6); } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) + { + return new ItemStack(this); + } + @Override public int quantityDropped(Random par1Random) { diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java b/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java index 41e260cb..cef37a5e 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java +++ b/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java @@ -347,10 +347,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, @Override public void onCreate(Vector3 placedPosition) { - if (DarkCore.multiBlock instanceof BlockMulti) - { - DarkCore.multiBlock.makeFakeBlock(this.worldObj, Vector3.translate(placedPosition, new Vector3(0, 1, 0)), placedPosition); - } + DarkCore.multiBlock.makeFakeBlock(this.worldObj, Vector3.translate(placedPosition, new Vector3(0, 1, 0)), new Vector3(this)); } @Override @@ -363,7 +360,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, @Override public String getType() { - return "ArmBot"; + return "Armbot"; } @Override