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

Fixed an issue with armbot multi-block

Browse source
This commit is contained in:
Robert 2013-12-26 06:28:06 -05:00
parent 9fefb7997c
commit 1f80e35b79
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java
View file

@ -6,16 +6,20 @@ import java.util.Set;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import universalelectricity.api.UniversalElectricity; import universalelectricity.api.UniversalElectricity;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.blocks.BlockAssembly; import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
import com.builtbroken.assemblyline.client.render.RenderArmbot; import com.builtbroken.assemblyline.client.render.RenderArmbot;
import com.builtbroken.common.Pair; import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.interfaces.IMultiBlock; import com.builtbroken.minecraft.interfaces.IMultiBlock;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -26,6 +30,7 @@ public class BlockArmbot extends BlockAssembly
public BlockArmbot() public BlockArmbot()
{ {
super("armbot", UniversalElectricity.machine); super("armbot", UniversalElectricity.machine);
DarkCore.requestMultiBlock(AssemblyLine.MOD_ID);
} }
@Override @Override
@ -67,6 +72,12 @@ public class BlockArmbot extends BlockAssembly
super.breakBlock(world, x, y, z, par5, par6); 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 @Override
public int quantityDropped(Random par1Random) public int quantityDropped(Random par1Random)
{ {

7
src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java
View file

@ -347,10 +347,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
@Override @Override
public void onCreate(Vector3 placedPosition) public void onCreate(Vector3 placedPosition)
{ {
if (DarkCore.multiBlock instanceof BlockMulti) DarkCore.multiBlock.makeFakeBlock(this.worldObj, Vector3.translate(placedPosition, new Vector3(0, 1, 0)), new Vector3(this));
{
DarkCore.multiBlock.makeFakeBlock(this.worldObj, Vector3.translate(placedPosition, new Vector3(0, 1, 0)), placedPosition);
}
} }
@Override @Override
@ -363,7 +360,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
@Override @Override
public String getType() public String getType()
{ {
return "ArmBot"; return "Armbot";
} }
@Override @Override