Doing some code cleanup.

SlimeKnights · Feb 17, 2014 · 3d86631 · 3d86631
1 parent 038be9d
commit 3d86631
Show file tree

Hide file tree

Showing 199 changed files with 797 additions and 381 deletions.
diff --git a/src/main/java/tconstruct/blocks/BlockFalling.java b/src/main/java/tconstruct/blocks/BlockFalling.java
@@ -24,16 +24,19 @@ public BlockFalling(Material p_i45405_1_)
         super(p_i45405_1_);
     }
 
+    @Override
     public void onBlockAdded (World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
     {
         p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_));
     }
 
+    @Override
     public void onNeighborBlockChange (World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
     {
         p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_));
     }
 
+    @Override
     public void updateTick (World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
     {
         if (!p_149674_1_.isRemote)
@@ -84,6 +87,7 @@ protected void func_149829_a (EntityFallingBlock p_149829_1_)
     {
     }
 
+    @Override
     public int tickRate (World p_149738_1_)
     {
         return 2;

diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java
@@ -415,6 +415,7 @@ public void updateTick (World par1World, int par2, int par3, int par4, Random pa
         }
     }
 
+    @Override
     public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity)
     {
         if (!par1World.isRemote)

diff --git a/src/main/java/tconstruct/blocks/BloodBlock.java b/src/main/java/tconstruct/blocks/BloodBlock.java
@@ -16,6 +16,7 @@ public BloodBlock(Fluid fluid, Material material, String texture)
         super(fluid, material, texture);
     }
 
+    @Override
     public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
     {
         if (entity instanceof EntityLivingBase)

diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java
@@ -100,6 +100,7 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase
         world.setBlockMetadataWithNotify(x, y, z, face | meta, 2);
     }
 
+    @Override
     public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
     {
         if (side == 1)

diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java
@@ -63,6 +63,7 @@ public int getTextureIndex (int side)
         return 1;
     }
 
+    @Override
     public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);

diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java
@@ -26,10 +26,10 @@ public CraftingStationBlock(Material material)
         super(material);
         this.setCreativeTab(TConstructRegistry.blockTab);
         this.setHardness(2f);
-        this.stepSound = Block.soundTypeWood;
+        this.setStepSound(Block.soundTypeWood);
     }
 
-    // Block.hasComparatorInputOverride and Block.getComparatorInputOverride
+    //Block.hasComparatorInputOverride and Block.getComparatorInputOverride
 
     /* Rendering */
     @Override
@@ -43,7 +43,7 @@ public String[] getTextureNames ()
     @Override
     public IIcon getIcon (int side, int meta)
     {
-        return icons[meta * 3 + getTextureIndex(side)];
+        return icons[getTextureIndex(side)];
     }
 
     public int getTextureIndex (int side)
@@ -106,4 +106,4 @@ public TileEntity createNewTileEntity (World arg0, int arg1)
     {
         return new CraftingStationLogic();
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java
@@ -56,6 +56,7 @@ public Object getModInstance ()
         return TConstruct.instance;
     }
 
+    @Override
     public int onBlockPlaced (World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta)
     {
         if (side > 1)
@@ -117,6 +118,7 @@ public void addItemToInventory (EntityPlayer player, World world, int x, int y,
         AbilityHelper.spawnItemAtPlayer(player, stack);
     }
 
+    @Override
     public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);
@@ -158,6 +160,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y,
         return AxisAlignedBB.getAABBPool().getAABB((double) x + xMin, (double) y + yMin, (double) z + zMin, (double) x + xMax, (double) y + yMax, (double) z + zMax);
     }
 
+    @Override
     public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
     {
         int metadata = world.getBlockMetadata(x, y, z);
@@ -199,6 +202,7 @@ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
         this.setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax);
     }
 
+    @Override
     public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity)
     {
         this.setBlockBoundsBasedOnState(world, x, y, z);

diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java
@@ -42,11 +42,13 @@ public String[] getTextureNames ()
         return new String[] { "toolstation_top" };
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         return Blocks.iron_block.getIcon(side, meta);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons (IIconRegister par1IconRegister)
     {
@@ -84,6 +86,7 @@ public TileEntity createNewTileEntity (World world, int metadata)
         return new FrypanLogic();
     }
 
+    @Override
     public void randomDisplayTick (World world, int x, int y, int z, Random random)
     {
         if (isActive(world, x, y, z))
@@ -97,6 +100,7 @@ public void randomDisplayTick (World world, int x, int y, int z, Random random)
         }
     }
 
+    @Override
     public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
     {
         super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
@@ -171,6 +175,7 @@ public void breakBlock (World par1World, int x, int y, int z, Block par5, int me
         super.breakBlock(par1World, x, y, z, par5, meta);
     }
 
+    @Override
     public int getLightValue (IBlockAccess world, int x, int y, int z)
     {
         return !isActive(world, x, y, z) ? 0 : 9;

diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java
@@ -62,6 +62,7 @@ public IIcon getIcon (int side, int meta)
         return icons[(meta % 8) * 3 + getTextureIndex(side)];
     }
 
+    @Override
     public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side)
     {
         TileEntity logic = world.getTileEntity(x, y, z);

diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java
@@ -19,11 +19,13 @@ public GlassBlock()
         super(Material.glass, 3f, blockTextures);
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
     {
@@ -48,6 +50,7 @@ public float getBlockHardness (World world, int x, int y, int z)
         }
     }
 
