From 74decf0b6cc52cc2dde7ed2d829129715bde8e0a Mon Sep 17 00:00:00 2001 From: Xander Date: Wed, 8 Nov 2017 19:31:15 +0800 Subject: [PATCH] call the fallback silk touch function on exception --- .../java/mekanism/common/util/MinerUtils.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index e8f571567..d808dff2e 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -55,16 +55,12 @@ public final class MinerUtils } } catch (InvocationTargetException|IllegalAccessException e){ Mekanism.logger.error("Block.getSilkTouchDrop errored", e); + fallbackGetSilkTouch(block, state, ret); } } else//fallback to old method { - Item item = Item.getItemFromBlock(block); - if (item != null && item != Items.AIR) - { - int meta = item.getHasSubtypes() ? block.getMetaFromState(state) : 0; - ret.add(new ItemStack(item, 1, meta)); - } + fallbackGetSilkTouch(block, state, ret); } if (ret.size() > 0) @@ -88,4 +84,13 @@ public final class MinerUtils return new LinkedList<>(); } + + private static void fallbackGetSilkTouch(Block block, IBlockState state, List ret){ + Item item = Item.getItemFromBlock(block); + if (item != null && item != Items.AIR) + { + int meta = item.getHasSubtypes() ? block.getMetaFromState(state) : 0; + ret.add(new ItemStack(item, 1, meta)); + } + } }