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

15 files changed, 299 insertions, 303 deletions

diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/BlockLongDistancePipe.java
index 31a44f3dbc..3de95981f5 100644
--- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
+++ b/src/main/java/gregtech/api/items/BlockLongDistancePipe.java
@@ -17,27 +17,27 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Item_LongDistancePipe;
-import gregtech.common.blocks.GT_Material_Machines;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.common.blocks.ItemLongDistancePipe;
+import gregtech.common.blocks.MaterialMachines;
 
-public class GT_Block_LongDistancePipe extends GT_Generic_Block {
+public class BlockLongDistancePipe extends GTGenericBlock {
 
     public IIconContainer[] mIcons;
 
-    public GT_Block_LongDistancePipe() {
-        super(GT_Item_LongDistancePipe.class, "gt.block.longdistancepipe", new GT_Material_Machines());
+    public BlockLongDistancePipe() {
+        super(ItemLongDistancePipe.class, "gt.block.longdistancepipe", new MaterialMachines());
         setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GregTech_API.registerMachineBlock(this, -1);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
+        GregTechAPI.registerMachineBlock(this, -1);
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Long Distance Fluid Pipeline Pipe");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Long Distance Item Pipeline Pipe");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Long Distance Fluid Pipeline Pipe");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Long Distance Item Pipeline Pipe");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
 
         ItemList.Long_Distance_Pipeline_Fluid_Pipe.set(new ItemStack(this, 1, 0));
         ItemList.Long_Distance_Pipeline_Item_Pipe.set(new ItemStack(this, 1, 1));
@@ -48,14 +48,14 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
     @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
         super.onBlockAdded(aWorld, aX, aY, aZ);
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         }
     }
 
     @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
         super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetaData);
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Block.java b/src/main/java/gregtech/api/items/GTGenericBlock.java
index 7aaef6d5ca..314849e8cf 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Block.java
+++ b/src/main/java/gregtech/api/items/GTGenericBlock.java
@@ -1,22 +1,22 @@
 package gregtech.api.items;
 
-import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.GTValues.W;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemBlock;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public class GT_Generic_Block extends Block {
+public class GTGenericBlock extends Block {
 
     protected final String mUnlocalizedName;
 
-    protected GT_Generic_Block(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+    protected GTGenericBlock(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
         super(aMaterial);
         setBlockName(mUnlocalizedName = aName);
         GameRegistry.registerBlock(this, aItemClass, getUnlocalizedName());
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + "." + W + ".name", "Any Sub Block of this one");
     }
 }
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GTGenericItem.java
index 3fe2083a96..4f0994bb12 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Item.java
+++ b/src/main/java/gregtech/api/items/GTGenericItem.java
@@ -23,30 +23,30 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IProjectileItem;
-import gregtech.api.util.GT_Config;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTConfig;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
 /**
  * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur.
  */
-public class GT_Generic_Item extends Item implements IProjectileItem {
+public class GTGenericItem extends Item implements IProjectileItem {
 
     private final String mName, mTooltip;
     protected IIcon mIcon;
 
-    public GT_Generic_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip) {
+    public GTGenericItem(String aUnlocalized, String aEnglish, String aEnglishTooltip) {
         super();
         mName = "gt." + aUnlocalized;
-        GT_LanguageManager.addStringLocalization(mName + ".name", aEnglish);
-        if (GT_Utility.isStringValid(aEnglishTooltip))
-            GT_LanguageManager.addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip);
+        GTLanguageManager.addStringLocalization(mName + ".name", aEnglish);
+        if (GTUtility.isStringValid(aEnglishTooltip))
+            GTLanguageManager.addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip);
         else mTooltip = null;
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
         GameRegistry.registerItem(this, mName, GregTech.ID);
         BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense());
     }
@@ -69,7 +69,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister aIconRegister) {
-        mIcon = aIconRegister.registerIcon(GregTech.getResourcePath(GT_Config.troll ? "troll" : mName));
+        mIcon = aIconRegister.registerIcon(GregTech.getResourcePath(GTConfig.troll ? "troll" : mName));
     }
 
     @Override
@@ -90,8 +90,8 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
         if (getMaxDamage() > 0 && !getHasSubtypes())
             aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage());
-        if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip));
-        if (GT_ModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));
+        if (mTooltip != null) aList.add(GTLanguageManager.getTranslation(mTooltip));
+        if (GTModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));
         addAdditionalToolTips(aList, aStack, aPlayer);
     }
 
