aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
diff options
context:
space:
mode:
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.java28
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