clean up tool classes impl

serenibyss · serenibyss · commit d1a5619d58cc · 2021-08-10T23:58:21.000-05:00
diff --git a/src/main/java/gregtech/common/tools/ToolAxe.java b/src/main/java/gregtech/common/tools/ToolAxe.java
@@ -53,7 +53,7 @@ public float getAttackSpeed(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("axe")) ||
+        return (tool != null && AXE_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.WOOD;
     }
 
diff --git a/src/main/java/gregtech/common/tools/ToolCrowbar.java b/src/main/java/gregtech/common/tools/ToolCrowbar.java
@@ -41,7 +41,7 @@ public void onStatsAddedToTool(MetaValueItem item) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("crowbar")) ||
+        return (tool != null && CROWBAR_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.CIRCUITS;
     }
 
diff --git a/src/main/java/gregtech/common/tools/ToolFile.java b/src/main/java/gregtech/common/tools/ToolFile.java
@@ -29,7 +29,7 @@ public float getBaseDamage(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("file")) ||
+        return (tool != null && FILE_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.CIRCUITS;
     }
 
diff --git a/src/main/java/gregtech/common/tools/ToolHardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java
@@ -1,5 +1,6 @@
 package gregtech.common.tools;
 
+import com.google.common.collect.ImmutableSet;
 import gregtech.api.recipes.MatchingMode;
 import gregtech.api.recipes.RecipeMaps;
 import net.minecraft.block.material.Material;