@@ -144,14 +144,14 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     }
 
     public String transItem(String aKey, String aEnglish) {
-        return GT_LanguageManager.addStringLocalization("Item_DESCRIPTION_Index_" + aKey, aEnglish);
+        return GTLanguageManager.addStringLocalization("Item_DESCRIPTION_Index_" + aKey, aEnglish);
     }
 
     public static class GT_Item_Dispense extends BehaviorProjectileDispense {
 
         @Override
         public ItemStack dispenseStack(IBlockSource aSource, ItemStack aStack) {
-            return ((GT_Generic_Item) aStack.getItem()).onDispense(aSource, aStack);
+            return ((GTGenericItem) aStack.getItem()).onDispense(aSource, aStack);
         }
 
         @Override
diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/ItemBreederCell.java
index 438b0f467e..33a4ce3253 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/ItemBreederCell.java
@@ -1,6 +1,6 @@
 package gregtech.api.items;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.List;
 import java.util.function.Supplier;
@@ -12,10 +12,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 import ic2.core.IC2Potion;
@@ -25,7 +25,7 @@ import ic2.core.IC2Potion;
  *
  * @author glee8e
  */
-public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComponent {
+public class ItemBreederCell extends GTGenericItem implements IReactorComponent {
 
     protected final int mHeatBonusStep;
     protected final int mHeatBonusMultiplier;
@@ -34,17 +34,17 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
     protected boolean hidden = false;
     protected boolean neiAdded = false;
 
-    public GT_BreederCell_Item(String aUnlocalized, String aEnglish, String aEnglishTooltip, int aHeatBonusStep,
+    public ItemBreederCell(String aUnlocalized, String aEnglish, String aEnglishTooltip, int aHeatBonusStep,
         int aHeatBonusMultiplier, int aRequiredPulse, Supplier<ItemStack> aProduct) {
         super(aUnlocalized, aEnglish, aEnglishTooltip);
         this.mHeatBonusStep = aHeatBonusStep;
         this.mHeatBonusMultiplier = aHeatBonusMultiplier;
         this.setMaxDamage(aRequiredPulse);
         setNoRepair();
-        GregTech_API.sAfterGTPostload.add(() -> {
+        GregTechAPI.sAfterGTPostload.add(() -> {
             mProduct = aProduct.get();
             if (!hidden && !neiAdded) {
-                GT_Values.RA.stdBuilder()
+                GTValues.RA.stdBuilder()
                     .itemInputs(new ItemStack(this))
                     .itemOutputs(mProduct)
                     .setNEIDesc(
@@ -61,12 +61,12 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
         });
     }
 
-    public GT_BreederCell_Item setDeflector() {
+    public ItemBreederCell setDeflector() {
         deflector = true;
         return this;
     }
 
-    public GT_BreederCell_Item setHidden() {
+    public ItemBreederCell setHidden() {
         hidden = true;
         return this;
     }
@@ -74,7 +74,7 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if ((entity instanceof EntityLivingBase entityLiving)) {
-            if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+            if (!GTUtility.isWearingFullRadioHazmat(entityLiving)) {
                 IC2Potion.radiation.applyTo(entityLiving, 20, 1);
             }
         }
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/ItemCoolantCell.java
index 6ed7dae3b0..31eb6bc599 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
+++ b/src/main/java/gregtech/api/items/ItemCoolantCell.java
@@ -8,20 +8,20 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import ic2.core.util.StackUtil;
 
-public class GT_CoolantCell_Item extends GT_Generic_Item {
+public class ItemCoolantCell extends GTGenericItem {
 
     protected final int heatStorage;
 
-    public GT_CoolantCell_Item(String aUnlocalized, String aEnglish, int aMaxStore) {
+    public ItemCoolantCell(String aUnlocalized, String aEnglish, int aMaxStore) {
         super(aUnlocalized, aEnglish, null);
         this.setMaxStackSize(1);
         this.setMaxDamage(100);
         setNoRepair();
         this.heatStorage = aMaxStore;
-        this.setCreativeTab(GregTech_API.TAB_GREGTECH);
+        this.setCreativeTab(GregTechAPI.TAB_GREGTECH);
     }
 
     protected static int getHeatOfStack(ItemStack aStack) {
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java b/src/main/java/gregtech/api/items/ItemCoolantCellIC.java
index eb3c6276cf..00643996d3 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/ItemCoolantCellIC.java
@@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 
-public class GT_CoolantCellIC_Item extends GT_CoolantCell_Item implements IReactorComponent {
+public class ItemCoolantCellIC extends ItemCoolantCell implements IReactorComponent {
 
-    public GT_CoolantCellIC_Item(String aUnlocalized, String aEnglish, int aMaxStore) {
+    public ItemCoolantCellIC(String aUnlocalized, String aEnglish, int aMaxStore) {
         super(aUnlocalized, aEnglish, aMaxStore);
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/ItemEnergyArmor.java
index df820f928a..77c8d0991a 100644
--- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
+++ b/src/main/java/gregtech/api/items/ItemEnergyArmor.java
@@ -25,19 +25,19 @@ import net.minecraftforge.event.entity.living.LivingFallEvent;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTUtility;
 
-public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
+public class ItemEnergyArmor extends ItemArmor implements ISpecialArmor {
 
     public static Map<EntityPlayer, Float> jumpChargeMap = new ConcurrentHashMap<>();
     public int mCharge, mTransfer, mTier, mDamageEnergyCost, mSpecials;
     public boolean mChargeProvider;
     public double mArmorAbsorbtionPercentage;
 
-    public GT_EnergyArmor_Item(int aID, String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier,
+    public ItemEnergyArmor(int aID, String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier,
         int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType,
         int aArmorIndex) {
         super(ArmorMaterial.DIAMOND, aArmorIndex, aType);
@@ -45,7 +45,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         setMaxDamage(100);
         setNoRepair();
         setUnlocalizedName(aUnlocalized);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".name", aEnglish);
+        GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".name", aEnglish);
         mCharge = Math.max(1, aCharge);
         mTransfer = Math.max(1, aTransfer);
         mTier = Math.max(1, aTier);
@@ -54,7 +54,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         mDamageEnergyCost = Math.max(0, aDamageEnergyCost);
         mArmorAbsorbtionPercentage = aArmorAbsorbtionPercentage;
 
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
+        setCreativeTab(GregTechAPI.TAB_GREGTECH);
 
         MinecraftForge.EVENT_BUS.register(this);
     }
@@ -109,29 +109,29 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & 1) != 0) {
             int airSupply = aPlayer.getAir();
-            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && airSupply < 50) {
+            if (GTModHandler.canUseElectricItem(aStack, 1000) && airSupply < 50) {
                 aPlayer.setAir(airSupply + 250);
-                GT_ModHandler.useElectricItem(aStack, 1000, aPlayer);
+                GTModHandler.useElectricItem(aStack, 1000, aPlayer);
             }
         }
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & 4) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 50000) && aPlayer.getFoodStats()
+            if (GTModHandler.canUseElectricItem(aStack, 50000) && aPlayer.getFoodStats()
                 .needFood()) {
                 aPlayer.getFoodStats()
                     .addStats(1, 0.0F);
-                GT_ModHandler.useElectricItem(aStack, 50000, aPlayer);
+                GTModHandler.useElectricItem(aStack, 50000, aPlayer);
             }
         }
 
         if ((mSpecials & 8) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 10000) && aPlayer.isPotionActive(Potion.poison)) {
-                GT_Utility.removePotion(aPlayer, Potion.poison.id);
-                GT_ModHandler.useElectricItem(aStack, 10000, aPlayer);
+            if (GTModHandler.canUseElectricItem(aStack, 10000) && aPlayer.isPotionActive(Potion.poison)) {
+                GTUtility.removePotion(aPlayer, Potion.poison.id);
+                GTModHandler.useElectricItem(aStack, 10000, aPlayer);
             }
-            if (GT_ModHandler.canUseElectricItem(aStack, 100000) && aPlayer.isPotionActive(Potion.wither)) {
-                GT_Utility.removePotion(aPlayer, Potion.wither.id);
-                GT_ModHandler.useElectricItem(aStack, 100000, aPlayer);
+            if (GTModHandler.canUseElectricItem(aStack, 100000) && aPlayer.isPotionActive(Potion.wither)) {
+                GTUtility.removePotion(aPlayer, Potion.wither.id);
+                GTModHandler.useElectricItem(aStack, 100000, aPlayer);
             }
         }
 
@@ -142,9 +142,9 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         if (!aPlayer.worldObj.isRemote && (mSpecials & 128) != 0) {
             float jumpCharge = jumpChargeMap.getOrDefault(aPlayer, 1.0F);
 
-            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) {
+            if (GTModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) {
                 jumpCharge = 1.0F;
-                GT_ModHandler.useElectricItem(aStack, 1000, aPlayer);
+                GTModHandler.useElectricItem(aStack, 1000, aPlayer);
             }
 
             if (aPlayer.motionY >= 0.0D && jumpCharge > 0.0F && !aPlayer.isInWater()) {
@@ -157,14 +157,14 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         }
 
         if ((mSpecials & 256) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 100) && aPlayer.isSprinting()
+            if (GTModHandler.canUseElectricItem(aStack, 100) && aPlayer.isSprinting()
                 && (aPlayer.onGround && Math.abs(aPlayer.motionX) + Math.abs(aPlayer.motionZ) > 0.10000000149011612D
                     || aPlayer.isInWater())) {
-                GT_ModHandler.useElectricItem(aStack, 100, aPlayer);
+                GTModHandler.useElectricItem(aStack, 100, aPlayer);
                 float bonus = 0.22F;
 
                 if (aPlayer.isInWater()) {
-                    GT_ModHandler.useElectricItem(aStack, 100, aPlayer);
+                    GTModHandler.useElectricItem(aStack, 100, aPlayer);
                     bonus = 0.1F;
 
                     if (aPlayer.motionY > 0) {
@@ -177,25 +177,24 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         }
 
         if ((mSpecials & 512) != 0) {
-            if (GT_ModHandler.canUseElectricItem(aStack, 10000)) {
-                GT_ModHandler.useElectricItem(aStack, 10000, aPlayer);
+            if (GTModHandler.canUseElectricItem(aStack, 10000)) {
+                GTModHandler.useElectricItem(aStack, 10000, aPlayer);
                 aPlayer.addPotionEffect(new PotionEffect(Potion.invisibility.getId(), 25, 1, true));
             }
         }
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & (16 | 32)) != 0) {
-            // if (GregTech_API.sWorldTickCounter%20==0) {
+            // if (GregTechAPI.sWorldTickCounter%20==0) {
             ItemStack tTargetChargeItem = aStack, tTargetDechargeItem = aStack;
 
-            if (GT_ModHandler.chargeElectricItem(tTargetChargeItem, 1, Integer.MAX_VALUE, true, true) < 1) {
+            if (GTModHandler.chargeElectricItem(tTargetChargeItem, 1, Integer.MAX_VALUE, true, true) < 1) {
                 tTargetChargeItem = aPlayer.inventory.armorInventory[2];
             }
-            if (GT_ModHandler.dischargeElectricItem(tTargetDechargeItem, 10, Integer.MAX_VALUE, true, true, true)
-                < 10) {
+            if (GTModHandler.dischargeElectricItem(tTargetDechargeItem, 10, Integer.MAX_VALUE, true, true, true) < 10) {
                 tTargetDechargeItem = aPlayer.inventory.armorInventory[2];
             }
 
-            if (tTargetChargeItem == null || !GT_ModHandler.isElectricItem(tTargetChargeItem)) {
+            if (tTargetChargeItem == null || !GTModHandler.isElectricItem(tTargetChargeItem)) {
                 tTargetChargeItem = null;
             }
 
@@ -204,15 +203,15 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
                 MathHelper.floor_double(aPlayer.posY + 1),
                 MathHelper.floor_double(aPlayer.posZ))) {
                 if ((mSpecials & 32) != 0 && tTargetChargeItem != null) {
-                    GT_ModHandler.chargeElectricItem(tTargetChargeItem, 20, Integer.MAX_VALUE, true, false);
+                    GTModHandler.chargeElectricItem(tTargetChargeItem, 20, Integer.MAX_VALUE, true, false);
                 }
             } else {
                 /*
                  * TODO: if ((mSpecials & 16) != 0 && tTargetDechargeItem != null &&
-                 * GT_ModHandler.canUseElectricItem(tTargetDechargeItem, 10)) { if (aPlayer.worldObj.getBlock
+                 * GTModHandler.canUseElectricItem(tTargetDechargeItem, 10)) { if (aPlayer.worldObj.getBlock
                  * ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ) == Blocks.air) aPlayer.worldObj.setBlock
-                 * ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ, GregTech_API.sBlockList[3]);
-                 * GT_ModHandler.useElectricItem(tTargetDechargeItem, 10, aPlayer); }
+                 * ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ, GregTechAPI.sBlockList[3]);
+                 * GTModHandler.useElectricItem(tTargetDechargeItem, 10, aPlayer); }
                  */
                 // }
             }
@@ -228,7 +227,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item aItem, CreativeTabs creativeTab, List<ItemStack> outputSubItems) {
         ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage());
-        GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
+        GTModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
         outputSubItems.add(tCharged);
         outputSubItems.add(tUncharged);
     }
@@ -286,9 +285,9 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
                 if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) {
                     int distanceFactor = (int) event.distance - 3;
                     int energyCost = (this.mDamageEnergyCost * distanceFactor) / 4;
-                    if (energyCost <= GT_ModHandler
+                    if (energyCost <= GTModHandler
                         .dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) {
-                        GT_ModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true);
+                        GTModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true);
                         event.setCanceled(true);
                         break;
                     }
@@ -303,9 +302,10 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         return new ISpecialArmor.ArmorProperties(
             (source == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0,
             getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage,
-            mDamageEnergyCost > 0 ? 25
-                * GT_ModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)
-                / mDamageEnergyCost : 0);
+            mDamageEnergyCost > 0
+                ? 25 * GTModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)
+                    / mDamageEnergyCost
+                : 0);
     }
 
     @Override
@@ -316,8 +316,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
     @Override
     public void damageArmor(EntityLivingBase entity, ItemStack itemStack, DamageSource source, int damage,
         int slotIndex) {
-        GT_ModHandler
-            .dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
+        GTModHandler.dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
     }
 
     private double getBaseAbsorptionRatio() {
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
index c927737889..6efc652ef9 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
@@ -1,6 +1,6 @@
 package gregtech.api.items;
 
-import static gregtech.api.util.GT_Utility.formatNumbers;
+import static gregtech.api.util.GTUtility.formatNumbers;
 
 import java.util.List;
 
@@ -9,17 +9,17 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
-import gregtech.common.items.GT_DepletetCell_Item;
+import gregtech.common.items.ItemDepletedCell;
 import ic2.api.item.IBoxable;
 import ic2.core.util.StackUtil;
 
-public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable {
+public class ItemRadioactiveCell extends GTGenericItem implements IBoxable {
 
     protected int cellCount;
     protected int maxDmg;
     protected int dura;
 
-    public GT_RadioactiveCell_Item(String aUnlocalized, String aEnglish, int aCellcount) {
+    public ItemRadioactiveCell(String aUnlocalized, String aEnglish, int aCellcount) {
         super(aUnlocalized, aEnglish, null);
         this.setMaxStackSize(64);
         this.setMaxDamage(100);
@@ -143,7 +143,7 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable
             case 2, 3, 4 -> EnumChatFormatting.GRAY;
             default -> EnumChatFormatting.DARK_GRAY;
         };
-        EnumChatFormatting color1 = this instanceof GT_DepletetCell_Item ? color2 = EnumChatFormatting.DARK_GRAY
+        EnumChatFormatting color1 = this instanceof ItemDepletedCell ? color2 = EnumChatFormatting.DARK_GRAY
             : EnumChatFormatting.WHITE;
         aList.add(
             color1 + String.format(
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
index 2509cf6261..de60fe9c33 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
@@ -7,16 +7,16 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorComponent;
 import ic2.core.IC2Potion;
 import ic2.core.init.MainConfig;
 import ic2.core.util.ConfigUtil;
 
-public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implements IReactorComponent {
+public class ItemRadioactiveCellIC extends ItemRadioactiveCell implements IReactorComponent {
 
     private static final int MYSTERIOUS_MULTIPLIER_HEAT = 4;
     public final int numberOfCells;
@@ -26,7 +26,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
     public final ItemStack sDepleted;
     public final boolean sMox;
 
-    public GT_RadioactiveCellIC_Item(String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, float aEnergy,
+    public ItemRadioactiveCellIC(String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, float aEnergy,
         int aRadiation, float aHeat, ItemStack aDepleted, boolean aMox) {
         super(aUnlocalized, aEnglish, aCellcount);
         setMaxStackSize(64);
@@ -46,7 +46,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
             // see ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric.getOfferedEnergy
             // don't ask, just accept
             float nukePowerMult = 5.0f * ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear");
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(new ItemStack(this))
                 .itemOutputs(aDepleted)
                 .setNEIDesc(
@@ -198,7 +198,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if (this.sRadiation > 0 && (entity instanceof EntityLivingBase entityLiving)) {
-            if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+            if (!GTUtility.isWearingFullRadioHazmat(entityLiving)) {
                 IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
             }
         }
diff --git a/src/main/java/gregtech/api/items/GT_Tool_Item.java b/src/main/java/gregtech/api/items/ItemTool.java
index 9f78bdc3fc..0de68fc90e 100644
--- a/src/main/java/gregtech/api/items/GT_Tool_Item.java
+++ b/src/main/java/gregtech/api/items/ItemTool.java
@@ -2,19 +2,19 @@ package gregtech.api.items;
 
 import net.minecraft.item.ItemStack;