The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

26 files changed, 403 insertions, 414 deletions

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java
index 4241e07e4b..b39135fed2 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java
@@ -13,28 +13,28 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 
-public class Behaviour_Cover_Tool extends Behaviour_None {
+public class BehaviourCoverTool extends BehaviourNone {
 
-    public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Cover_Tool();
-    private final String mTooltip = GT_LanguageManager
+    public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourCoverTool();
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.cover_copy_paste", "Can copy/paste cover data.");
 
-    private ISerializableObject mStoredData = GregTech_API.sNoBehavior.createDataObject();
+    private ISerializableObject mStoredData = GregTechAPI.sNoBehavior.createDataObject();
     private int mCoverType;
     private int mTickRateAddition = 0;
 
     @Override
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+    public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
         int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -55,24 +55,24 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                 aItem.discharge(aStack, 25.0D, Integer.MAX_VALUE, true, false, false);
             }
         }
-        GT_Utility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ);
+        GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ);
         return aPlayer instanceof EntityPlayerMP;
     }
 
     private void initDataFromNBT(NBTTagCompound aNBT) {
         if (aNBT != null) {
             mCoverType = aNBT.getInteger("mCoverType");
-            GT_CoverBehaviorBase<?> tBehavior = GregTech_API.getCoverBehaviorNew(mCoverType);
+            CoverBehaviorBase<?> tBehavior = GregTechAPI.getCoverBehaviorNew(mCoverType);
             NBTBase tData = aNBT.getTag("mCoverData");
             if (tData != null) mStoredData = tBehavior.createDataObject(tData);
-            else mStoredData = GregTech_API.sNoBehavior.createDataObject();
+            else mStoredData = GregTechAPI.sNoBehavior.createDataObject();
             mTickRateAddition = aNBT.hasKey("mTickRateAddition") ? aNBT.getInteger("mTickRateAddition") : 0;
         }
     }
 
     private void saveDataToNBT(NBTTagCompound aNBT) {
         aNBT.setInteger("mCoverType", mCoverType);
-        if (mStoredData == null) mStoredData = GregTech_API.sNoBehavior.createDataObject();
+        if (mStoredData == null) mStoredData = GregTechAPI.sNoBehavior.createDataObject();
         aNBT.setTag("mCoverData", mStoredData.saveDataToNBT());
         aNBT.setInteger("mTickRateAddition", mTickRateAddition);
     }
@@ -84,7 +84,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
             aNBT.setInteger("dataLinesCount", tSize);
             for (int i = 0; i < tSize; i++) {
                 aNBT.setString("dataLines" + i, (String) aList.get(i));
-                GT_Utility.sendChatToPlayer(aPlayer, (String) aList.get(i));
+                GTUtility.sendChatToPlayer(aPlayer, (String) aList.get(i));
             }
         }
     }
