diff --git a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java index 04983c3b..9e6350f6 100644 --- a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java +++ b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java @@ -37,11 +37,8 @@ public class DualMaterialToolPart extends DynamicToolPart { public int getMaterialID2(ItemStack stack) { if (!stack.hasTagCompound()) return -1; - int id = stack.getTagCompound().getCompoundTag("DualMat").getInteger("Material2"); - - if (TConstructRegistry.toolMaterials.keySet().contains(id)) return id; - + if (TConstructRegistry.toolMaterials.containsKey(id)) return id; return -1; } diff --git a/src/main/java/tconstruct/library/tools/DynamicToolPart.java b/src/main/java/tconstruct/library/tools/DynamicToolPart.java index 1dba39f1..f2882f61 100644 --- a/src/main/java/tconstruct/library/tools/DynamicToolPart.java +++ b/src/main/java/tconstruct/library/tools/DynamicToolPart.java @@ -58,8 +58,7 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { // item meta = material id @Override public int getMaterialID(ItemStack stack) { - if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) return stack.getItemDamage(); - + if (TConstructRegistry.toolMaterials.containsKey(stack.getItemDamage())) return stack.getItemDamage(); return -1; } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index fd713216..92ecf111 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -134,8 +134,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { // Move Fluid to Output Tanks Set connected = this.getOutputs().keySet(); - if (connected.contains(ForgeDirection.DOWN)) connected.remove(ForgeDirection.DOWN); - if (connected.contains(lastProvider)) connected.remove(lastProvider); + connected.remove(ForgeDirection.DOWN); + connected.remove(lastProvider); int output = Math.min(internalTank.getFluidAmount(), outputMax); int connectedAmount = connected.size(); @@ -223,7 +223,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler { */ HashMap connected = this.getOutputs(); - if (connected.containsKey(lastProvider)) connected.remove(lastProvider); + connected.remove(lastProvider); if (connected.containsKey(ForgeDirection.DOWN) && this.internalTank.getFluid() != null) // Prioritizes FluidHandlers below { diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index 35ce6bd8..89fd1244 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -126,8 +126,7 @@ public class ToolPart extends CraftingItem implements IToolPart { @Override public int getMaterialID(ItemStack stack) { - if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) return stack.getItemDamage(); - + if (TConstructRegistry.toolMaterials.containsKey(stack.getItemDamage())) return stack.getItemDamage(); return -1; } }