From 3209d1c6714efd27b2803fcf1bbbf7b1f1462029 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sat, 3 Aug 2013 14:36:48 -0400 Subject: [PATCH] Fixed placement rotation! --- .../contractor/BlockEMContractor.java | 20 ------------------- .../contractor/ItemBlockContractor.java | 16 +++++++++++++++ .../contractor/TileEntityEMContractor.java | 2 +- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/resonantinduction/contractor/BlockEMContractor.java b/src/resonantinduction/contractor/BlockEMContractor.java index 0fb183d6..dd4f9389 100644 --- a/src/resonantinduction/contractor/BlockEMContractor.java +++ b/src/resonantinduction/contractor/BlockEMContractor.java @@ -31,26 +31,6 @@ public class BlockEMContractor extends BlockBase implements ITileEntityProvider return BlockRenderingHandler.INSTANCE.getRenderId(); } - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - TileEntityEMContractor tileContractor = (TileEntityEMContractor)world.getBlockTileEntity(x, y, z); - - if(!tileContractor.isLatched()) - { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity tileEntity = world.getBlockTileEntity(x+side.offsetX, y+side.offsetY, z+side.offsetZ); - - if(tileEntity instanceof IInventory) - { - tileContractor.setFacing(side.getOpposite()); - return; - } - } - } - } - @Override public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { diff --git a/src/resonantinduction/contractor/ItemBlockContractor.java b/src/resonantinduction/contractor/ItemBlockContractor.java index 9323e35c..9ca49d3e 100644 --- a/src/resonantinduction/contractor/ItemBlockContractor.java +++ b/src/resonantinduction/contractor/ItemBlockContractor.java @@ -1,8 +1,10 @@ package resonantinduction.contractor; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; @@ -22,6 +24,20 @@ public class ItemBlockContractor extends ItemBlock { TileEntityEMContractor tileContractor = (TileEntityEMContractor)world.getBlockTileEntity(x, y, z); tileContractor.setFacing(ForgeDirection.getOrientation(side)); + + if(!tileContractor.isLatched()) + { + for(ForgeDirection side1 : ForgeDirection.VALID_DIRECTIONS) + { + TileEntity tileEntity = world.getBlockTileEntity(x+side1.offsetX, y+side1.offsetY, z+side1.offsetZ); + + if(tileEntity instanceof IInventory) + { + tileContractor.setFacing(side1.getOpposite()); + break; + } + } + } } return place; diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/contractor/TileEntityEMContractor.java index 6a38e27f..e2a8d7ee 100644 --- a/src/resonantinduction/contractor/TileEntityEMContractor.java +++ b/src/resonantinduction/contractor/TileEntityEMContractor.java @@ -242,7 +242,7 @@ public class TileEntityEMContractor extends TileEntity implements IPacketReceive if(!worldObj.isRemote) { - PacketHandler.sendTileEntityPacketToClients(this, getNetworkedData(new ArrayList())); + PacketHandler.sendTileEntityPacketToClients(this, getNetworkedData(new ArrayList()).toArray()); } updateBounds();