GT++ multiblock glow texture support (#3704)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
GTNewHorizons · Dec 26, 2024 · 569c3ee · 569c3ee
1 parent 633c49d
commit 569c3ee
Show file tree

Hide file tree

Showing 179 changed files with 950 additions and 62 deletions.
diff --git a/.../gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/.../gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
@@ -1119,27 +1119,56 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite
     @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
         int aColorIndex, boolean aActive, boolean aRedstone) {
-        if (side == facing) {
-            if (aActive) return new ITexture[] { getCasingTexture(), TextureFactory.builder()
-                .addIcon(getActiveOverlay())
+        ITexture casingTexture = getCasingTexture();
+        if (side != facing) {
+            return new ITexture[] { casingTexture };
+        }
+
+        int textures = 1;
+        IIconContainer container = aActive ? getActiveOverlay() : getInactiveOverlay();
+        ITexture overlay = null;
+        if (container != null) {
+            textures++;
+            overlay = TextureFactory.builder()
+                .addIcon(container)
                 .extFacing()
-                .build() };
-            return new ITexture[] { getCasingTexture(), TextureFactory.builder()
-                .addIcon(getInactiveOverlay())
+                .build();
+        }
+
+        IIconContainer glowContainer = aActive ? getActiveGlowOverlay() : getInactiveGlowOverlay();
+        ITexture glowOverlay = null;
+        if (glowContainer != null) {
+            textures++;
+            glowOverlay = TextureFactory.builder()
+                .addIcon(glowContainer)
                 .extFacing()
-                .build() };
+                .glow()
+                .build();
         }
-        return new ITexture[] { getCasingTexture() };
+
+        ITexture[] retVal = new ITexture[textures];
+        retVal[0] = getCasingTexture();
+        if (overlay != null) retVal[1] = overlay;
+        if (glowOverlay != null) retVal[2] = glowOverlay;
+        return retVal;
     }
 
     protected IIconContainer getActiveOverlay() {
         return null;
     }
 
+    protected IIconContainer getActiveGlowOverlay() {
+        return null;
+    }
+
     protected IIconContainer getInactiveOverlay() {
         return null;
     }
 
+    protected IIconContainer getInactiveGlowOverlay() {
+        return null;
+    }
+
     protected ITexture getCasingTexture() {
         return Textures.BlockIcons.getCasingTextureForId(getCasingTextureId());
     }

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
diff --git a/...a/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java b/...a/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java
@@ -125,11 +125,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCAAmazonPackagerActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCAAmazonPackagerActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCAAmazonPackager;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCAAmazonPackagerGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return TAE.getIndexFromPage(2, 9);

diff --git a/...mod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java b/...mod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java
@@ -66,11 +66,21 @@ protected IIconContainer getActiveOverlay() {
         return Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE_GLOW;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return Textures.BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_GLOW;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return CASING_TEXTURE_ID;

diff --git a/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java b/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java
@@ -216,11 +216,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialArcFurnaceActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialArcFurnaceActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialArcFurnace;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialArcFurnaceGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return mCasingTextureID;

diff --git a/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java b/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java
@@ -41,14 +41,11 @@
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 
 public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCentrifuge>
     implements ISurvivalConstructable {
 
     private boolean mIsAnimated;
-    private static final CustomIcon frontFaceActive = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
-    private static final CustomIcon frontFace = new CustomIcon("iconsets/LARGECENTRIFUGE5");
     private int mCasing;
     private static IStructureDefinition<MTEIndustrialCentrifuge> STRUCTURE_DEFINITION = null;
     // public static double recipesComplete = 0;

diff --git a/...Plus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java b/...Plus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
@@ -143,11 +143,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialChiselActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialChiselActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialChisel;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialChiselGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return 90;

diff --git a/...us/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java b/...us/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java
@@ -158,11 +158,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCACokeOvenActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCACokeOvenActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCACokeOven;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCACokeOvenGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return TAE.GTPP_INDEX(1);

diff --git a/...d/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java b/...d/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java
@@ -145,11 +145,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialCuttingMachineActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialCuttingMachineActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialCuttingMachine;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialCuttingMachineGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return TAE.GTPP_INDEX(29);

diff --git a/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java b/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
@@ -155,11 +155,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialDehydratorActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialDehydratorActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialDehydrator;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialDehydratorGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return CASING_TEXTURE_ID;

diff --git a/...us/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java b/...us/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java
@@ -126,11 +126,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialExtruderActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialExtruderActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialExtruder;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialExtruderGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return TAE.GTPP_INDEX(33);

diff --git a/...xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java b/...xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java
@@ -138,11 +138,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCAFluidHeaterActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCAFluidHeaterActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCAFluidHeater;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCAFluidHeaterGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return TAE.getIndexFromPage(0, 1);

diff --git a/...xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java b/...xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java
@@ -193,11 +193,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialForgeHammerActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialForgeHammerActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialForgeHammer;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialForgeHammerGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return TAE.getIndexFromPage(1, 11);

diff --git a/...s/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java b/...s/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
@@ -216,11 +216,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.Overlay_MatterFab_Active;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.Overlay_MatterFab_Active_Glow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.Overlay_MatterFab;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.Overlay_MatterFab_Glow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         if (structureTier == 2) return TAE.GTPP_INDEX(7);

diff --git a/...sPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java b/...sPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java
@@ -152,11 +152,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialMixerActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialMixerActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialMixer;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialMixerGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return CASING_TEXTURE_ID;

diff --git a/...tech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java b/...tech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java
@@ -186,11 +186,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialMolecularTransformerActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialMolecularTransformerActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCAIndustrialMolecularTransformer;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCAIndustrialMolecularTransformerGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return 44;

diff --git a/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java b/.../xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java
@@ -145,11 +145,21 @@ protected IIconContainer getActiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialPlatePressActive;
     }
 
+    @Override
+    protected IIconContainer getActiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialPlatePressActiveGlow;
+    }
+
     @Override
     protected IIconContainer getInactiveOverlay() {
         return TexturesGtBlock.oMCDIndustrialPlatePress;
     }
 
+    @Override
+    protected IIconContainer getInactiveGlowOverlay() {
+        return TexturesGtBlock.oMCDIndustrialPlatePressGlow;
+    }
+
     @Override
     protected int getCasingTextureId() {
         return 50;