aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-09-12 21:04:33 +0200
committerGitHub <noreply@github.com>2017-09-12 21:04:33 +0200
commit73c197ff25451b1a1b95e0f7606459d2bb5f6b20 (patch)
treefc49104d656fde61b9c7c3d3606c15b292803669 /src/main/java/gregtech/common/blocks/GT_Block_Ores.java
parent9cbb9c66a2f63e7e0cb4aceebfc9c93776b82be2 (diff)
parent8c46d09159f51bc01e3b3e834b152dfd80aa660c (diff)
downloadGT5-Unofficial-73c197ff25451b1a1b95e0f7606459d2bb5f6b20.tar.gz
GT5-Unofficial-73c197ff25451b1a1b95e0f7606459d2bb5f6b20.tar.bz2
GT5-Unofficial-73c197ff25451b1a1b95e0f7606459d2bb5f6b20.zip
Merge branch 'unstable' into drillers-upgrade
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.java6
1 files changed, 6 insertions, 0 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 c754e79bd8..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;
@@ -51,6 +52,11 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract {
}
@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.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)};
}