diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-07-22 02:58:39 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-07-22 02:58:39 +0100 |
| commit | 5fe4798e6b133c7fef29eb6d3acc9d37f7dccc25 (patch) | |
| tree | 0ffabb62c9a1d9869c06970ea3284a33c4e4c724 /src/main/java/gregtech | |
| parent | 676e326ec07ca32619154ac3468b44cfa59ca80d (diff) | |
| download | GT5-Unofficial-5fe4798e6b133c7fef29eb6d3acc9d37f7dccc25.tar.gz GT5-Unofficial-5fe4798e6b133c7fef29eb6d3acc9d37f7dccc25.tar.bz2 GT5-Unofficial-5fe4798e6b133c7fef29eb6d3acc9d37f7dccc25.zip | |
Fix harvest level
Diffstat (limited to 'src/main/java/gregtech')
4 files changed, 8 insertions, 8 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 00473e74ec..4b9211623c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -74,6 +74,11 @@ 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 ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 760e1a40e4..87f2c790d9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -109,7 +109,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } public int getHarvestLevel(int aMeta) { - return aMeta % 8; + return 2; } public float getBlockHardness(World aWorld, int aX, int aY, int aZ) { @@ -200,9 +200,4 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements public abstract void getSubBlocks(Item aItem, CreativeTabs aTab, List aList); public abstract ITexture[] getStoneTexture(int aTextureIndex, GT_RenderedTexture aIconSet); - - @Override - public int getMixedBrightnessForBlock(IBlockAccess p_149677_1_, int p_149677_2_, int p_149677_3_, int p_149677_4_) { - return super.getMixedBrightnessForBlock(p_149677_1_, p_149677_2_, p_149677_3_, p_149677_4_); - } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java index 7463e1d276..92814ff844 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java @@ -112,7 +112,7 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract { aList.add(new ItemStack(aItem, 1, i + 6000)); aList.add(new ItemStack(aItem, 1, i + 7000)); aList.add(new ItemStack(aItem, 1, i + 16000)); - aList.add(new ItemStack(aItem, 1, i + 1700)); + aList.add(new ItemStack(aItem, 1, i + 17000)); aList.add(new ItemStack(aItem, 1, i + 18000)); aList.add(new ItemStack(aItem, 1, i + 19000)); aList.add(new ItemStack(aItem, 1, i + 20000)); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java index 4129da8391..1db5ab9b4e 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java @@ -51,7 +51,7 @@ public class GT_Block_Stones extends GT_Block_Stones_Abstract { } public int getHarvestLevel(int aMeta) { - return 3; + return 2; } public float getBlockHardness(World aWorld, int aX, int aY, int aZ) { |