Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development

Browse source 
Conflicts:
	mechanical/src/main/java/resonantinduction/mechanical/process/edit/TilePlacer.java
This commit is contained in:
tgame14 2014-03-19 17:16:42 +02:00
commit 4c706045fe
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mechanical/src/main/java/resonantinduction/mechanical/process/edit/TilePlacer.java
View file

@ -6,7 +6,10 @@ import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.prefab.tile.IRotatable;
import calclavia.lib.render.RenderItemOverlayUtility;
<<<<<<< HEAD
import calclavia.lib.utility.inventory.InventoryUtility;
=======
>>>>>>> 274dfa07f76b33f8ffb4a1d1967ea6d904d56dcf
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -17,15 +20,18 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
<<<<<<< HEAD
import net.minecraft.tileentity.TileEntity;
=======
>>>>>>> 274dfa07f76b33f8ffb4a1d1967ea6d904d56dcf
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.ResonantInduction;
import universalelectricity.api.vector.Vector3;
/**
* @since 18/03/14
* @author tgame14
* @since 18/03/14
*/
public class TilePlacer extends TileInventory implements IRotatable, IPacketReceiver
{
@ -61,6 +67,7 @@ public class TilePlacer extends TileInventory implements IRotatable, IPacketRece
ForgeDirection op = dir.getOpposite();
TileEntity tile = getWorldObj().getBlockTileEntity(x() + op.offsetX, y() + op.offsetY, z() + op.offsetZ);
<<<<<<< HEAD
if (tile instanceof IInventory)
{
ItemStack candidate = InventoryUtility.takeTopItemFromInventory((IInventory) tile, dir.ordinal());
@ -69,6 +76,22 @@ public class TilePlacer extends TileInventory implements IRotatable, IPacketRece
}
}
placeStack = getStackInSlot(0);
=======
@Override
protected boolean use(EntityPlayer player, int hitSide, Vector3 hit)
{
interactCurrentItem(this, 0, player);
return true;
}
public void work()
{
if (isIndirectlyPowered())
{
ForgeDirection dir = getDirection();
Vector3 check = position().translate(dir);
ItemStack placeStack = getStackInSlot(0);
>>>>>>> 274dfa07f76b33f8ffb4a1d1967ea6d904d56dcf
if (world().isAirBlock(check.intX(), check.intY(), check.intZ()) && placeStack != null && placeStack.getItem() instanceof ItemBlock)
{