feat(render): active rockbreacker front glow

Used by:
- Advanced Seismic Prospector
- Rock Breaker
- Seismic Prospector
- Charcoal Pit

1 files changed, 129 insertions, 109 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
index 1b5ecbb90d..11e4ef6676 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
@@ -1,16 +1,12 @@
 package gregtech.common.tileentities.machines.multi;
 
-import java.util.ArrayList;
-
-import org.lwjgl.input.Keyboard;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedGlowTexture;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
@@ -22,11 +18,18 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.ChunkPosition;
 import net.minecraftforge.oredict.OreDictionary;
+import org.lwjgl.input.Keyboard;
+
+import java.util.ArrayList;
+
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW;
+import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
 
 public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlockBase {
 
     private boolean running = false;
-    private boolean p1, p2, p3, p4, p5, p6;
 
     public GT_MetaTileEntity_Charcoal_Pit(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
@@ -36,41 +39,9 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
         super(aName);
     }
 
-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Charcoal_Pit(this.mName);
-    }
-
-    public String[] getDescription() {
-        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
-		tt.addMachineType("Charcoal Pile Igniter")
-		.addInfo("Controller for the Charcoal Pit")
-		.addInfo("Converts Logs into Brittle Charcoal blocks")
-		.addInfo("Will automatically start when valid")
-		.addPollutionAmount(100)
-		.addSeparator()
-		.beginVariableStructureBlock(3, 11, 3, 6, 3, 11, false)
-		.addStructureInfo("Can be up to 11x6x11 in size, shape doesn't matter")
-		.addOtherStructurePart("Bricks", "Bottom layer, under all wood logs")
-		.addOtherStructurePart("Dirt/Grass", "All logs must be covered by these, the controller, or bricks")
-		.addOtherStructurePart("Wood Logs", "Inside the previously mentioned blocks")
-		.addStructureInfo("No air between logs allowed")
-		.toolTipFinisher("Gregtech");
-        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
-			return tt.getInformation();
-		} else {
-			return tt.getStructureInformation();
-		}
-    }
-
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide == 1) {
-            return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][10], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)};
-        }
-        return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][10]};
-    }
-
-    public GT_Recipe.GT_Recipe_Map getRecipeMap() {
-        return null;
+    @Override
+    public boolean isFacingValid(byte aFacing) {
+        return aFacing > 1;
     }
 
     @Override
@@ -79,33 +50,31 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
         return false;
     }
 
+    @Override
     public boolean isCorrectMachinePart(ItemStack aStack) {
         return true;
     }
 
-    public boolean isFacingValid(byte aFacing) {
-        return aFacing > 1;
-    }
-
+    @Override
     public boolean checkRecipe(ItemStack aStack) {
         if (!checkRecursiveBlocks()) {
-            this.mEfficiency = 0;
-            this.mEfficiencyIncrease = 0;
-            this.mMaxProgresstime = 0;
+            mEfficiency = 0;
+            mEfficiencyIncrease = 0;
+            mMaxProgresstime = 0;
             running = false;
             return false;
         }
 
         if (mEfficiency == 0) {
-            this.mEfficiency = 10000;
-            this.mEfficiencyIncrease = 10000;
-            this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
-            GT_Pollution.addPollution(getBaseMetaTileEntity(), mMaxProgresstime*10);
+            mEfficiency = 10000;
+            mEfficiencyIncrease = 10000;
+            mMaxProgresstime = Math.max(1, mMaxProgresstime);
+            GT_Pollution.addPollution(getBaseMetaTileEntity(), mMaxProgresstime * 10);
             return true;
         } else {
-            this.mEfficiency = 0;
-            this.mEfficiencyIncrease = 0;
-            this.mMaxProgresstime = 0;
+            mEfficiency = 0;
+            mEfficiencyIncrease = 0;
+            mMaxProgresstime = 0;
         }
         return false;
     }
@@ -114,12 +83,10 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
         ArrayList<ChunkPosition> tList1 = new ArrayList<>();
         ArrayList<ChunkPosition> tList2 = new ArrayList<>();
 
