Texturework in GT++ (#2945)

* Leaves, Breads and Pizzas re texture

* Crop Blocks Added

* Fix Advanced Boilers top texture

* Adding more controller faces

* Remove redundant code

* Finish controllers and code readability

* spotlessApply to fix violations

* Better Tank texture

* Various Fixes

* Various Fixes

* Oopsies

* Spotless Apply again...
minor adjustments to drinks

* Revert public api changes and scanner textures reference
couldnt find reason why it was throwing NoSuchFieldError even when crops plus plus was recompiled with correct paths

* spotless

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

3 files changed, 115 insertions, 124 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index 6c908aadac..8d2e0959e1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -1,27 +1,11 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_GLOW;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MachineType;
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -49,51 +33,65 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine
             2,
             1,
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_BOXINATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_BOXINATOR),
+                TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_BOXINATOR_GLOW)
+                    .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_BOXINATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_BOXINATOR),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_BOXINATOR_GLOW)
+                    .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_BOXINATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_BOXINATOR),
+                TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_BOXINATOR_GLOW)
+                    .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_BOXINATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_BOXINATOR),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_BOXINATOR_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR_GLOW"))
                     .glow()
                     .build()));
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
index 15150abf67..8254c6440d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
@@ -1,22 +1,5 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_GLOW;
-
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -26,6 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.MachineType;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -49,51 +33,74 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
             1,
             0,
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_POTIONBREWER_ACTIVE),
+                TextureFactory.of(
+                    new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_POTIONBREWER),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_POTIONBREWER_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+                TextureFactory.of(
+                    new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_POTIONBREWER),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_POTIONBREWER_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_POTIONBREWER_ACTIVE),
+                TextureFactory.of(
+                    new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_POTIONBREWER),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_POTIONBREWER_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE),
+                TextureFactory.of(
+                    new Textures.BlockIcons.CustomIcon(
+                        "basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_POTIONBREWER),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_POTIONBREWER_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_GLOW"))
                     .glow()
                     .build()));
     }
@@ -136,31 +143,14 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
                     tInputName = tInputName.replaceFirst("." + tModifier, "");
                 }
                 if (GT_Utility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0))) {
-                    if (tInputName.equals("poison")) {
-                        return setOutput("potion.damage" + tModifier);
-                    }
-                    if (tInputName.equals("health")) {
-                        return setOutput("potion.damage" + tModifier);
-                    }
-                    if (tInputName.equals("waterbreathing")) {
-                        return setOutput("potion.damage" + tModifier);
-                    }
-                    if (tInputName.equals("nightvision")) {
-                        return setOutput("potion.invisibility" + tModifier);
-                    }
-                    if (tInputName.equals("fireresistance")) {
-                        return setOutput("potion.slowness" + tModifier);
-                    }
-                    if (tInputName.equals("speed")) {
-                        return setOutput("potion.slowness" + tModifier);
-                    }
-                    if (tInputName.equals("strength")) {
-                        return setOutput("potion.weakness" + tModifier);
-                    }
-                    if (tInputName.equals("regen")) {
-                        return setOutput("potion.poison" + tModifier);
-                    }
-                    return setOutput("potion.weakness");
+                    return switch (tInputName) {
+                        case "poison", "health", "waterbreathing" -> setOutput("potion.damage" + tModifier);
+                        case "nightvision" -> setOutput("potion.invisibility" + tModifier);
+                        case "fireresistance", "speed" -> setOutput("potion.slowness" + tModifier);
+                        case "strength" -> setOutput("potion.weakness" + tModifier);
+                        case "regen" -> setOutput("potion.poison" + tModifier);
+                        default -> setOutput("potion.weakness");
+                    };
                 }
                 if (GT_Utility.areStacksEqual(
                     GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L),
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
index a15d5b7f6d..e9f3d98dd5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
@@ -1,22 +1,5 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_GLOW;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -24,6 +7,7 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MachineType;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -45,51 +29,70 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine
             1,
             1,
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_REPLICATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_SIDE_REPLICATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/replicator/OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_REPLICATOR),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_SIDE_REPLICATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_REPLICATOR_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_SIDE_REPLICATOR_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_REPLICATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_FRONT_REPLICATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/replicator/OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_REPLICATOR),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_FRONT_REPLICATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_REPLICATOR_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_FRONT_REPLICATOR_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_REPLICATOR_ACTIVE),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_TOP_REPLICATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/replicator/OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_REPLICATOR),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_TOP_REPLICATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_REPLICATOR_GLOW)
+                    .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_TOP_REPLICATOR_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_REPLICATOR_ACTIVE),
+                TextureFactory.of(
+                    new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR_ACTIVE")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon(
+                            "basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW"))
                     .glow()
                     .build()),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_REPLICATOR),
+                TextureFactory
+                    .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR")),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_REPLICATOR_GLOW)
+                    .addIcon(
+                        new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR_GLOW"))
                     .glow()
                     .build()));
     }