diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-10-02 13:49:45 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-10-02 13:49:45 +0200 |
| commit | a64dc0f33a5114923be342a2225dea1fac8fd92f (patch) | |
| tree | b05eb7ceb4dba3c033d79866d8732a67792aaf92 /src/main/java/gregtech/common/blocks/GT_Block_Ores.java | |
| parent | 125201371f0ec10a2243e2055931bb6807399ce9 (diff) | |
| parent | 86a53b05a83cbfb5b3b940d3d93f00b76f638f93 (diff) | |
| download | GT5-Unofficial-a64dc0f33a5114923be342a2225dea1fac8fd92f.tar.gz GT5-Unofficial-a64dc0f33a5114923be342a2225dea1fac8fd92f.tar.bz2 GT5-Unofficial-a64dc0f33a5114923be342a2225dea1fac8fd92f.zip | |
Merge branch 'Testing-new-Commits' 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 | 7 |
1 files changed, 1 insertions, 6 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 b7585f17b7..530a67ddac 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -13,7 +13,7 @@ import net.minecraft.init.Blocks; public class GT_Block_Ores extends GT_Block_Ores_Abstract { public GT_Block_Ores() { - super("gt.blockores", false, Material.rock); + super("gt.blockores", 7, false, Material.rock); } @Override @@ -37,11 +37,6 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract { } @Override - public int getHarvestLevel(int aMeta) { - return aMeta == 5 || aMeta == 6 ? 2 : aMeta % 8; - } - - @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)}; } |