-        Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(0, -1, 0);
-        if (!isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(0, -1, 0))) {
-            return false;
-        } else {
+        Block tBlock = getBaseMetaTileEntity().getBlockOffset(0, -1, 0);
+        if (isWoodLog(tBlock, getBaseMetaTileEntity().getMetaIDOffset(0, -1, 0))) {
             tList2.add(new ChunkPosition(0, -1, 0));
-        }
+        } else return false;
         while (!tList2.isEmpty()) {
             ChunkPosition tPos = tList2.get(0);
             tList2.remove(0);
@@ -129,91 +96,93 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
         }
         if (running) {
             for (ChunkPosition tPos : tList1) {
-                if (isWoodLog(this.getBaseMetaTileEntity().getBlockOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ), this.getBaseMetaTileEntity().getMetaIDOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ)))
-                    this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + tPos.chunkPosX, this.getBaseMetaTileEntity().getYCoord() + tPos.chunkPosY, this.getBaseMetaTileEntity().getZCoord() + tPos.chunkPosZ, GregTech_API.sBlockReinforced, 4, 3);
+                if (isWoodLog(getBaseMetaTileEntity().getBlockOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ), getBaseMetaTileEntity().getMetaIDOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ)))
+                    getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord() + tPos.chunkPosX, getBaseMetaTileEntity().getYCoord() + tPos.chunkPosY, getBaseMetaTileEntity().getZCoord() + tPos.chunkPosZ, GregTech_API.sBlockReinforced, 4, 3);
             }
             running = false;
             return false;
         } else {
-            this.mMaxProgresstime = (int) Math.sqrt(tList1.size() * 240000);
+            mMaxProgresstime = (int) Math.sqrt(tList1.size() * 240000);
         }
         running = true;
         return true;
     }
 