@@ -16,16 +17,12 @@
 import net.minecraft.world.World;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 public class ToolHardHammer extends ToolBase {
 
-    private static final Set<String> HAMMER_TOOL_CLASSES = new HashSet<String>() {{
-        add("hammer");
-        add("pickaxe");
-    }};
+    private static final Set<String> HAMMER_TOOL_CLASSES = ImmutableSet.of("hammer", "pickaxe");
 
     @Override
     public boolean canApplyEnchantment(ItemStack stack, Enchantment enchantment) {
@@ -78,7 +75,7 @@ public float getAttackSpeed(ItemStack stack) {
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
         ItemStack itemStack = new ItemStack(block.getBlock(), 1, block.getBlock().getMetaFromState(block));
-        return (tool != null && (tool.equals("hammer") || tool.equals("pickaxe"))) ||
+        return (tool != null && HAMMER_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.ROCK ||
                 block.getMaterial() == Material.GLASS ||
                 block.getMaterial() == Material.ICE ||
diff --git a/src/main/java/gregtech/common/tools/ToolHoe.java b/src/main/java/gregtech/common/tools/ToolHoe.java
@@ -26,7 +26,7 @@ public float getBaseDamage(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("hoe")) ||
+        return (tool != null && HOE_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.GROUND;
     }
 
diff --git a/src/main/java/gregtech/common/tools/ToolMiningHammer.java b/src/main/java/gregtech/common/tools/ToolMiningHammer.java
@@ -1,5 +1,6 @@
 package gregtech.common.tools;
 
+import com.google.common.collect.ImmutableSet;
 import gregtech.api.items.toolitem.ToolMetaItem;
 import gregtech.api.util.GTUtility;
 import gregtech.common.items.behaviors.ModeSwitchBehavior;
@@ -20,10 +21,7 @@
 
 public class ToolMiningHammer extends ToolBase {
 
-    private static final Set<String> HAMMER_TOOL_CLASSES = new HashSet<String>() {{
-        add("pickaxe");
-        add("hammer");
-    }};
+    private static final Set<String> HAMMER_TOOL_CLASSES = ImmutableSet.of("pickaxe", "hammer");
 
     public enum MiningHammerMode implements ModeSwitchBehavior.ILocalizationKey {
         THREE_BY_THREE("metaitem.drill.mode.three_by_three", 3, 3, 0.75f),
@@ -89,7 +87,7 @@ public float getMaxDurabilityMultiplier(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && (tool.equals("hammer") || tool.equals("pickaxe"))) ||
+        return (tool != null && HAMMER_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.ROCK ||
                 block.getMaterial() == Material.GLASS ||
                 block.getMaterial() == Material.ICE ||
diff --git a/src/main/java/gregtech/common/tools/ToolPickaxe.java b/src/main/java/gregtech/common/tools/ToolPickaxe.java
@@ -36,7 +36,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("pickaxe")) ||
+        return (tool != null && PICK_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.ROCK ||
                 block.getMaterial() == Material.IRON ||
                 block.getMaterial() == Material.ANVIL ||
diff --git a/src/main/java/gregtech/common/tools/ToolSaw.java b/src/main/java/gregtech/common/tools/ToolSaw.java
@@ -1,5 +1,6 @@
 package gregtech.common.tools;
 
+import com.google.common.collect.ImmutableSet;
 import gregtech.api.items.toolitem.ToolMetaItem;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -18,16 +19,12 @@
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 public class ToolSaw extends ToolBase {
 
-    private static final Set<String> SAW_TOOL_CLASSES = new HashSet<String>() {{
-        add("axe");
-        add("saw");
-    }};
+    private static final Set<String> SAW_TOOL_CLASSES = ImmutableSet.of("axe", "saw");
 
     @Override
     public boolean canApplyEnchantment(ItemStack stack, Enchantment enchantment) {
@@ -52,7 +49,7 @@ public float getBaseDamage(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && (tool.equals("axe") || tool.equals("saw"))) ||
+        return (tool != null && SAW_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.LEAVES ||
                 block.getMaterial() == Material.VINE ||
                 block.getMaterial() == Material.WOOD ||
diff --git a/src/main/java/gregtech/common/tools/ToolScoop.java b/src/main/java/gregtech/common/tools/ToolScoop.java
@@ -20,7 +20,7 @@ public int getToolDamagePerBlockBreak(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return tool != null && tool.equals("scoop");
+        return tool != null && SCOOP_TOOL_CLASSES.contains(tool);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolScrewdriver.java b/src/main/java/gregtech/common/tools/ToolScrewdriver.java
@@ -37,7 +37,7 @@ public float getBaseDamage(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("screwdriver")) ||
+        return (tool != null && DRIVER_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.CIRCUITS;
     }
 
diff --git a/src/main/java/gregtech/common/tools/ToolShovel.java b/src/main/java/gregtech/common/tools/ToolShovel.java
@@ -41,7 +41,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("shovel")) ||
+        return (tool != null && SHOVEL_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.SAND ||
                 block.getMaterial() == Material.GRASS ||
                 block.getMaterial() == Material.GROUND ||
diff --git a/src/main/java/gregtech/common/tools/ToolSword.java b/src/main/java/gregtech/common/tools/ToolSword.java
@@ -51,7 +51,7 @@ public boolean canPerformSweepAttack(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && tool.equals("sword")) ||
+        return (tool != null && SWORD_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.LEAVES ||
                 block.getMaterial() == Material.GOURD ||
                 block.getMaterial() == Material.VINE ||
diff --git a/src/main/java/gregtech/common/tools/ToolUniversalSpade.java b/src/main/java/gregtech/common/tools/ToolUniversalSpade.java
@@ -1,23 +1,17 @@
 package gregtech.common.tools;
 
+import com.google.common.collect.ImmutableSet;
 import gregtech.api.items.metaitem.MetaItem.MetaValueItem;
 import gregtech.common.items.behaviors.CrowbarBehaviour;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 
-import java.util.HashSet;
 import java.util.Set;
 
 public class ToolUniversalSpade extends ToolBase {
 
-    private static final Set<String> SPADE_TOOL_CLASSES = new HashSet<String>() {{
-        add("shovel");
-        add("axe");
-        add("saw");
-        add("sword");
-        add("crowbar");
-    }};
+    private static final Set<String> SPADE_TOOL_CLASSES = ImmutableSet.of("shovel", "axe", "saw", "sword", "crowbar");
 
     @Override
     public int getToolDamagePerBlockBreak(ItemStack stack) {
@@ -47,11 +41,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return (tool != null && (tool.equals("shovel") ||
-                tool.equals("axe") ||
-                tool.equals("saw") ||
-                tool.equals("sword") ||
-                tool.equals("crowbar"))) ||
+        return (tool != null && SPADE_TOOL_CLASSES.contains(tool)) ||
                 block.getMaterial() == Material.SAND ||
                 block.getMaterial() == Material.GRASS ||
                 block.getMaterial() == Material.GROUND ||
diff --git a/src/main/java/gregtech/common/tools/ToolWireCutter.java b/src/main/java/gregtech/common/tools/ToolWireCutter.java
@@ -28,7 +28,7 @@ public float getBaseDamage(ItemStack stack) {
     @Override
     public boolean canMineBlock(IBlockState block, ItemStack stack) {
         String tool = block.getBlock().getHarvestTool(block);
-        return tool != null && tool.equals("cutter");
+        return tool != null && CUTTER_TOOL_CLASSES.contains(tool);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tools/ToolWrench.java b/src/main/java/gregtech/common/tools/ToolWrench.java
@@ -39,7 +39,7 @@ public float getBaseDamage(ItemStack stack) {
     public boolean canMineBlock(IBlockState blockState, ItemStack stack) {
         Block block = blockState.getBlock();
         String tool = block.getHarvestTool(blockState);
-        return (tool != null && tool.equals("wrench"))
+        return (tool != null && WRENCH_TOOL_CLASSES.contains(tool))
                 || blockState.getMaterial() == Material.PISTON
                 || block == Blocks.HOPPER
                 || block == Blocks.DISPENSER

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public float getAttackSpeed(ItemStack stack) {`
`53`	`53`	`@Override`
`54`	`54`	`public boolean canMineBlock(IBlockState block, ItemStack stack) {`
`55`	`55`	`String tool = block.getBlock().getHarvestTool(block);`
`56`		`- return (tool != null && tool.equals("axe")) \|\|`
	`56`	`+ return (tool != null && AXE_TOOL_CLASSES.contains(tool)) \|\|`
`57`	`57`	`block.getMaterial() == Material.WOOD;`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void onStatsAddedToTool(MetaValueItem item) {`
`41`	`41`	`@Override`
`42`	`42`	`public boolean canMineBlock(IBlockState block, ItemStack stack) {`
`43`	`43`	`String tool = block.getBlock().getHarvestTool(block);`
`44`		`- return (tool != null && tool.equals("crowbar")) \|\|`
	`44`	`+ return (tool != null && CROWBAR_TOOL_CLASSES.contains(tool)) \|\|`
`45`	`45`	`block.getMaterial() == Material.CIRCUITS;`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public float getBaseDamage(ItemStack stack) {`
`29`	`29`	`@Override`
`30`	`30`	`public boolean canMineBlock(IBlockState block, ItemStack stack) {`
`31`	`31`	`String tool = block.getBlock().getHarvestTool(block);`
`32`		`- return (tool != null && tool.equals("file")) \|\|`
	`32`	`+ return (tool != null && FILE_TOOL_CLASSES.contains(tool)) \|\|`
`33`	`33`	`block.getMaterial() == Material.CIRCUITS;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public float getBaseDamage(ItemStack stack) {`
`26`	`26`	`@Override`
`27`	`27`	`public boolean canMineBlock(IBlockState block, ItemStack stack) {`
`28`	`28`	`String tool = block.getBlock().getHarvestTool(block);`
`29`		`- return (tool != null && tool.equals("hoe")) \|\|`
	`29`	`+ return (tool != null && HOE_TOOL_CLASSES.contains(tool)) \|\|`
`30`	`30`	`block.getMaterial() == Material.GROUND;`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public int getToolDamagePerBlockBreak(ItemStack stack) {`
`20`	`20`	`@Override`
`21`	`21`	`public boolean canMineBlock(IBlockState block, ItemStack stack) {`
`22`	`22`	`String tool = block.getBlock().getHarvestTool(block);`
`23`		`- return tool != null && tool.equals("scoop");`
	`23`	`+ return tool != null && SCOOP_TOOL_CLASSES.contains(tool);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public float getBaseDamage(ItemStack stack) {`
`37`	`37`	`@Override`
`38`	`38`	`public boolean canMineBlock(IBlockState block, ItemStack stack) {`
`39`	`39`	`String tool = block.getBlock().getHarvestTool(block);`
`40`		`- return (tool != null && tool.equals("screwdriver")) \|\|`
	`40`	`+ return (tool != null && DRIVER_TOOL_CLASSES.contains(tool)) \|\|`
`41`	`41`	`block.getMaterial() == Material.CIRCUITS;`
`42`	`42`	`}`
`43`	`43`