From 2618ebba3c962ae56de725272b58aa1e19cdc8d4 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 26 Oct 2014 20:50:04 +0100 Subject: [PATCH] Allow all materials for restocking for shuriken --- .../modifiers/tools/ModAmmoRestock.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java index cc21cb6b..91a44a95 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java @@ -9,6 +9,10 @@ import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; import tconstruct.library.weaponry.AmmoItem; import tconstruct.library.weaponry.IAmmo; +import tconstruct.weaponry.weapons.Shuriken; + +import java.util.HashSet; +import java.util.Set; public class ModAmmoRestock extends ItemModifier { public ModAmmoRestock() @@ -37,11 +41,19 @@ public class ModAmmoRestock extends ItemModifier { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); // correct material? - int headID = tags.getInteger("Head"); + Set materials = new HashSet(); + materials.add(tags.getInteger("Head")); + // shuriken allow all their components + if(tool.getItem() instanceof Shuriken) { + materials.add(tags.getInteger("Handle")); + materials.add(tags.getInteger("Accessory")); + materials.add(tags.getInteger("Extra")); + } + boolean areInputsValid = true; for (ItemStack curInput : input) { - if (curInput != null && headID != PatternBuilder.instance.getPartID(curInput)) + if (curInput != null && !materials.contains(PatternBuilder.instance.getPartID(curInput))) { areInputsValid = false; break;