-    private boolean checkAllBlockSides(int aX, int aY, int aZ, ArrayList<ChunkPosition> aList1, ArrayList<ChunkPosition> aList2) {
-        p1 = false;
-        p2 = false;
-        p3 = false;
-        p4 = false;
-        p5 = false;
-        p6 = false;
-        Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX + 1, aY, aZ);
-        if (aX + 1 < 6 && (isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(aX + 1, aY, aZ)))) {
+    private boolean isWoodLog(Block log, int meta) {
+        for (int id : OreDictionary.getOreIDs(new ItemStack(log, 1, meta))) {
+            if (OreDictionary.getOreName(id).equals("logWood"))
+                return true;
+        }
+        String tTool = log.getHarvestTool(meta);
+        return OrePrefixes.log.contains(new ItemStack(log, 1, meta)) && ("axe".equals(tTool)) && (log.getMaterial() == Material.wood);
+    }
+
+    private boolean checkAllBlockSides(int aX, int aY, int aZ, ArrayList<? super ChunkPosition> aList1, ArrayList<? super ChunkPosition> aList2) {
+        boolean expandToChunkXPos = false;
+        boolean expandToChunkXNeg = false;
+        boolean expandToChunkYPos = false;
+        boolean expandToChunkYNeg = false;
+        boolean expandToChunkZPos = false;
+        boolean expandToChunkZNeg = false;
+
+        Block blockXPos = getBaseMetaTileEntity().getBlockOffset(aX + 1, aY, aZ);
+        if (aX + 1 < 6 && (isWoodLog(blockXPos, getBaseMetaTileEntity().getMetaIDOffset(aX + 1, aY, aZ)))) {
             if (!aList1.contains(new ChunkPosition(aX + 1, aY, aZ)) && (!aList2.contains(new ChunkPosition(aX + 1, aY, aZ))))
-                p1 = true;
-        } else if (!(tBlock == Blocks.dirt || tBlock == Blocks.grass)) {
+                expandToChunkXPos = true;
+        } else if (!(blockXPos == Blocks.dirt || blockXPos == Blocks.grass)) {
             return false;
         }
 
-        tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX - 1, aY, aZ);
-        if (aX - 1 > -6 && (isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(aX - 1, aY, aZ)))) {
+        Block blockXNeg = getBaseMetaTileEntity().getBlockOffset(aX - 1, aY, aZ);
+        if (aX - 1 > -6 && (isWoodLog(blockXNeg, getBaseMetaTileEntity().getMetaIDOffset(aX - 1, aY, aZ)))) {
             if (!aList1.contains(new ChunkPosition(aX - 1, aY, aZ)) && (!aList2.contains(new ChunkPosition(aX - 1, aY, aZ))))
-                p2 = true;
-        } else if (!(tBlock == Blocks.dirt || tBlock == Blocks.grass)) {
+                expandToChunkXNeg = true;
+        } else if (!(blockXNeg == Blocks.dirt || blockXNeg == Blocks.grass)) {
             return false;
         }
 
-        tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY + 1, aZ);
-        if (aY + 1 < 1 && (isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(aX, aY + 1, aZ)))) {
+        Block blockYPos = getBaseMetaTileEntity().getBlockOffset(aX, aY + 1, aZ);
+        if (aY + 1 < 1 && (isWoodLog(blockYPos, getBaseMetaTileEntity().getMetaIDOffset(aX, aY + 1, aZ)))) {
             if (!aList1.contains(new ChunkPosition(aX, aY + 1, aZ)) && (!aList2.contains(new ChunkPosition(aX, aY + 1, aZ))))
-                p3 = true;
-        } else if (!(tBlock == Blocks.dirt || tBlock == Blocks.grass || (aX == 0 && aY == -1 && aZ == 0 && tBlock == GregTech_API.sBlockMachines))) {
+                expandToChunkYPos = true;
+        } else if (!(blockYPos == Blocks.dirt || blockYPos == Blocks.grass || (aX == 0 && aY == -1 && aZ == 0 && blockYPos == GregTech_API.sBlockMachines))) {
             return false;
         }
 
-        tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY - 1, aZ);
-        if (aY - 1 > -6 && (isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(aX, aY - 1, aZ)))) {
+        Block blockYNeg = getBaseMetaTileEntity().getBlockOffset(aX, aY - 1, aZ);
+        if (aY - 1 > -6 && (isWoodLog(blockYNeg, getBaseMetaTileEntity().getMetaIDOffset(aX, aY - 1, aZ)))) {
             if (!aList1.contains(new ChunkPosition(aX, aY - 1, aZ)) && (!aList2.contains(new ChunkPosition(aX, aY - 1, aZ))))
-                p4 = true;
-        } else if (tBlock != Blocks.brick_block) {
+                expandToChunkYNeg = true;
+        } else if (blockYNeg != Blocks.brick_block) {
             return false;
         }
 
-        tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY, aZ + 1);
-        if (aZ + 1 < 6 && (isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(aX, aY, aZ + 1)))) {
+        Block blockZPos = getBaseMetaTileEntity().getBlockOffset(aX, aY, aZ + 1);
+        if (aZ + 1 < 6 && (isWoodLog(blockZPos, getBaseMetaTileEntity().getMetaIDOffset(aX, aY, aZ + 1)))) {
             if (!aList1.contains(new ChunkPosition(aX, aY, aZ + 1)) && (!aList2.contains(new ChunkPosition(aX, aY, aZ + 1))))
-                p5 = true;
-        } else if (!(tBlock == Blocks.dirt || tBlock == Blocks.grass)) {
+                expandToChunkZPos = true;
+        } else if (!(blockZPos == Blocks.dirt || blockZPos == Blocks.grass)) {
             return false;
         }
 
-        tBlock = this.getBaseMetaTileEntity().getBlockOffset(aX, aY, aZ - 1);
-        if (aZ - 1 > -6 && (isWoodLog(tBlock, this.getBaseMetaTileEntity().getMetaIDOffset(aX, aY, aZ - 1)))) {
+        Block blockZNeg = getBaseMetaTileEntity().getBlockOffset(aX, aY, aZ - 1);
+        if (aZ - 1 > -6 && (isWoodLog(blockZNeg, getBaseMetaTileEntity().getMetaIDOffset(aX, aY, aZ - 1)))) {
             if (!aList1.contains(new ChunkPosition(aX, aY, aZ - 1)) && (!aList2.contains(new ChunkPosition(aX, aY, aZ - 1))))
-                p6 = true;
-        } else if (!(tBlock == Blocks.dirt || tBlock == Blocks.grass)) {
+                expandToChunkZNeg = true;
+        } else if (!(blockZNeg == Blocks.dirt || blockZNeg == Blocks.grass)) {
             return false;
         }
         aList1.add(new ChunkPosition(aX, aY, aZ));
-        if (p1) aList2.add(new ChunkPosition(aX + 1, aY, aZ));
-        if (p2) aList2.add(new ChunkPosition(aX - 1, aY, aZ));
-        if (p3) aList2.add(new ChunkPosition(aX, aY + 1, aZ));
-        if (p4) aList2.add(new ChunkPosition(aX, aY - 1, aZ));
-        if (p5) aList2.add(new ChunkPosition(aX, aY, aZ + 1));
-        if (p6) aList2.add(new ChunkPosition(aX, aY, aZ - 1));
+        if (expandToChunkXPos) aList2.add(new ChunkPosition(aX + 1, aY, aZ));
+        if (expandToChunkXNeg) aList2.add(new ChunkPosition(aX - 1, aY, aZ));
+        if (expandToChunkYPos) aList2.add(new ChunkPosition(aX, aY + 1, aZ));
+        if (expandToChunkYNeg) aList2.add(new ChunkPosition(aX, aY - 1, aZ));
+        if (expandToChunkZPos) aList2.add(new ChunkPosition(aX, aY, aZ + 1));
+        if (expandToChunkZNeg) aList2.add(new ChunkPosition(aX, aY, aZ - 1));
         return true;
     }
 
-    private boolean isWoodLog(Block log, int meta){
-        for (int id : OreDictionary.getOreIDs(new ItemStack(log, 1, meta))) {
-            if(OreDictionary.getOreName(id).equals("logWood"))
-                return true;
-        }
-        String tTool = log.getHarvestTool(meta);
-        return OrePrefixes.log.contains(new ItemStack(log, 1,meta)) && ((tTool != null) && (tTool.equals("axe"))) && (log.getMaterial() == Material.wood);
-    }
-
+    @Override
     public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
         mWrench = true;
         mScrewdriver = true;
@@ -224,19 +193,70 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
         return true;
     }
 
