From c9ae6436bd50649c620b90acbcd6328e8b1350b0 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 16 May 2013 08:41:57 -0400
Subject: [PATCH] Because we forget things too often.

---
 .../com/gmail/nossr50/util/BlockUtils.java    | 100 +++---------------
 1 file changed, 16 insertions(+), 84 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java
index 5f43d585f..811a4db00 100644
--- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java
@@ -19,59 +19,7 @@ public final class BlockUtils {
      * @return true if the block awards XP, false otherwise
      */
     public static boolean shouldBeWatched(BlockState blockState) {
-        switch (blockState.getType()) {
-            case BROWN_MUSHROOM:
-            case CACTUS:
-            case CLAY:
-            case COAL_ORE:
-            case DIAMOND_ORE:
-            case DIRT:
-            case ENDER_STONE:
-            case GLOWING_REDSTONE_ORE:
-            case GLOWSTONE:
-            case GOLD_ORE:
-            case GRASS:
-            case GRAVEL:
-            case HUGE_MUSHROOM_1:
-            case HUGE_MUSHROOM_2:
-            case IRON_ORE:
-            case LAPIS_ORE:
-            case LOG:
-            case MELON_BLOCK:
-            case MOSSY_COBBLESTONE:
-            case MYCEL:
-            case NETHERRACK:
-            case OBSIDIAN:
-            case PUMPKIN:
-            case QUARTZ_ORE:
-            case RED_MUSHROOM:
-            case RED_ROSE:
-            case REDSTONE_ORE:
-            case SAND:
-            case SANDSTONE:
-            case SOUL_SAND:
-            case STONE:
-            case SUGAR_CANE_BLOCK:
-            case VINE:
-            case WATER_LILY:
-            case YELLOW_FLOWER:
-            case EMERALD_ORE:
-                return true;
-
-            case CARROT:
-            case CROPS:
-            case POTATO:
-                return blockState.getRawData() == CropState.RIPE.getData();
-
-            case NETHER_WARTS:
-                return ((NetherWarts) blockState.getData()).getState() == NetherWartsState.RIPE;
-
-            case COCOA:
-                return ((CocoaPlant) blockState.getData()).getSize() == CocoaPlantSize.LARGE;
-
-            default:
-                return ModUtils.getCustomBlock(blockState) != null;
-        }
+        return affectedByGigaDrillBreaker(blockState) || affectedByGreenTerra(blockState) || affectedBySuperBreaker(blockState) || isLog(blockState);
     }
 
     /**
@@ -111,17 +59,7 @@ public final class BlockUtils {
                 return false;
 
             default:
-                int blockId = blockState.getTypeId();
-
-                if (blockId == Config.getInstance().getRepairAnvilId() || blockId == Config.getInstance().getSalvageAnvilId()) {
-                    return false;
-                }
-
-                if (ModUtils.isCustomAbilityBlock(blockState)) {
-                    return false;
-                }
-
-                return true;
+                return !isMcMMOAnvil(blockState) && !ModUtils.isCustomAbilityBlock(blockState);
         }
     }
 
@@ -214,26 +152,17 @@ public final class BlockUtils {
      */
     public static Boolean affectedBySuperBreaker(BlockState blockState) {
         switch (blockState.getType()) {
-            case COAL_ORE:
-            case DIAMOND_ORE:
             case ENDER_STONE:
-            case GLOWING_REDSTONE_ORE:
             case GLOWSTONE:
-            case GOLD_ORE:
-            case IRON_ORE:
-            case LAPIS_ORE:
             case MOSSY_COBBLESTONE:
             case NETHERRACK:
             case OBSIDIAN:
-            case QUARTZ_ORE:
-            case REDSTONE_ORE:
             case SANDSTONE:
             case STONE:
-            case EMERALD_ORE:
                 return true;
 
             default:
-                return ModUtils.isCustomMiningBlock(blockState);
+                return isOre(blockState) || ModUtils.isCustomMiningBlock(blockState);
         }
     }
 
@@ -266,16 +195,7 @@ public final class BlockUtils {
      * @return true if the block should affected by Tree Feller, false otherwise
      */
     public static boolean affectedByTreeFeller(BlockState blockState) {
-        switch (blockState.getType()) {
-            case LOG:
-            case LEAVES:
-            case HUGE_MUSHROOM_1:
-            case HUGE_MUSHROOM_2:
-                return true;
-
-            default:
-                return ModUtils.isCustomWoodcuttingBlock(blockState);
-        }
+        return isLog(blockState) || isLeaves(blockState);
     }
 
     /**
@@ -379,4 +299,16 @@ public final class BlockUtils {
                 return false;
         }
     }
+
+    /**
+     * Determine if a given block is an mcMMO anvil
+     *
+     * @param blockState The {@link BlockState} of the block to check
+     * @return true if the block is an mcMMO anvil, false otherwise
+     */
+    private static boolean isMcMMOAnvil(BlockState blockState) {
+        int blockId = blockState.getTypeId();
+
+        return blockId == Config.getInstance().getRepairAnvilId() || blockId == Config.getInstance().getSalvageAnvilId();
+    }
 }