7 files changed, 56 insertions, 56 deletions

diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java
index b831306df9..a1bf6d9c8b 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_BranchCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolBranchCutter;
 
-public class GT_Tool_Pocket_BranchCutter extends GT_Tool_BranchCutter {
+public class ToolPocketBranchCutter extends ToolBranchCutter {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_BranchCutter(int aSwitchIndex) {
+    public ToolPocketBranchCutter(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_BranchCutter extends GT_Tool_BranchCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java
index 84372b1d98..cd598437ab 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_File;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolFile;
 
-public class GT_Tool_Pocket_File extends GT_Tool_File {
+public class ToolPocketFile extends ToolFile {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_File(int aSwitchIndex) {
+    public ToolPocketFile(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_File extends GT_Tool_File {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java
index 2b43984c51..9dd2492a89 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Knife;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolKnife;
 
-public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
+public class ToolPocketKnife extends ToolKnife {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Knife(int aSwitchIndex) {
+    public ToolPocketKnife(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Knife extends GT_Tool_Knife {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java
index 16ab9229c6..e55671d486 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java
@@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.GTTool;
 
-public class GT_Tool_Pocket_Multitool extends GT_Tool {
+public class ToolPocketMultitool extends GTTool {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Multitool(int aSwitchIndex) {
+    public ToolPocketMultitool(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -29,13 +29,13 @@ public class GT_Tool_Pocket_Multitool extends GT_Tool {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java
index 579f809f2a..4f73109d59 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Saw;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolSaw;
 
-public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
+public class ToolPocketSaw extends ToolSaw {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Saw(int aSwitchIndex) {
+    public ToolPocketSaw(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Saw extends GT_Tool_Saw {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java
index ce04ba2d15..f4a53ed6f6 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_Screwdriver;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolScrewdriver;
 
-public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
+public class ToolPocketScrewdriver extends ToolScrewdriver {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_Screwdriver(int aSwitchIndex) {
+    public ToolPocketScrewdriver(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_Screwdriver extends GT_Tool_Screwdriver {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }
diff --git a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java b/src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java
index 6907ff6735..5dcd03c53b 100644
--- a/src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java
+++ b/src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java
@@ -4,15 +4,15 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Switch_Metadata;
-import gregtech.common.tools.GT_Tool_WireCutter;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.behaviors.BehaviourSwitchMetadata;
+import gregtech.common.tools.ToolWireCutter;
 
-public class GT_Tool_Pocket_WireCutter extends GT_Tool_WireCutter {
+public class ToolPocketWireCutter extends ToolWireCutter {
 
     public final int mSwitchIndex;
 
-    public GT_Tool_Pocket_WireCutter(int aSwitchIndex) {
+    public ToolPocketWireCutter(int aSwitchIndex) {
         mSwitchIndex = aSwitchIndex;
     }
 
@@ -28,12 +28,12 @@ public class GT_Tool_Pocket_WireCutter extends GT_Tool_WireCutter {
 
     @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
+        return MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa;
     }
 
     @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+    public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {
         super.onStatsAddedToTool(aItem, aID);
-        aItem.addItemBehavior(aID, new Behaviour_Switch_Metadata(mSwitchIndex, true, true));
+        aItem.addItemBehavior(aID, new BehaviourSwitchMetadata(mSwitchIndex, true, true));
     }
 }