+    @Override
     public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
     {
         int meta = world.getBlockMetadata(x, y, z);

diff --git a/src/main/java/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/blocks/GlassBlockStained.java
@@ -25,11 +25,13 @@ public int getRenderBlockPass ()
         return 1;
     }
 
+    @Override
     public boolean isOpaqueCube ()
     {
         return false;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
     {

diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java
@@ -671,6 +671,7 @@ public final boolean canThisPaneConnectToThisBlock (Block b)
         return b.isOpaqueCube() || b == (Block) this || b == Blocks.glass;
     }
 
+    @Override
     public void registerBlockIcons (IIconRegister par1IconRegister)
     {
         super.registerBlockIcons(par1IconRegister);

diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/blocks/GlueBlock.java
@@ -48,6 +48,7 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity
         }
     }
 
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
     {
         return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z);

diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java
@@ -3,26 +3,28 @@
 import java.util.List;
 import java.util.Random;
 
-import net.minecraft.block.Block;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
+import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
 
-public class GravelOre extends BlockFalling
+public class GravelOre extends BlockSand
 {
     public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" };
     public IIcon[] icons;
 
     public GravelOre()
     {
-        super();
+        //super(Material.craftedSnow);
+        this.blockMaterial = Material.craftedSnow;
         this.setCreativeTab(TConstructRegistry.blockTab);
-        this.stepSound = soundTypeGravel;
-        // this.blockMaterial = Material.craftedSnow;
+        this.setStepSound(soundTypeGravel);
     }
 
     @Override
@@ -42,6 +44,7 @@ public IIcon getIcon (int side, int meta)
         return icons[meta];
     }
 
+    @Override
     public float getBlockHardness (World world, int x, int y, int z)
     {
         int meta = world.getBlockMetadata(x, y, z);
@@ -54,26 +57,25 @@ public float getBlockHardness (World world, int x, int y, int z)
     @Override
     public int damageDropped (int meta)
     {
-        /*
-         * if (meta == 1) return 0;
-         */
+        /*if (meta == 1)
+            return 0;*/
         return meta;
     }
 
-    public Block idDropped (int par1, Random par2Random, int par3)
+    @Override
+    public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_)
     {
-        /*
-         * if (par1 == 1) return Item.goldNugget.itemID;
-         */
-        return this;
+        /*if (par1 == 1)
+            return Item.goldNugget.itemID;*/
+        return Item.getItemFromBlock(TRepo.oreGravel);
     }
 
     @Override
-    public void getSubBlocks (Item b, CreativeTabs tab, List list)
+    public void getSubBlocks (Item id, CreativeTabs tab, List list)
     {
         for (int iter = 0; iter < 6; iter++)
         {
-            list.add(new ItemStack(b, 1, iter));
+            list.add(new ItemStack(id, 1, iter));
         }
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java
@@ -58,6 +58,7 @@ public String[] getTextureNames ()
         return textureNames;
     }
 
+    @Override
     public void registerBlockIcons (IIconRegister IIconRegister)
     {
         String[] textureNames = getTextureNames();
@@ -116,6 +117,7 @@ public int getRenderType ()
         return TankRender.tankModelID;
     }
 
+    @Override
     public IIcon getIcon (int side, int meta)
     {
         if (meta >= 3)
@@ -243,6 +245,7 @@ public void getSubBlocks (Item id, CreativeTabs tab, List list)
     }
 
     /* Data */
+    @Override
     public int damageDropped (int meta)
     {
         return meta;
@@ -294,6 +297,7 @@ protected void dropTankBlock (World world, int x, int y, int z, ItemStack stack)
         }
     }
 
+    @Override
     public void harvestBlock (World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
     {
 

diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java
@@ -67,6 +67,7 @@ public void registerBlockIcons (IIconRegister iconRegister)
         }
     }
 
+    @Override
     public Item getItemDropped (int par1, Random par2Random, int par3)
     {
         return new ItemStack(this).getItem();
@@ -105,6 +106,7 @@ public void breakBlock (World par1World, int par2, int par3, int par4, int par5,
      * 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)
     {
         int j1 = par9 & 3;
@@ -132,6 +134,7 @@ public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par
      * Determines the damage on the item the block drops. Used in cloth and
      * wood.
      */
+    @Override
     public int damageDropped (int par1)
     {
         return par1 & 3;
@@ -145,6 +148,7 @@ public static int limitToValidMetadata (int par0)
         return par0 & 3;
     }
 
+    @Override
     protected ItemStack createStackedBlock (int par1)
     {
         return new ItemStack(this, 1, limitToValidMetadata(par1));

diff --git a/src/main/java/tconstruct/blocks/MetalOre.java b/src/main/java/tconstruct/blocks/MetalOre.java
@@ -15,6 +15,7 @@ public MetalOre(Material material, float hardness, String[] tex)
         super(material, hardness, tex);
     }
 
+    @Override
     public float getBlockHardness (World world, int x, int y, int z)
     {
         int meta = world.getBlockMetadata(x, y, z);

diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java
@@ -60,6 +60,7 @@ public float getBlockHardness (World world, int x, int y, int z)
         }
     }
 
+    @Override
     public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
     {
         int meta = world.getBlockMetadata(x, y, z);

diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java
@@ -64,6 +64,7 @@ public float getBlockHardness (World world, int x, int y, int z)
         }
     }
 
+    @Override
     public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
     {
         int meta = world.getBlockMetadata(x, y, z);