Fix some bugs,and add diyos BattleSigns

resources/assets/tinker/lang/en_US.lang

@@ -1,6 +1,7 @@
 itemGroup.TConstructTools=TConstruct Tools
 itemGroup.TConstructMaterials=TConstruct Materials
 itemGroup.TConstructBlocks=TConstruct Blocks
+itemGroup.TConstructParts=TConstruct Tool Parts
 
 crafters.ToolStation=Tool Station
 crafters.ToolForge=Tool Forge
@@ -500,6 +501,7 @@ item.tconstruct.canister.yellow.name=Yellow Heart Canister
 item.tconstruct.canister.miniheart.green.name=Miniature Green Heart
 item.tconstruct.canister.green.name=Green Heart Canister
 item.tconstruct.glove.name=Dirtmover Gloves
+item.tconstruct.modifier.creative.name=Creative Tool Modifier
 
 SearedBlock.Table.name=Casting Table
 SearedBlock.Faucet.name=Seared Faucet
@@ -734,4 +736,6 @@ gui.toolstation16=Usage Speed:
 gui.toolstation17=Modifiers
 gui.toolstation18=Modifiers remaining: 
 
+creativeModLock.tooltip=Target Lock: 
+
 attribute.generic.ammo.attackDamage=Average Shot Damage

resources/assets/tinker/manuals/materials.xml

@@ -11,7 +11,6 @@ By Skyla</text>
 
 <page type="contents">
 <text>Table of Contents</text>
-<text>Table of Contents</text>
 <link>
  <text>Tools</text>
  <icon>ironpick</icon>
@@ -1052,6 +1051,22 @@ Stackable: No</text>
 <recipe>tier1free</recipe>
 </page>
 
+<page type="sectionpage">
+<title>Additional Modifiers</title>
+<text>Attaching a solid gold apple and encrusting the tool with a block of diamond warps the tool in places you did not notice before.
+
+Effects:
+- Adds an additional modifier slot to the tool
+
+Type: Single-use
+Stackable: No</text>
+</page>
+
+<page type="modifier">
+<tooltype>tool</tooltype>
+<recipe>tier1.5free</recipe>
+</page>
+
 <page type="sectionpage">
 <title>Additional Modifiers</title>
 <text>Working the tool with a nether star gives it the ability to attach parts they would not otherwise stay.
@@ -1068,4 +1083,21 @@ Stackable: No</text>
 <recipe>tier2free</recipe>
 </page>
 
-</book>
+<page type="sectionpage">
+<title>Additional Modifiers</title>
+<text>For the creative types or the map makers in the world, this item is for you.
+
+Effects:
+- Adds an additional modifier slot to the tool
+- If it has a target lock, it will only work on that tool.
+
+Type: Single-use
+Stackable: Yes</text>
+</page>
+
+<page type="modifier">
+<tooltype>tool</tooltype>
+<recipe>creativefree</recipe>
+</page>
+
+</book>

src/main/java/tconstruct/TConstruct.java

@@ -109,6 +109,7 @@ public void preInit (FMLPreInitializationEvent event)
         PHConstruct.initProps(event.getSuggestedConfigurationFile());
         TConstructRegistry.materialTab = new TabTools("TConstructMaterials");
         TConstructRegistry.toolTab = new TabTools("TConstructTools");
+        TConstructRegistry.partTab = new TabTools("TConstructParts");  
         TConstructRegistry.blockTab = new TabTools("TConstructBlocks");
 
         tableCasting = new LiquidCasting();

src/main/java/tconstruct/blocks/LiquidMetalFinite.java

@@ -9,10 +9,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
+import tconstruct.common.TContent;
 import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class LiquidMetalFinite extends BlockFluidFinite
 {
@@ -41,7 +40,6 @@ public void registerBlockIcons (IIconRegister iconRegister)
     }
 
     @Override
-    @SideOnly(Side.CLIENT)
     public IIcon getIcon (int side, int meta)
     {
         if (side == 0 || side == 1)
@@ -59,7 +57,7 @@ public void onEntityCollidedWithBlock (World par1World, int x, int y, int z, Ent
         }
         if (!(entity instanceof EntityItem) && !entity.isImmuneToFire())
         {
-            entity.attackEntityFrom(DamageSource.lava, 4);
+            entity.attackEntityFrom(DamageSource.lava, 4.0F);
             entity.setFire(15);
         }
     }

