diff options
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Ores.java | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index fb3b07e45a..1a751b38d0 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -177,7 +177,7 @@ public class GregTech_API { */ public static Block sBlockMachines; - public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, sBlockGem, sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; + public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, /*sBlockGem,*/ sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; public static Block sBlockGranites, sBlockConcretes, sBlockStones; public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5; /** 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)}; } } |