diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-08-11 14:19:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 14:19:10 +0200 |
| commit | 46420e73cbfedab2e7c1c21fd5a23a37827a20c2 (patch) | |
| tree | 52de0584d9497823019e88a4daab9d073aca1c0c | |
| parent | 0ddc793c9d36d2248f32a0aab144347449599773 (diff) | |
| parent | 1b50758a2e07f7ec05e08a535f65f7c0a4f9d712 (diff) | |
| download | GT5-Unofficial-46420e73cbfedab2e7c1c21fd5a23a37827a20c2.tar.gz GT5-Unofficial-46420e73cbfedab2e7c1c21fd5a23a37827a20c2.tar.bz2 GT5-Unofficial-46420e73cbfedab2e7c1c21fd5a23a37827a20c2.zip | |
Merge pull request #1144 from Dimach/unstable
Fixed coloring of pyrolyse oven.
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Casings1.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java index 26797d69c8..08f7118f66 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -1,5 +1,6 @@ package gregtech.common.blocks;
+import gregtech.api.enums.Dyes;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Textures;
import gregtech.api.objects.GT_CopiedBlockTexture;
@@ -15,7 +16,7 @@ public class GT_Block_Casings1 for (byte i = 0; i < 16; i = (byte) (i + 1)) {
Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
}
- Textures.BlockIcons.CASING_BLOCKS[111] = new GT_CopiedBlockTexture(this, 6, 0);
+ Textures.BlockIcons.CASING_BLOCKS[111] = new GT_CopiedBlockTexture(this, 6, 0,Dyes.MACHINE_METAL.mRGBa);
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 26bc2acd39..91b1550d8b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -44,10 +44,10 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[0], + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[111], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN)}; } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[0]}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[111]}; } public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { |