diff options
| author | Richard Hendricks <richardhendricks@pobox.com> | 2018-06-05 18:25:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 18:25:54 -0500 |
| commit | 5c15ec845dd4c655a927cc02550ed964c8864655 (patch) | |
| tree | 5240e9762ea06e3ce5a4685f9ec26c7e151ff767 /src/main/java/gregtech/common/blocks/GT_Block_Casings1.java | |
| parent | 1ba415a2c3ff0e939382da84eecce7242a6f403b (diff) | |
| parent | 4ddcc361027a994a93859302322a24c6a303d6cf (diff) | |
| download | GT5-Unofficial-5c15ec845dd4c655a927cc02550ed964c8864655.tar.gz GT5-Unofficial-5c15ec845dd4c655a927cc02550ed964c8864655.tar.bz2 GT5-Unofficial-5c15ec845dd4c655a927cc02550ed964c8864655.zip | |
Merge pull request #126 from GTNewHorizons/feature/machinemetal
Added option for disabling machinemetal tinting.
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Casings1.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Casings1.java | 7 |
1 files changed, 6 insertions, 1 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 77668caaaa..0e422c5521 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.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; import gregtech.api.objects.GT_CopiedBlockTexture; @@ -94,6 +95,10 @@ public class GT_Block_Casings1 } public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) { - return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2]; + if (GregTech_API.sUseMachineMetal) { + return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2]; + } else { + return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.dyeWhite.mRGBa[0] << 16 | gregtech.api.enums.Dyes.dyeWhite.mRGBa[1] << 8 | gregtech.api.enums.Dyes.dyeWhite.mRGBa[2]; + } } } |