Merge branch 'mergeGTNH' into experimental

1 files changed, 107 insertions, 107 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
index 5379bb82c8..5569cab715 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -1,107 +1,107 @@
-package gregtech.common.tools;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-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.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-
-public class GT_Tool_Scoop
-        extends GT_Tool {
-    public static Material sBeeHiveMaterial;
-
-    public int getToolDamagePerBlockBreak() {
-        return 200;
-    }
-
-    public int getToolDamagePerDropConversion() {
-        return 100;
-    }
-
-    public int getToolDamagePerContainerCraft() {
-        return 800;
-    }
-
-    public int getToolDamagePerEntityAttack() {
-        return 200;
-    }
-
-    public int getBaseQuality() {
-        return 0;
-    }
-
-    public float getBaseDamage() {
-        return 1.0F;
-    }
-
-    public float getSpeedMultiplier() {
-        return 1.0F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 1.0F;
-    }
-
-    public String getCraftingSound() {
-        return null;
-    }
-
-    public String getEntityHitSound() {
-        return null;
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    public String getMiningSound() {
-        return null;
-    }
-
-    public boolean canBlock() {
-        return false;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        String tTool = aBlock.getHarvestTool(aMetaData);
-        return ((tTool != null) && (tTool.equals("scoop"))) || (aBlock.getMaterial() == sBeeHiveMaterial);
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? Textures.ItemIcons.SCOOP : null;
-    }
-
-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
-    }
-
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        try {
-            Object tObject = GT_Utility.callConstructor("gregtech.common.items.behaviors.Behaviour_Scoop", 0, null, false, new Object[]{Integer.valueOf(200)});
-            if ((tObject instanceof IItemBehaviour)) {
-                aItem.addItemBehavior(aID, (IItemBehaviour) tObject);
-            }
-        } catch (Throwable e) {
-        }
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got scooped up by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-}
+package gregtech.common.tools;

+

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.Textures;

+import gregtech.api.interfaces.IIconContainer;

+import gregtech.api.interfaces.IItemBehaviour;

+import gregtech.api.items.GT_MetaGenerated_Tool;

+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.item.ItemStack;

+import net.minecraft.util.ChatComponentText;

+import net.minecraft.util.EnumChatFormatting;

+import net.minecraft.util.IChatComponent;

+

+public class GT_Tool_Scoop

+        extends GT_Tool {

+    public static Material sBeeHiveMaterial;

+

+    public int getToolDamagePerBlockBreak() {

+        return 200;

+    }

+

+    public int getToolDamagePerDropConversion() {

+        return 100;

+    }

+

+    public int getToolDamagePerContainerCraft() {

+        return 200;

+    }

+

+    public int getToolDamagePerEntityAttack() {

+        return 200;

+    }

+

+    public int getBaseQuality() {

+        return 0;

+    }

+

+    public float getBaseDamage() {

+        return 1.0F;

+    }

+

+    public float getSpeedMultiplier() {

+        return 1.0F;

+    }

+

+    public float getMaxDurabilityMultiplier() {

+        return 1.0F;

+    }

+

+    public String getCraftingSound() {

+        return null;

+    }

+

+    public String getEntityHitSound() {

+        return null;

+    }

+

+    public String getBreakingSound() {

+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

+    }

+

+    public String getMiningSound() {

+        return null;

+    }

+

+    public boolean canBlock() {

+        return false;

+    }

+

+    public boolean isCrowbar() {

+        return false;

+    }

+

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

+        String tTool = aBlock.getHarvestTool(aMetaData);

+        return ((tTool != null) && (tTool.equals("scoop"))) || (aBlock.getMaterial() == sBeeHiveMaterial);

+    }

+

+    public ItemStack getBrokenItem(ItemStack aStack) {

+        return null;

+    }

+

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

+        return aIsToolHead ? Textures.ItemIcons.SCOOP : null;

+    }

+

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

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

+    }

+

+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

+        try {

+            Object tObject = GT_Utility.callConstructor("gregtech.common.items.behaviors.Behaviour_Scoop", 0, null, false, new Object[]{Integer.valueOf(200)});

+            if ((tObject instanceof IItemBehaviour)) {

+                aItem.addItemBehavior(aID, (IItemBehaviour) tObject);

+            }

+        } catch (Throwable e) {

+        }

+    }

+

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

+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got scooped up by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

+    }

+}