spelling fixes and chainsaw + forestry leaves fix

4 files changed, 39 insertions, 6 deletions

diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 417d95ce3d..ebf1222843 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -114,7 +114,7 @@ public class ItemComb extends Item {
 		
 	    //Gem Line
 		tComb = getStackForType(CombType.STONE);
-		addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 70);
+		addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 70,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Salt,1),20,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.RockSalt,1),20);
 		addProcess(tComb, Materials.Soapstone, 100);
 		addProcess(tComb, Materials.Talc, 100);
 		addProcess(tComb, Materials.Apatite, 100);
@@ -155,7 +155,7 @@ public class ItemComb extends Item {
 
 //	    // Metals Line
 		tComb = getStackForType(CombType.SLAG);
-		addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50);
+		addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteBlack, 1), 20,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteRed, 1), 20);
 		addProcess(tComb, Materials.Salt, 100);
 		addProcess(tComb, Materials.RockSalt, 100);
 		addProcess(tComb, Materials.Lepidolite, 100);
@@ -268,6 +268,16 @@ public class ItemComb extends Item {
 		RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
 	}
 	
+	public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,	ItemList.FR_Wax.get(1, new Object[0]), aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000, chance2 * 100 }, 128, 5);
+		RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f));
+	}
+	
+	public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2, ItemStack aOutput3, int chance3){
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,	ItemList.FR_Wax.get(1, new Object[0]), aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000, chance2 * 100, chance3*100 }, 128, 5);
+		RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f,aOutput3,chance3*0.01f));
+	}
+	
 	public void addProcess(ItemStack tComb, Materials aMaterial, int chance){
 		if(GT_Mod.gregtechproxy.mNerfedCombs){
 			GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300);
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
index 88434e315f..2ba2cd140b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
@@ -17,7 +17,7 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
     public int mRange = 16;
 
     public GT_MetaTileEntity_MonsterRepellent(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 0, "Reprells nasty Creatures. Range: " + (4 + (12 * aTier)) + " unpowered / " + (16 + (48 * aTier)) + " powered");
+        super(aID, aName, aNameRegional, aTier, 0, "Repels nasty Creatures. Range: " + (4 + (12 * aTier)) + " unpowered / " + (16 + (48 * aTier)) + " powered");
     }
 
     public GT_MetaTileEntity_MonsterRepellent(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index 32392a2004..a1596ba93e 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -85,6 +85,10 @@ public abstract class GT_Tool
         return false;

     }

     

+    public boolean isChainsaw(){

+    	return false;

+    }

+    

     public boolean isWrench() {

         return false;

     }

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 a0d552b494..273bd7b63f 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
@@ -2,6 +2,7 @@ package gregtech.common.tools;
 

 import java.util.ArrayList;

 import java.util.List;

+import java.util.Random;

 

 import gregtech.GT_Mod;

 import gregtech.api.GregTech_API;

@@ -12,6 +13,7 @@ import gregtech.api.items.GT_MetaGenerated_Tool;
 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.entity.EntityLivingBase;

+import net.minecraft.entity.item.EntityItem;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.init.Blocks;

 import net.minecraft.item.ItemStack;

@@ -75,6 +77,10 @@ public class GT_Tool_Chainsaw_LV
         return false;

     }

 

+    public boolean isChainsaw(){

+    	return true;

+    }

+    

     public boolean isWeapon() {

         return true;

     }

@@ -94,11 +100,24 @@ public class GT_Tool_Chainsaw_LV
             if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) {

                 ArrayList<ItemStack> tDrops = ((IShearable) aBlock).onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune);

                 aDrops.clear();

-                aDrops.addAll(tDrops);

-                aEvent.dropChance = 1.0F;

+//                aDrops.addAll(tDrops);

+//                aEvent.dropChance = 1.0F;

+//                for (ItemStack stack : tDrops)

+//                {

+//                Random itemRand = new Random();

+//                  float f = 0.7F;

+//                  double d = itemRand.nextFloat() * f + (1.0F - f) * 0.5D;

+//                  double d1 = itemRand.nextFloat() * f + (1.0F - f) * 0.5D;

+//                  double d2 = itemRand.nextFloat() * f + (1.0F - f) * 0.5D;

+//                  EntityItem entityitem = new EntityItem(aPlayer.worldObj, aX + d, aY + d1, aZ + d2, stack);

+//                  entityitem.delayBeforeCanPickup = 10;

+//                  aPlayer.worldObj.spawnEntityInWorld(entityitem);

+//                }

+//                aPlayer.addStat(net.minecraft.stats.StatList.mineBlockStatArray[Block.getIdFromBlock(aBlock)], 1);                

             }

             aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0);

-        } else if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce)) && (aDrops.isEmpty())) {

+        } else 

+        	if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce)) && (aDrops.isEmpty())) {

             aDrops.add(new ItemStack(aBlock, 1, aMetaData));

             aPlayer.worldObj.setBlockToAir(aX, aY, aZ);

             aEvent.dropChance = 1.0F;