Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate

Conflicts:
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
	src/main/java/gregtech/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java

3 files changed, 38 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index a1596ba93e..5f54f7bdc3 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -14,6 +14,7 @@ import net.minecraft.stats.AchievementList;
 import net.minecraft.util.DamageSource;

 import net.minecraft.util.EntityDamageSource;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.event.world.BlockEvent;

 

 import java.util.List;

@@ -145,4 +146,9 @@ public abstract class GT_Tool
     public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

         return aOriginalDamage;

     }

+

+	@Override

+	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ) {

+		return aDefault;

+	}

 }

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
index f74aeca505..c536361b1f 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;

 import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.event.world.BlockEvent;

 

 import java.util.List;

@@ -96,6 +97,21 @@ public class GT_Tool_Axe
         }

         return rAmount;

     }

+    

+    public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)

+    {

+      if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ) && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))){

+        float rAmount = 1.0F;float tIncrement = 1.0F;

+        if ((GregTech_API.sTimber) && !aPlayer.isSneaking()){

+          int tY = aY + 1;

+          for (int tH = aPlayer.worldObj.getHeight(); (tY < tH) && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++){

+            tIncrement += 0.1F;rAmount += tIncrement;

+          }

+        }

+        return 2.0F * aDefault / rAmount;

+      }

+      return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;

+    }

 

     public ItemStack getBrokenItem(ItemStack aStack) {

         return null;

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
index a1acbf100b..93722c52f7 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
@@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;

 import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.common.IShearable;

 import net.minecraftforge.event.world.BlockEvent;

 

@@ -135,6 +136,21 @@ public class GT_Tool_Chainsaw_LV
         }

         return rAmount;

     }

+    

+    public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)

+    {

+      if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ) && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))){

+        float rAmount = 1.0F;float tIncrement = 1.0F;

+        if ((GregTech_API.sTimber) && !aPlayer.isSneaking()){

+          int tY = aY + 1;

+          for (int tH = aPlayer.worldObj.getHeight(); (tY < tH) && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++){

+            tIncrement += 0.1F;rAmount += tIncrement;

+          }

+        }

+        return 2.0F * aDefault / rAmount;

+      }

+      return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;

+    }

 

     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

         return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV;