diff options
| author | Richard Hendricks <richardhendricks@pobox.com> | 2018-07-21 19:38:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 19:38:57 -0500 |
| commit | e0141f6f8b3b71b499cf6057fb99dfb37e4975f0 (patch) | |
| tree | 35e455d0923a3d13c24d31f15a4e5730515e8e87 /src/main/java/gregtech/common/blocks/GT_Block_Casings1.java | |
| parent | 3f1dbea050ca43850a006c04cf928a3203ca216c (diff) | |
| parent | b10ffbbffb71ab223e147a0fe195e5cee0306bd7 (diff) | |
| download | GT5-Unofficial-e0141f6f8b3b71b499cf6057fb99dfb37e4975f0.tar.gz GT5-Unofficial-e0141f6f8b3b71b499cf6057fb99dfb37e4975f0.tar.bz2 GT5-Unofficial-e0141f6f8b3b71b499cf6057fb99dfb37e4975f0.zip | |
Merge pull request #137 from GTNewHorizons/use_machine_metal_fix
Revert changes for machine metal support, using different method now …
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, 1 insertions, 6 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 0e422c5521..77668caaaa 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -1,6 +1,5 @@ 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; @@ -95,10 +94,6 @@ public class GT_Block_Casings1 } public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) { - 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]; - } + 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]; } } |