2 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java
index 6af3a61487..196bc2a5bb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java
@@ -15,17 +15,17 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.tools.GT_Tool;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourNone;
+import gregtech.common.tools.GTTool;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 
-public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
+public class ToolAngleGrinder extends GTTool {
 
     public static final List<String> mEffectiveList = Arrays
         .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" });
@@ -139,7 +139,7 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
     }
 
     @Override
@@ -147,8 +147,8 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
         super.onToolCrafted(aStack, aPlayer);
         aPlayer.triggerAchievement(AchievementList.buildSword);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "tools");
-            GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+            GTMod.achievements.issueAchievement(aPlayer, "tools");
+            GTMod.achievements.issueAchievement(aPlayer, "unitool");
         } catch (final Exception e) {}
     }
 
@@ -164,8 +164,8 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
     }
 
     @Override
-    public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_None());
+    public void onStatsAddedToTool(final MetaGeneratedTool aItem, final int aID) {
+        aItem.addItemBehavior(aID, new BehaviourNone());
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java
index 25ad03548a..78675f70d5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java
@@ -8,15 +8,15 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_Tool_WireCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.tools.ToolWireCutter;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 
-public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
+public class ToolElectricSnips extends ToolWireCutter {
 
     @Override
     public int getToolDamagePerBlockBreak() {
@@ -70,7 +70,7 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
+        return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa;
     }
 
     @Override
@@ -78,8 +78,8 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
         super.onToolCrafted(aStack, aPlayer);
         aPlayer.triggerAchievement(AchievementList.buildSword);
         try {
-            GT_Mod.achievements.issueAchievement(aPlayer, "tools");
-            GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+            GTMod.achievements.issueAchievement(aPlayer, "tools");
+            GTMod.achievements.issueAchievement(aPlayer, "unitool");
         } catch (final Exception e) {}
     }