diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-13 07:02:42 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-13 07:02:42 +0200 |
| commit | f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35 (patch) | |
| tree | dd7e4001a76b39d2515d29643749523e08ce5572 /src/main/java/gregtech/common/blocks/GT_Block_Ores.java | |
| parent | 025e525441a11acf66504f406571ea1697ec9c6b (diff) | |
| parent | 09013db3ddb09aa908980a5d6324b126c3aab05f (diff) | |
| download | GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.tar.gz GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.tar.bz2 GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Ores.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Ores.java | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java index 70200e5199..bab31d85ed 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -1,5 +1,6 @@ package gregtech.common.blocks; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -47,27 +48,16 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract { @Override public Materials[] getDroppedDusts() { //Must have 8 entries; can be null. - return new Materials[]{Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Marble, Materials.Basalt, null}; + return new Materials[]{Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Marble, Materials.Basalt, Materials.Stone}; + } + + @Override + public boolean[] getEnabledMetas() { + return new boolean[]{true, true, true, GT_Mod.gregtechproxy.enableBlackGraniteOres, GT_Mod.gregtechproxy.enableRedGraniteOres, GT_Mod.gregtechproxy.enableMarbleOres, GT_Mod.gregtechproxy.enableBasaltOres, true}; } @Override public ITexture[] getTextureSet() { //Must have 16 entries. - return new ITexture[]{ - new GT_CopiedBlockTexture(Blocks.stone, 0, 0), - new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0), - new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0), - new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE), - new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE), - new GT_RenderedTexture(Textures.BlockIcons.MARBLE_STONE), - new GT_RenderedTexture(Textures.BlockIcons.BASALT_STONE), - new GT_CopiedBlockTexture(Blocks.stone, 0, 0), - new GT_CopiedBlockTexture(Blocks.stone, 0, 0), - new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0), - new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0), - new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE), - new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE), - new GT_RenderedTexture(Textures.BlockIcons.MARBLE_STONE), - new GT_RenderedTexture(Textures.BlockIcons.BASALT_STONE), - new GT_CopiedBlockTexture(Blocks.stone, 0, 0)}; + return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.netherrack, 0, 0), new GT_CopiedBlockTexture(Blocks.end_stone, 0, 0), new GT_RenderedTexture(Textures.BlockIcons.GRANITE_BLACK_STONE), new GT_RenderedTexture(Textures.BlockIcons.GRANITE_RED_STONE), new GT_RenderedTexture(Textures.BlockIcons.MARBLE_STONE), new GT_RenderedTexture(Textures.BlockIcons.BASALT_STONE), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0), new GT_CopiedBlockTexture(Blocks.stone, 0, 0)}; } -} +}
\ No newline at end of file |