Merge remote-tracking branch 'origin/experimental' into experimental

18 files changed, 52 insertions, 13 deletions

diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
index 256ee400e7..12d69cd0ec 100644
--- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
+++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
@@ -10,6 +10,7 @@ import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Item_LongDistancePipe;
 import gregtech.common.blocks.GT_Material_Machines;
 import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
@@ -40,65 +41,85 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
         ItemList.Long_Distance_Pipeline_Item_Pipe.set(new ItemStack(this, 1, 1));
         mIcons = new IIconContainer[]{Textures.BlockIcons.LONG_DISTANCE_PIPE_FLUID, Textures.BlockIcons.LONG_DISTANCE_PIPE_ITEM};
     }
+    @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
         super.onBlockAdded(aWorld, aX, aY, aZ);
         if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
             GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
+    @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {
         GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
         super.breakBlock(aWorld, aX, aY, aZ, par5, par6);
     }
+    @Override
     public String getHarvestTool(int aMeta) {
         return "wrench";
     }
 
+    @Override
     public int getHarvestLevel(int aMeta) {
         return 2;
     }
 
+    @Override
     public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
         return Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ);
     }
 
+    @Override
     public float getExplosionResistance(Entity aTNT) {
         return Blocks.iron_block.getExplosionResistance(aTNT);
     }
 
 
+    @Override
     public String getUnlocalizedName() {
         return this.mUnlocalizedName;
     }
 
+    @Override
     public String getLocalizedName() {
         return StatCollector.translateToLocal(this.mUnlocalizedName + ".name");
     }
     
+    @Override
     public IIcon getIcon(int aSide, int aMeta) {
         return mIcons[aMeta % mIcons.length].getIcon();
     }
 
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister p_149651_1_) {
+    }
+
+    @Override
     public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
         return false;
     }
 
+    @Override
     public int quantityDropped(Random par1Random) {
         return 1;
     }
 
+    @Override
     public Item getItemDropped(int par1, Random par2Random, int par3) {
         return Item.getItemFromBlock(this);
     }
 
+    @Override
     public int damageDropped(int par1) {
         return par1;
     }
 
