Merge branch 'experimental'

1 files changed, 77 insertions, 77 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
index 7cefcdfd8d..3707650b3c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
@@ -1,77 +1,77 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.init.Blocks;

-import net.minecraft.init.Items;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public class GT_Tool_BranchCutter

-        extends GT_Tool {

-    public float getBaseDamage() {

-        return 2.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.25F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 0.25F;

-    }

-

-    public boolean isGrafter() {

-        return true;

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        if (aBlock.getMaterial() == Material.leaves) {

-            aEvent.dropChance = Math.min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F));

-            if (aBlock == Blocks.leaves) {

-                aDrops.clear();

-                if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) {

-                    aDrops.add(new ItemStack(Items.apple, 1, 0));

-                } else {

-                    aDrops.add(new ItemStack(Blocks.sapling, 1, aMetaData & 0x3));

-                }

-            } else if (aBlock == Blocks.leaves2) {

-                aDrops.clear();

-                aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4));

-            } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) {

-                aDrops.clear();

-                aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L));

-            }

-        }

-        return 0;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.GRAFTER : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been trimmed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

+package gregtech.common.tools;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraftforge.event.world.BlockEvent;
+
+import java.util.List;
+
+public class GT_Tool_BranchCutter
+        extends GT_Tool {
+    public float getBaseDamage() {
+        return 2.5F;
+    }
+
+    public float getSpeedMultiplier() {
+        return 0.25F;
+    }
+
+    public float getMaxDurabilityMultiplier() {
+        return 0.25F;
+    }
+
+    public boolean isGrafter() {
+        return true;
+    }
+
+    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+        if (aBlock.getMaterial() == Material.leaves) {
+            aEvent.dropChance = Math.min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F));
+            if (aBlock == Blocks.leaves) {
+                aDrops.clear();
+                if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) {
+                    aDrops.add(new ItemStack(Items.apple, 1, 0));
+                } else {
+                    aDrops.add(new ItemStack(Blocks.sapling, 1, aMetaData & 0x3));
+                }
+            } else if (aBlock == Blocks.leaves2) {
+                aDrops.clear();
+                aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4));
+            } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) {
+                aDrops.clear();
+                aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L));
+            }
+        }
+        return 0;
+    }
+
+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
+        String tTool = aBlock.getHarvestTool(aMetaData);
+        return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? Textures.ItemIcons.GRAFTER : null;
+    }
+
+    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+    }
+
+    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been trimmed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+    }
+}