run through remap script

This commit is contained in:
Progwml6 committed 2014-02-05 08:28:53 -05:00
1 parent 689aeba09b
commit b8cf7cdc5e
208 files changed
+4117 -4117

No files matched your search

+16 -16
View File
@@ -24,9 +24,9 @@ public class StoneTorch extends MantleBlock
{
public StoneTorch()
{
super(Material.field_151594_q);
this.func_149647_a(CreativeTabs.tabDecorations);
func_149715_a(0.9375F);
super(Material.circuits);
this.setCreativeTab(CreativeTabs.tabDecorations);
setLightLevel(0.9375F);
}
/**
@@ -68,13 +68,13 @@ public class StoneTorch extends MantleBlock
*/
private boolean canPlaceTorchOn (World par1World, int par2, int par3, int par4)
{
if (par1World.func_147466_a(par1World, par2, par3, par4))
if (par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3, par4))
{
return true;
}
else
{
Block b = par1World.func_147439_a(par2, par3, par4);
Block b = par1World.getBlock(par2, par3, par4);
return (b != null && b.canPlaceTorchOnTop(par1World, par2, par3, par4));
}
}
@@ -149,9 +149,9 @@ public class StoneTorch extends MantleBlock
}
@SideOnly(Side.CLIENT)
public void func_149651_a (IIconRegister par1IconRegister)
public void registerBlockIcons (IIconRegister par1IconRegister)
{
this.field_149761_L = par1IconRegister.registerIcon("tinker:torch_stone");
this.blockIcon = par1IconRegister.registerIcon("tinker:torch_stone");
}
/**
@@ -197,7 +197,7 @@ public class StoneTorch extends MantleBlock
if (flag)
{
this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
return true;
}
else
@@ -219,9 +219,9 @@ public class StoneTorch extends MantleBlock
{
if (!this.canPlaceBlockAt(par1World, par2, par3, par4))
{
if (par1World.func_147439_a(par2, par3, par4) == (Block) this)
if (par1World.getBlock(par2, par3, par4) == (Block) this)
{
this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
WorldHelper.setBlockToAir(par1World, par2, par3, par4);
}
@@ -244,27 +244,27 @@ public class StoneTorch extends MantleBlock
if (l == 1)
{
this.func_149676_a(0.0F, 0.2F, 0.5F - f, f * 2.0F, 0.8F, 0.5F + f);
this.setBlockBounds(0.0F, 0.2F, 0.5F - f, f * 2.0F, 0.8F, 0.5F + f);
}
else if (l == 2)
{
this.func_149676_a(1.0F - f * 2.0F, 0.2F, 0.5F - f, 1.0F, 0.8F, 0.5F + f);
this.setBlockBounds(1.0F - f * 2.0F, 0.2F, 0.5F - f, 1.0F, 0.8F, 0.5F + f);
}
else if (l == 3)
{
this.func_149676_a(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F);
this.setBlockBounds(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F);
}
else if (l == 4)
{
this.func_149676_a(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F);
this.setBlockBounds(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F);
}
else
{
f = 0.1F;
this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
}
return super.func_149731_a(par1World, par2, par3, par4, par5Vec3, par6Vec3);
return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3);
}
@SideOnly(Side.CLIENT)