diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-10-16 01:02:29 +0200 |
| commit | 148aa7636d15ccf0593b31f39529aea10eba3c19 (patch) | |
| tree | be6bd89b1566812d7843dc0cb292fc1f841d6079 /src/main/java/gregtech/common/blocks/GT_Block_Ores.java | |
| parent | 08217ad00eb35780f2162d5b136a18ef51fe34a1 (diff) | |
| parent | bf25038fc1f45d690c762fcf4e4d2c427aba19fe (diff) | |
| download | GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.gz GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.tar.bz2 GT5-Unofficial-148aa7636d15ccf0593b31f39529aea10eba3c19.zip | |
Merge branch 'Pollution-code' 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 | 20 |
1 files changed, 18 insertions, 2 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 530a67ddac..84336378c5 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -33,11 +33,27 @@ 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, Materials.Stone}; + return new Materials[]{Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Marble, Materials.Basalt, null}; } @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.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)}; + 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)}; } } |