@@ -94,15 +94,15 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
         float hitY, float hitZ, List aList) {
         aList.add(
             "----- X: " + EnumChatFormatting.AQUA
-                + GT_Utility.formatNumbers(aX)
+                + GTUtility.formatNumbers(aX)
                 + EnumChatFormatting.RESET
                 + " Y: "
                 + EnumChatFormatting.AQUA
-                + GT_Utility.formatNumbers(aY)
+                + GTUtility.formatNumbers(aY)
                 + EnumChatFormatting.RESET
                 + " Z: "
                 + EnumChatFormatting.AQUA
-                + GT_Utility.formatNumbers(aZ)
+                + GTUtility.formatNumbers(aZ)
                 + EnumChatFormatting.RESET
                 + " D: "
                 + EnumChatFormatting.AQUA
@@ -111,8 +111,8 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                 + " -----");
         if (aTileEntity instanceof ICoverable tCoverable) {
             final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side
-                : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
-                    ? GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)
+                : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
+                    ? GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)
                     : ForgeDirection.UNKNOWN;
             if (tSide != ForgeDirection.UNKNOWN) {
                 if (tCoverable.getCoverBehaviorAtSideNew(tSide)
@@ -129,19 +129,19 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                                 .getDisplayName()
                             + EnumChatFormatting.RESET);
                 } else {
-                    mStoredData = GregTech_API.sNoBehavior.createDataObject();
+                    mStoredData = GregTechAPI.sNoBehavior.createDataObject();
                     mCoverType = 0;
                     mTickRateAddition = 0;
                     aList.add("Copy unavailable for this cover type");
                 }
             } else {
-                mStoredData = GregTech_API.sNoBehavior.createDataObject();
+                mStoredData = GregTechAPI.sNoBehavior.createDataObject();
                 mCoverType = 0;
                 mTickRateAddition = 0;
                 aList.add("No Cover Found");
             }
         } else {
-            mStoredData = GregTech_API.sNoBehavior.createDataObject();
+            mStoredData = GregTechAPI.sNoBehavior.createDataObject();
             mCoverType = 0;
             mTickRateAddition = 0;
             aList.add("No Cover Found");
@@ -152,12 +152,12 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
         EntityPlayer aPlayer) {
         if (aTileEntity instanceof ICoverable tCoverable) {
             if (mCoverType == 0 || mStoredData == null) {
-                GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First.");
+                GTUtility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First.");
                 return;
             }
             final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side
-                : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
-                    ? GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)
+                : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null
+                    ? GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)
                     : ForgeDirection.UNKNOWN;
             if (tSide != ForgeDirection.UNKNOWN) {
                 int tCoverID = tCoverable.getCoverIDAtSide(tSide);
@@ -165,18 +165,18 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
                     tCoverable.setCoverDataAtSide(tSide, mStoredData);
                     tCoverable.getCoverInfoAtSide(tSide)
                         .setTickRateAddition(mTickRateAddition);
-                    GT_Utility.sendChatToPlayer(aPlayer, "Cover Data Pasted.");
+                    GTUtility.sendChatToPlayer(aPlayer, "Cover Data Pasted.");
                 } else {
-                    GT_Utility.sendChatToPlayer(aPlayer, "Not Matched Cover.");
+                    GTUtility.sendChatToPlayer(aPlayer, "Not Matched Cover.");
                 }
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, "No Cover Found.");
+                GTUtility.sendChatToPlayer(aPlayer, "No Cover Found.");
             }
         }
     }
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
         try {
             final NBTTagCompound tNBT = aStack.getTagCompound();
             final int tSize = tNBT.getInteger("dataLinesCount");
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java
index 97d3da4ca3..76c215bfd0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java
@@ -10,27 +10,27 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Crowbar extends Behaviour_None {
+public class BehaviourCrowbar extends BehaviourNone {
 
     private final int mVanillaCosts;
     private final int mEUCosts;
 
-    public Behaviour_Crowbar(int aVanillaCosts, int aEUCosts) {
+    public BehaviourCrowbar(int aVanillaCosts, int aEUCosts) {
         this.mVanillaCosts = aVanillaCosts;
         this.mEUCosts = aEUCosts;
     }
 
     @Override
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+    public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
         int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if (aWorld.isRemote) {
             return false;
         }
-        if (GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) {
+        if (GTModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) {
             return false;
         }
         Block aBlock = aWorld.getBlock(aX, aY, aZ);
@@ -39,20 +39,20 @@ public class Behaviour_Crowbar extends Behaviour_None {
         }
         byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
         if (aBlock == Blocks.rail) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 1) % 10, 0);
                 aWorld.isRemote = false;
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
         if ((aBlock == Blocks.detector_rail) || (aBlock == Blocks.activator_rail) || (aBlock == Blocks.golden_rail)) {
-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+            if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
                 aWorld.isRemote = true;
                 aWorld.setBlock(aX, aY, aZ, aBlock, aMeta / 8 * 8 + (aMeta % 8 + 1) % 6, 0);
                 aWorld.isRemote = false;
-                GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
+                GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ);
             }
             return true;
         }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java
index ae0627446c..c5d045ecd0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java
@@ -6,17 +6,17 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_DataOrb extends Behaviour_None {
+public class BehaviourDataOrb extends BehaviourNone {
 
     public static void copyInventory(ItemStack[] aInventory, ItemStack[] aNewContent, int aIndexlength) {
         for (int i = 0; i < aIndexlength; i++) {
             if (aNewContent[i] == null) {
                 aInventory[i] = null;
             } else {
-                aInventory[i] = GT_Utility.copyOrNull(aNewContent[i]);
+                aInventory[i] = GTUtility.copyOrNull(aNewContent[i]);
             }
         }
     }
@@ -68,7 +68,7 @@ public class Behaviour_DataOrb extends Behaviour_None {
             NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i);
             byte slot = tag.getByte("Slot");
             if (slot >= 0) {
-                tInventory[slot] = GT_Utility.loadItem(tag);
+                tInventory[slot] = GTUtility.loadItem(tag);
             }
         }
         return tInventory;
@@ -95,7 +95,7 @@ public class Behaviour_DataOrb extends Behaviour_None {
     }
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
         if (!(getDataTitle(aStack).length() == 0)) {
             aList.add(getDataTitle(aStack));
             aList.add(getDataName(aStack));
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java
index e9db3195c2..63462b8d9b 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java
@@ -4,27 +4,27 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_DataStick extends Behaviour_None {
+public class BehaviourDataStick extends BehaviourNone {
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        String tString = GT_Utility.ItemNBT.getBookTitle(aStack);
-        if (GT_Utility.isStringValid(tString)) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
+        String tString = GTUtility.ItemNBT.getBookTitle(aStack);
+        if (GTUtility.isStringValid(tString)) {
             aList.add(tString);
         }
-        tString = GT_Utility.ItemNBT.getBookAuthor(aStack);
-        if (GT_Utility.isStringValid(tString)) {
+        tString = GTUtility.ItemNBT.getBookAuthor(aStack);
+        if (GTUtility.isStringValid(tString)) {
             aList.add("by " + tString);
         }
-        short tMapID = GT_Utility.ItemNBT.getMapID(aStack);
+        short tMapID = GTUtility.ItemNBT.getMapID(aStack);
         if (tMapID >= 0) {
             aList.add("Map ID: " + tMapID);
         }
-        tString = GT_Utility.ItemNBT.getPunchCardData(aStack);
-        if (GT_Utility.isStringValid(tString)) {
+        tString = GTUtility.ItemNBT.getPunchCardData(aStack);
+        if (GTUtility.isStringValid(tString)) {
             aList.add("Punch Card Data");
             int i = 0;
             int j = tString.length();
@@ -32,7 +32,7 @@ public class Behaviour_DataStick extends Behaviour_None {
                 aList.add(tString.substring(i, Math.min(i + 64, j)));
             }
         }
-        short sTier = GT_Utility.ItemNBT.getNBT(aStack)
+        short sTier = GTUtility.ItemNBT.getNBT(aStack)
             .getShort("rocket_tier");
         if (sTier > 0 && sTier < 100) {
             aList.add("Rocket Schematic Tier: " + sTier);
@@ -43,7 +43,7 @@ public class Behaviour_DataStick extends Behaviour_None {
                 case 102 -> aList.add("Astro-Miner Schematic");
             }
         }
-        long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack)
+        long lastUpdate = GTUtility.ItemNBT.getNBT(aStack)
             .getLong("lastUpdate");
         if (lastUpdate != 0) aList.add(String.format("Last update at: %tc", lastUpdate));
 
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java b/src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java
index 167eccdf49..ca9166b581 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java
@@ -11,24 +11,24 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.UseHoeEvent;
 
 import cpw.mods.fml.common.eventhandler.Event;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 
-public class Behaviour_Hoe extends Behaviour_None {
+public class BehaviourHoe extends BehaviourNone {
 
     private final int mCosts;
-    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.hoe", "Can till Dirt");
+    private final String mTooltip = GTLanguageManager.addStringLocalization("gt.behaviour.hoe", "Can till Dirt");
 
-    public Behaviour_Hoe(int aCosts) {
+    public BehaviourHoe(int aCosts) {
         this.mCosts = aCosts;
     }
 
     @Override
-    public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
-        int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY,
+        int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
             return false;
         }
@@ -38,12 +38,12 @@ public class Behaviour_Hoe extends Behaviour_None {
         }
         if (event.getResult() == Event.Result.ALLOW) {
             if (!aPlayer.capabilities.isCreativeMode) {
-                ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
+                ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts);
             }
             return true;
         }
         Block aBlock = aWorld.getBlock(aX, aY, aZ);
-        if ((ordinalSide != 0) && (GT_Utility.isBlockAir(aWorld, aX, aY + 1, aZ))
+        if ((ordinalSide != 0) && (GTUtility.isBlockAir(aWorld, aX, aY + 1, aZ))
             && ((aBlock == Blocks.grass) || (aBlock == Blocks.dirt))) {
             new WorldSpawnedEventBuilder.SoundEventBuilder()
                 .setVolume((Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F)
@@ -57,7 +57,7 @@ public class Behaviour_Hoe extends Behaviour_None {
             }
             aWorld.setBlock(aX, aY, aZ, Blocks.farmland);
             if (!aPlayer.capabilities.isCreativeMode) {
-                ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
+                ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts);
             }
             return true;
         }
@@ -65,7 +65,7 @@ public class Behaviour_Hoe extends Behaviour_None {
     }
 
     @Override
-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+    public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
         aList.add(this.mTooltip);
         return aList;
     }
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java b/src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java
index a4c26e2254..9c9c8ab9f0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java
@@ -14,25 +14,24 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import codechicken.lib.math.MathHelper;
 import gregtech.api.enums.SoundResource;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaBaseItem;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
 
-public class Behaviour_Lighter extends Behaviour_None {
+public class BehaviourLighter extends BehaviourNone {
 
     private final ItemStack mEmptyLighter;
     private final ItemStack mUsedLighter;
     private final ItemStack mFullLighter;
     private final long mFuelAmount;
-    private final String mTooltip = GT_LanguageManager
+    private final String mTooltip = GTLanguageManager
         .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire");
-    private final String mTooltipUses = GT_LanguageManager
+    private final String mTooltipUses = GTLanguageManager
         .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:");
-    private final String mTooltipUnstackable = GT_LanguageManager
+    private final String mTooltipUnstackable = GTLanguageManager
         .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!");
 
-    public Behaviour_Lighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter,
-        long aFuelAmount) {
+    public BehaviourLighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter, long aFuelAmount) {
         this.mFullLighter = aFullLighter;
         this.mUsedLighter = aUsedLighter;
         this.mEmptyLighter = aEmptyLighter;
@@ -40,16 +39,16 @@ public class Behaviour_Lighter extends Behaviour_None {
     }
 
     @Override
-    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
+    public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         if ((aPlayer.worldObj.isRemote) || (aStack.stackSize != 1)) {
             return false;
         }
         boolean rOutput = false;
         if ((aEntity instanceof EntityCreeper)) {
             prepare(aStack);
-            long tFuelAmount = GT_Utility.ItemNBT.getLighterFuel(aStack);
-            if (GT_Utility.areStacksEqual(aStack, this.mUsedLighter, true)) {
-                GT_Utility.sendSoundToPlayers(
+            long tFuelAmount = GTUtility.ItemNBT.getLighterFuel(aStack);
+            if (GTUtility.areStacksEqual(aStack, this.mUsedLighter, true)) {
+                GTUtility.sendSoundToPlayers(
                     aPlayer.worldObj,
                     SoundResource.FIRE_IGNITE,
                     1.0F,
@@ -63,7 +62,7 @@ public class Behaviour_Lighter extends Behaviour_None {
                 }
                 rOutput = true;
             }
-            GT_Utility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
+            GTUtility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
             if (tFuelAmount <= 0L) {
                 useUp(aStack);
             }
@@ -72,13 +71,13 @@ public class Behaviour_Lighter extends Behaviour_None {
     }
 
     @Override
-    public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
-        int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
+    public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY,
+        int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         return false;
     }
 
     @Override
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+    public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
         int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) {
         if ((aWorld.isRemote) || (aStack.stackSize != 1)) {
             return false;
@@ -88,21 +87,21 @@ public class Behaviour_Lighter extends Behaviour_None {
         aX += side.offsetX;
         aY += side.offsetY;
         aZ += side.offsetZ;
-        if ((!GT_Utility.isBlockAir(aWorld, aX, aY, aZ))
+        if ((!GTUtility.isBlockAir(aWorld, aX, aY, aZ))
             || (!aPlayer.canPlayerEdit(aX, aY, aZ, side.ordinal(), aStack))) {
             return false;
         }
         prepare(aStack);
-        long tFuelAmount = GT_Utility.ItemNBT.getLighterFuel(aStack);
-        if (GT_Utility.areStacksEqual(aStack, this.mUsedLighter, true)) {
-            GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
+        long tFuelAmount = GTUtility.ItemNBT.getLighterFuel(aStack);
+        if (GTUtility.areStacksEqual(aStack, this.mUsedLighter, true)) {
+            GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ);
             aWorld.setBlock(aX, aY, aZ, Blocks.fire);
             if (!aPlayer.capabilities.isCreativeMode) {
                 tFuelAmount -= 1L;
             }
             rOutput = true;
         }
-        GT_Utility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
+        GTUtility.ItemNBT.setLighterFuel(aStack, tFuelAmount);
         if (tFuelAmount <= 0L) {
             useUp(aStack);
         }
@@ -110,10 +109,10 @@ public class Behaviour_Lighter extends Behaviour_None {
     }
 
     private void prepare(ItemStack aStack) {
-        if (GT_Utility.areStacksEqual(aStack, this.mFullLighter, true)) {
+        if (GTUtility.areStacksEqual(aStack, this.mFullLighter, true)) {
             aStack.func_150996_a(this.mUsedLighter.getItem());
             Items.feather.setDamage(aStack, Items.feather.getDamage(this.mUsedLighter));
-            GT_Util