+    @Override
     public int getMaxEfficiency(ItemStack aStack) {
         return 10000;
     }
 
+    @Override
     public int getPollutionPerTick(ItemStack aStack) {
         return 0;
     }
 
+    @Override
     public int getDamageToComponent(ItemStack aStack) {
         return 0;
     }
 
+    @Override
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
     }
+
+    @Override
+    public GT_Recipe.GT_Recipe_Map getRecipeMap() {
+        return null;
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Charcoal_Pit(mName);
+    }
+
+    @Override
+    public String[] getDescription() {
+        final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+        tt.addMachineType("Charcoal Pile Igniter")
+                .addInfo("Controller for the Charcoal Pit")
+                .addInfo("Converts Logs into Brittle Charcoal blocks")
+                .addInfo("Will automatically start when valid")
+                .addPollutionAmount(100)
+                .addSeparator()
+                .beginVariableStructureBlock(3, 11, 3, 6, 3, 11, false)
+                .addStructureInfo("Can be up to 11x6x11 in size, shape doesn't matter")
+                .addOtherStructurePart("Bricks", "Bottom layer, under all wood logs")
+                .addOtherStructurePart("Dirt/Grass", "All logs must be covered by these, the controller, or bricks")
+                .addOtherStructurePart("Wood Logs", "Inside the previously mentioned blocks")
+                .addStructureInfo("No air between logs allowed")
+                .toolTipFinisher("Gregtech");
+        if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+            return tt.getStructureInformation();
+        } else {
+            return tt.getInformation();
+        }
+    }
+
+    @Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        if (aSide == 1) {
+            if (aActive) return new ITexture[]{
+                    casingTexturePages[0][10],
+                    new GT_RenderedTexture(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE),
+                    new GT_RenderedGlowTexture(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW)};
+            return new ITexture[]{
+                    casingTexturePages[0][10],
+                    new GT_RenderedTexture(OVERLAY_FRONT_ROCK_BREAKER)};
+        }
+        return new ITexture[]{casingTexturePages[0][10]};
+    }
 }