From 92c6708a68f67d87ef8705fc033aa44fac5da6ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 14 Feb 2020 23:50:45 -0600 Subject: [PATCH] Replace sortable tool tooltypes with the ones that have been in forge for... a while --- src/main/java/vazkii/botania/api/item/ISortableTool.java | 9 --------- .../common/item/equipment/bauble/ItemSwapRing.java | 8 ++++---- .../item/equipment/tool/manasteel/ItemManasteelAxe.java | 5 ----- .../item/equipment/tool/manasteel/ItemManasteelPick.java | 5 ----- .../equipment/tool/manasteel/ItemManasteelShovel.java | 5 ----- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/ISortableTool.java b/src/main/java/vazkii/botania/api/item/ISortableTool.java index 6abe650fb..231686940 100644 --- a/src/main/java/vazkii/botania/api/item/ISortableTool.java +++ b/src/main/java/vazkii/botania/api/item/ISortableTool.java @@ -18,11 +18,6 @@ import net.minecraft.item.ItemStack; */ public interface ISortableTool { - /** - * Gets the type of tool that this is. A pick, axe or shovel. - */ - public ToolType getSortingType(ItemStack stack); - /** * Gets the priority that this tool should have when being sorted. The * tool with the highest priority will be picked. The way this is specified @@ -40,8 +35,4 @@ public interface ISortableTool { */ public int getSortingPriority(ItemStack stack); - public static enum ToolType { - PICK, AXE, SHOVEL - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index 2478b1f29..11e2fcc5c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -19,8 +19,8 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; +import net.minecraftforge.common.ToolType; import vazkii.botania.api.item.ISortableTool; -import vazkii.botania.api.item.ISortableTool.ToolType; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class ItemSwapRing extends ItemBauble { @@ -50,7 +50,7 @@ public class ItemSwapRing extends ItemBauble { Material mat = state.getMaterial(); if(ToolCommons.materialsPick.contains(mat)) - typeToFind = ToolType.PICK; + typeToFind = ToolType.PICKAXE; else if(ToolCommons.materialsShovel.contains(mat)) typeToFind = ToolType.SHOVEL; else if(ToolCommons.materialsAxe.contains(mat)) @@ -61,14 +61,14 @@ public class ItemSwapRing extends ItemBauble { return; ItemStack bestTool = currentStack; - int bestToolPriority = tool.getSortingType(currentStack) == typeToFind ? tool.getSortingPriority(currentStack) : -1; + int bestToolPriority = currentStack.getToolTypes().contains(typeToFind) ? tool.getSortingPriority(currentStack) : -1; int bestSlot = -1; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof ISortableTool && stackInSlot != currentStack) { ISortableTool toolInSlot = (ISortableTool) stackInSlot.getItem(); - if(toolInSlot.getSortingType(stackInSlot).equals(typeToFind)) { + if(stackInSlot.getToolTypes().contains(typeToFind)) { int priority = toolInSlot.getSortingPriority(stackInSlot); if(priority > bestToolPriority) { bestTool = stackInSlot; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 67602b4d9..81a2b4747 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -86,11 +86,6 @@ public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortab return true; } - @Override - public ToolType getSortingType(ItemStack stack) { - return ToolType.AXE; - } - @Override public int getSortingPriority(ItemStack stack) { return ToolCommons.getToolPriority(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 9b561042d..b2912ec72 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -95,11 +95,6 @@ public class ItemManasteelPick extends PickaxeItem implements IManaUsingItem, IS return true; } - @Override - public ToolType getSortingType(ItemStack stack) { - return ToolType.PICK; - } - @Override public int getSortingPriority(ItemStack stack) { return ToolCommons.getToolPriority(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 2e2cd88da..ac800b650 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -125,11 +125,6 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I return true; } - @Override - public ToolType getSortingType(ItemStack stack) { - return ToolType.SHOVEL; - } - @Override public int getSortingPriority(ItemStack stack) { return ToolCommons.getToolPriority(stack);