Merge branch 'experimental'

1 files changed, 54 insertions, 54 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java b/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
index 910b58c934..ca0d85e3d6 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
@@ -1,54 +1,54 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Dyes;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-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_RollingPin

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

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

-        return false;

-    }

-

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

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

-    }

-

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

-    }

-

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

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

-    }

-

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

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

-    }

-}

+package gregtech.common.tools;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import net.minecraft.block.Block;
+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_RollingPin
+        extends GT_Tool {
+    public int getToolDamagePerBlockBreak() {
+        return 50;
+    }
+
+    public int getToolDamagePerDropConversion() {
+        return 100;
+    }
+
+    public int getToolDamagePerContainerCraft() {
+        return 100;
+    }
+
+    public int getToolDamagePerEntityAttack() {
+        return 200;
+    }
+
+    public float getBaseDamage() {
+        return 2.0F;
+    }
+
+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
+        return false;
+    }
+
+    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;
+    }
+
+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? Textures.ItemIcons.ROLLING_PIN : null;
+    }
+
+    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got flattened by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+    }
+}