4 files changed, 20 insertions, 20 deletions
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_AlleleEffect.java b/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java
index 25198968d2..128e3dfeb1 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_AlleleEffect.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java
@@ -9,14 +9,14 @@ import forestry.api.genetics.IEffectData;
 import forestry.core.genetics.alleles.Allele;
 
 // helper class for implementing custom bee effects, based on MagicBees' implementation
-public abstract class GT_AlleleEffect extends Allele implements IAlleleBeeEffect {
+public abstract class GTAlleleEffect extends Allele implements IAlleleBeeEffect {
 
     public static final IAlleleBeeEffect FORESTRY_BASE_EFFECT = (IAlleleBeeEffect) AlleleManager.alleleRegistry
         .getAllele("forestry.effectNone");
     protected boolean combinable;
     protected int tickThrottle; // If set, this amount of ticks have to pass before an effect ticks
 
-    public GT_AlleleEffect(String id, boolean isDominant, int tickThrottle) {
+    public GTAlleleEffect(String id, boolean isDominant, int tickThrottle) {
         super("gregtech." + id, "gregtech." + id, isDominant);
         AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.EFFECT);
         combinable = false;
@@ -28,7 +28,7 @@ public abstract class GT_AlleleEffect extends Allele implements IAlleleBeeEffect
         return combinable;
     }
 
-    public GT_AlleleEffect setIsCombinable(boolean canCombine) {
+    public GTAlleleEffect setIsCombinable(boolean canCombine) {
         combinable = canCombine;
         return this;
     }
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_EffectMachineBoost.java b/src/main/java/gregtech/loaders/misc/bees/GTEffectMachineBoost.java
index a50c0452bb..e0454e0d27 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_EffectMachineBoost.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTEffectMachineBoost.java
@@ -11,11 +11,11 @@ import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
 import forestry.core.genetics.EffectData;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;
 
-public class GT_EffectMachineBoost extends GT_AlleleEffect {
+public class GTEffectMachineBoost extends GTAlleleEffect {
 
-    public GT_EffectMachineBoost() {
+    public GTEffectMachineBoost() {
         super("effectMachineBoost", false, 600);
     }
 
@@ -45,7 +45,7 @@ public class GT_EffectMachineBoost extends GT_AlleleEffect {
         // If gt machine of tier lower equal than ev, boost recipe by 2s
         TileEntity tileEntity = world.getTileEntity(xCoord, yCoord, zCoord);
         if (tileEntity instanceof BaseMetaTileEntity machine) {
-            if (machine.getMetaTileEntity() instanceof GT_MetaTileEntity_TieredMachineBlock tieredMachine) {
+            if (machine.getMetaTileEntity() instanceof MTETieredMachineBlock tieredMachine) {
                 if (tieredMachine.mTier <= 4) { // EV
                     if (machine.isActive() && machine.getMaxProgress() > 60) {
                         machine.increaseProgress(40);
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_EffectTreeTwister.java b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
index a36635db57..65c150bd1d 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_EffectTreeTwister.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
@@ -15,10 +15,10 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.GTMod;
+import gregtech.api.util.GTModHandler;
 
-public class GT_EffectTreeTwister extends GT_AlleleEffect {
+public class GTEffectTreeTwister extends GTAlleleEffect {
 
     private static final Integer[] ALLOWED_DIMS = { 2, // spectre
         112, // last millenium
@@ -26,20 +26,20 @@ public class GT_EffectTreeTwister extends GT_AlleleEffect {
         69, // pocket plane
     };
 
-    private static final ItemStack TF_TRANS_SAPLING = GT_ModHandler
+    private static final ItemStack TF_TRANS_SAPLING = GTModHandler
         .getModItem(TwilightForest.ID, "tile.TFSapling", 1, 6);
-    private static final ItemStack BARN_SAPLING = GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaCsapling", 1, 1);
+    private static final ItemStack BARN_SAPLING = GTModHandler.getModItem(GalaxySpace.ID, "barnardaCsapling", 1, 1);
 
     static {
         if (TF_TRANS_SAPLING == null) {
-            GT_Mod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
+            GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
         }
         if (BARN_SAPLING == null) {
-            GT_Mod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
+            GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
         }
     }
 
-    public GT_EffectTreeTwister() {
+    public GTEffectTreeTwister() {
         super("effectTreetwister", false, 0);
     }
 
diff --git a/src/main/java/gregtech/loaders/misc/bees/GT_Flowers.java b/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java
index d2ab1d6297..db96bfb454 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GT_Flowers.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java
@@ -20,20 +20,20 @@ import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 import forestry.api.genetics.ISpeciesRoot;
-import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GTLanguageManager;
 
-public enum GT_Flowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
+public enum GTFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
 
     FLAMING;
 
     protected boolean dominant;
 
-    GT_Flowers() {
+    GTFlowers() {
         dominant = true;
     }
 
     public static void doInit() {
-        for (GT_Flowers effect : values()) {
+        for (GTFlowers effect : values()) {
             effect.register();
         }
     }
@@ -55,7 +55,7 @@ public enum GT_Flowers implements IFlowerProvider, IAlleleFlowers, IChromosomeTy
 
     @Override
     public String getDescription() {
-        return GT_LanguageManager.getTranslation("for.flowers." + name().toLowerCase());
+        return GTLanguageManager.getTranslation("for.flowers." + name().toLowerCase());
     }
 
     public void register() {