src/main/java/tconstruct/blocks/SearedBlock.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import mantle.blocks.abstracts.InventoryBlock;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -360,7 +361,8 @@ public boolean canConnectRedstone (IBlockAccess world, int x, int y, int z, int
         return world.getBlockMetadata(x, y, z) == 1;
     }
 
-    public void onNeighborBlockChange (World world, int x, int y, int z, int neighborBlockID)
+    @Override
+    public void onNeighborBlockChange (World world, int x, int y, int z, Block neighborBlock)
     {
         if (world.isBlockIndirectlyGettingPowered(x, y, z) && world.getBlockMetadata(x, y, z) == 1)
         {

src/main/java/tconstruct/blocks/SmelteryBlock.java

@@ -295,9 +295,9 @@ public void getSubBlocks (Item id, CreativeTabs tab, List list)
 
     /* Updating */
     @Override
-    public void onNeighborBlockChange (World world, int x, int y, int z, Block nBlockID)
+    public void onNeighborBlockChange (World world, int x, int y, int z, Block block)
     {
-        // System.out.println("Neighbor changed");
+        //System.out.println("Neighbor changed");
         TileEntity logic = world.getTileEntity(x, y, z);
         if (logic instanceof IServantLogic)
         {

src/main/java/tconstruct/blocks/StoneTorch.java

@@ -89,46 +89,25 @@ private boolean canPlaceTorchOn (World par1World, int par2, int par3, int par4)
      * Checks to see if its valid to put this block at the specified
      * coordinates. Args: world, x, y, z
      */
-    @Override
-    public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
+    @Override 
+    public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
     {
-        return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true)
-                || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4);
+        return par1World.isSideSolid(par2 - 1, par3, par4, EAST,  true) ||
+               par1World.isSideSolid(par2 + 1, par3, par4, WEST,  true) ||
+               par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) ||
+               par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) ||
+               canPlaceTorchOn(par1World, par2, par3 - 1, par4);
     }
 
     /**
      * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z,
      * side, hitX, hitY, hitZ, block metadata
      */
     @Override
-    public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9)
+    public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9)
     {
         int j1 = par9;
 
-        if (par5 == 0)
-        {
-            if (this.canPlaceTorchOn(par1World, par2, par3 - 1, par4))
-            {
-                j1 = 5;
-            }
-            else if (par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true))
-            {
-                j1 = 4;
-            }
-            else if (par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true))
-            {
-                j1 = 3;
-            }
-            else if (par1World.isSideSolid(par2 + 1, par3, par4, WEST, true))
-            {
-                j1 = 2;
-            }
-            else if (par1World.isSideSolid(par2 - 1, par3, par4, EAST, true))
-            {
-                j1 = 1;
-            }
-        }
-
         if (par5 == 1 && this.canPlaceTorchOn(par1World, par2, par3 - 1, par4))
         {
             j1 = 5;
@@ -156,6 +135,46 @@ else if (par1World.isSideSolid(par2 - 1, par3, par4, EAST, true))
 
         return j1;
     }
+
+    public void updateTick(World par1World, int par2, int par3, int par4, Random random)
+    {
+        super.updateTick(par1World, par2, par3, par4, random);
+
+        if (par1World.getBlockMetadata(par2, par3, par4) == 0)
+        {
+            this.onBlockAdded(par1World, par2, par3, par4);
+        }
+    }
+
+    // JAVADOC METHOD $$ func_149726_b
+    public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
+    {
+        if (p_149726_1_.getBlockMetadata(p_149726_2_, p_149726_3_, p_149726_4_) == 0)
+        {
+            if (p_149726_1_.isSideSolid(p_149726_2_ - 1, p_149726_3_, p_149726_4_, EAST, true))
+            {
+                p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 1, 2);
+            }
+            else if (p_149726_1_.isSideSolid(p_149726_2_ + 1, p_149726_3_, p_149726_4_, WEST, true))
+            {
+                p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 2, 2);
+            }
+            else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ - 1, SOUTH, true))
+            {
+                p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 3, 2);
+            }
+            else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ + 1, NORTH, true))
+            {
+                p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 4, 2);
+            }
+            else if (this.canPlaceTorchOn(p_149726_1_, p_149726_2_, p_149726_3_ - 1, p_149726_4_))
+            {
+                p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 5, 2);
+            }
+        }
+
+        this.dropTorchIfCantStay(p_149726_1_, p_149726_2_, p_149726_3_, p_149726_4_);
+    }
 
     @Override
     @SideOnly(Side.CLIENT)