+    @Override
     public int getDamageValue(World par1World, int par2, int par3, int par4) {
         return par1World.getBlockMetadata(par2, par3, par4);
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
         for (int i = 0; i < 3; i++) {
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
index 0d8c9a673a..106897efd7 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
@@ -12,13 +12,16 @@ public class GT_CoolantCellIC_Item
         super(aUnlocalized, aEnglish, aMaxStore);
     }
 
+    @Override
     public void processChamber(IReactor aReactor, ItemStack aStack, int x, int y, boolean aHeatRun) {
     }
 
+    @Override
     public boolean acceptUraniumPulse(IReactor aReactor, ItemStack aStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean aHeatRun) {
         return false;
     }
 
+    @Override
     public boolean canStoreHeat(IReactor aReactor, ItemStack aStack, int x, int y) {
         if (aReactor.isFluidCooled() && (getControlTagOfStack(aStack)) != 0) {
             return false;
@@ -26,18 +29,22 @@ public class GT_CoolantCellIC_Item
         return true;
     }
 
+    @Override
     public int getMaxHeat(IReactor aReactor, ItemStack aStack, int x, int y) {
         return this.heatStorage;
     }
 
+    @Override
     public int getCurrentHeat(IReactor aReactor, ItemStack aStack, int x, int y) {
         return getHeatOfStack(aStack);
     }
 
+    @Override
     public float influenceExplosion(IReactor aReactor, ItemStack aStack) {
         return 1.0F + this.heatStorage / 30000.0F;
     }
 
+    @Override
     public int alterHeat(IReactor aReactor, ItemStack aStack, int x, int y, int aHeat) {
         int tHeat = getHeatOfStack(aStack);
         if ((tHeat == 0) && (getControlTagOfStack(aStack) != 0)) {
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
index 043a835fd5..142737a528 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
@@ -49,6 +49,7 @@ public class GT_CoolantCell_Item
         }
     }
 
+    @Override
     public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
     	super.addAdditionalToolTips(aList, aStack, aPlayer);
         int rHeat = getHeatOfStack(aStack) * 10 / this.heatStorage;
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Block.java b/src/main/java/gregtech/api/items/GT_Generic_Block.java
index 2882ece1fa..37d1e0c7d5 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Block.java
+++ b/src/main/java/gregtech/api/items/GT_Generic_Block.java
@@ -17,4 +17,4 @@ public class GT_Generic_Block extends Block {
         GameRegistry.registerBlock(this, aItemClass, getUnlocalizedName());
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java
index 70e5d23d5c..f25eb73e87 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java
@@ -159,4 +159,4 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
index 95a6e124b1..0a223a04f6 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
@@ -358,4 +358,4 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
     public boolean getIsRepairable(ItemStack aStack, ItemStack aMaterial) {
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
index 559c2b2fdc..f9f54b5219 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
@@ -188,4 +188,4 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
     public boolean getIsRepairable(ItemStack aStack, ItemStack aMaterial) {
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
index b4ecdca49b..9f35b0c0d2 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
@@ -195,4 +195,4 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
             return Math.min(super.getItemStackLimit(aStack), mGeneratedPrefixList[tDamage / 1000].mDefaultStackSize);
         return super.getItemStackLimit(aStack);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
index 24dcc8ef5e..e24ed04539 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
@@ -44,6 +44,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
         return 0;
     }
 
+    @Override
     public void processChamber(IReactor reactor, ItemStack yourStack, int x, int y, boolean heatrun) {
         if (!reactor.produceEnergy()) {
             return;
@@ -110,6 +111,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
         }
     }
 
+    @Override
     public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) {
     	if (!heatrun) {
         	if(sMox){
@@ -122,26 +124,32 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
         return true;
     }
 
+    @Override
     public boolean canStoreHeat(IReactor reactor, ItemStack yourStack, int x, int y) {
         return false;
     }
 
+    @Override
     public int getMaxHeat(IReactor reactor, ItemStack yourStack, int x, int y) {
         return 0;
     }
 
+    @Override
     public int getCurrentHeat(IReactor reactor, ItemStack yourStack, int x, int y) {
         return 0;
     }
 
+    @Override
     public int alterHeat(IReactor reactor, ItemStack yourStack, int x, int y, int heat) {
         return heat;
     }
 
+    @Override
     public float influenceExplosion(IReactor reactor, ItemStack yourStack) {
         return 2 * this.numberOfCells;
     }
 
+    @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if (this.sRadiation > 0 && (entity instanceof EntityLivingBase)) {
             EntityLivingBase entityLiving = (EntityLivingBase) entity;
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index 78c0fb85a1..3bdaf22f37 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -92,6 +92,7 @@ public class GT_RadioactiveCell_Item
         return 0;
     }
 
+    @Override
     public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
         return false;
     }
@@ -138,6 +139,7 @@ public class GT_RadioactiveCell_Item
         setDamageForStack(stack, getDamageOfStack(stack) + Dmg);
     }
 
+    @Override
     public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
     	super.addAdditionalToolTips(aList, aStack, aPlayer);
         //aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs");
diff --git a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
index 3273d13854..7725785276 100644
--- a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
+++ b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
@@ -37,4 +37,4 @@ public class GT_SolderingTool_Item extends GT_Tool_Item {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java
index 4bcded8fa1..75d4dc3e80 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java
@@ -64,4 +64,4 @@ public class GT_Spray_Bug_Item extends GT_Tool_Item {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
index afd964f3d6..76339b9886 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
@@ -168,4 +168,4 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java
index 926bcc60dc..ae2bb27d77 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java
@@ -68,4 +68,4 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java
index cb3368b683..2f6132261b 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java
@@ -50,4 +50,4 @@ public class GT_Spray_Hydration_Item extends GT_Tool_Item {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java
index dfc43906a0..400f183cbb 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java
@@ -78,4 +78,4 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
index db289ef240..890ce9e8e9 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
@@ -48,4 +48,4 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/items/GT_Tool_Item.java b/src/main/java/gregtech/api/items/GT_Tool_Item.java
index c66703497e..aa53ddaba1 100644
--- a/src/main/java/gregtech/api/items/GT_Tool_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Tool_Item.java
@@ -22,4 +22,4 @@ public class GT_Tool_Item extends GT_Generic_Item {
         setFull3D();
         GT_ModHandler.registerBoxableItemToToolBox(this);
     }
-}
\ No newline at end of file
+}