@@ -169,12 +188,13 @@ public void registerBlockIcons (IIconRegister par1IconRegister)
      * neighbor changed (coordinates passed are their own) Args: x, y, z,
      * neighbor blockID
      */
-    public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, int par5)
+    @Override
+    public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5)
     {
         this.func_94397_d(par1World, par2, par3, par4, par5);
     }
-
-    protected boolean func_94397_d (World par1World, int par2, int par3, int par4, int par5)
+    
+    protected boolean func_94397_d(World par1World, int par2, int par3, int par4, Block par5)
     {
         if (this.dropTorchIfCantStay(par1World, par2, par3, par4))
         {
@@ -209,6 +229,7 @@ protected boolean func_94397_d (World par1World, int par2, int par3, int par4, i
             if (flag)
             {
                 this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
+                par1World.setBlockToAir(par2, par3, par4);
                 return true;
             }
             else
@@ -234,7 +255,8 @@ protected boolean dropTorchIfCantStay (World par1World, int par2, int par3, int
             if (par1World.getBlock(par2, par3, par4) == (Block) this)
             {
                 this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
-                WorldHelper.setBlockToAir(par1World, par2, par3, par4);
+                par1World.setBlockToAir(par2, par3, par4);
+                //WorldHelper.setBlockToAir(par1World, par2, par3, par4);
             }
 
             return false;

src/main/java/tconstruct/blocks/TConstructFluid.java

@@ -6,8 +6,6 @@
 import net.minecraftforge.fluids.BlockFluidClassic;
 import net.minecraftforge.fluids.Fluid;
 import tconstruct.library.TConstructRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class TConstructFluid extends BlockFluidClassic
 {
@@ -20,7 +18,6 @@ public TConstructFluid(Fluid fluid, Material material, String texture)
     {
         super(fluid, material);
         this.texture = texture;
-        // TODO setCreativeTab()
         this.setCreativeTab(TConstructRegistry.blockTab);
     }
 
@@ -36,21 +33,18 @@ public int getRenderBlockPass ()
         return alpha ? 1 : 0;
     }
 
-    // TODO registerBlockIcons
     @Override
     public void registerBlockIcons (IIconRegister iconRegister)
     {
         stillIcon = iconRegister.registerIcon("tinker:" + texture);
         flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow");
     }
 
-    // TODO getIcon()
     @Override
-    @SideOnly(Side.CLIENT)
     public IIcon getIcon (int side, int meta)
     {
         if (side == 0 || side == 1)
             return stillIcon;
         return flowIcon;
     }
-}
+}

src/main/java/tconstruct/blocks/TankAirBlock.java

@@ -15,6 +15,7 @@
 import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeHooks;
 import tconstruct.blocks.logic.TankAirLogic;
 import tconstruct.client.block.TankAirRender;
 import cpw.mods.fml.relauncher.Side;
@@ -29,7 +30,7 @@ public TankAirBlock(Material material)
     }
 
     @Override
-    public TileEntity createNewTileEntity (World world, int i)
+    public TileEntity createNewTileEntity (World world, int var2)
     {
         return new TankAirLogic();
     }

src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java

@@ -1,5 +1,7 @@
 package tconstruct.blocks.logic;
 
+import tconstruct.TConstruct;
+import tconstruct.library.crafting.AlloyMix;
 import mantle.blocks.abstracts.MultiServantLogic;
 import mantle.blocks.iface.IFacingLogic;
 import mantle.blocks.iface.IMasterLogic;
@@ -20,7 +22,6 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl
 {
     byte direction;
 
-    @Override
     public boolean canUpdate ()
     {
         return false;
@@ -51,7 +52,7 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
         if (hasValidMaster() && canDrain(from, null))
         {
             AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z);
-            // TConstruct.logger.info("Found master");
+            //  TConstruct.logger.info("Found master");
             return smeltery.drain(from, maxDrain, doDrain);
         }
         return null;
@@ -150,7 +151,6 @@ else if (pitch < -45)
         }
     }
 
-    @Override
     public void readFromNBT (NBTTagCompound tags)
     {
         super.readFromNBT(tags);
@@ -176,7 +176,7 @@ public Packet getDescriptionPacket ()
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
-        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         readFromNBT(packet.func_148857_g());
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 }