Custom armor can now be repaired.

src/main/java/com/gmail/nossr50/util/ItemChecks.java

@@ -3,11 +3,13 @@ package com.gmail.nossr50.util;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.mods.LoadCustomArmor;
 import com.gmail.nossr50.config.mods.LoadCustomTools;
 
 public class ItemChecks {
     private static Config configInstance = Config.getInstance();
     private static boolean customToolsEnabled = configInstance.getToolModsEnabled();
+    private static boolean customArmorEnabled = configInstance.getArmorModsEnabled();
 
     /**
      * Checks if the item is a sword.
@@ -149,7 +151,12 @@ public class ItemChecks {
             return true;
 
         default:
-            return false;
+            if (customArmorEnabled && LoadCustomArmor.getInstance().customHelmetIDs.contains(is.getTypeId())) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
     }
 
@@ -168,7 +175,12 @@ public class ItemChecks {
             return true;
 
         default:
-            return false;
+            if (customArmorEnabled && LoadCustomArmor.getInstance().customChestplateIDs.contains(is.getTypeId())) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
     }
 
@@ -187,7 +199,12 @@ public class ItemChecks {
             return true;
 
         default:
-            return false;
+            if (customArmorEnabled && LoadCustomArmor.getInstance().customLeggingIDs.contains(is.getTypeId())) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
     }
 
@@ -206,7 +223,12 @@ public class ItemChecks {
             return true;
 
         default:
-            return false;
+            if (customArmorEnabled && LoadCustomArmor.getInstance().customBootIDs.contains(is.getTypeId())) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
     }
 
@@ -220,6 +242,21 @@ public class ItemChecks {
         return isLeatherArmor(is) || isGoldArmor(is) || isIronArmor(is) || isDiamondArmor(is);
     }
 
+    /**
+     * Checks to see if an item is a custom tool.
+     *
+     * @param is Item to check
+     * @return true if the item is a custom tool, false otherwise
+     */
+    public static boolean isCustomArmor(ItemStack is) {
+        if (customArmorEnabled && LoadCustomArmor.getInstance().customIDs.contains(is.getTypeId())) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
     /**
      * Checks to see if an item is a leather armor piece.
      *

src/main/java/com/gmail/nossr50/util/ModChecks.java

@@ -2,10 +2,14 @@ package com.gmail.nossr50.util;
 
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.config.mods.LoadCustomArmor;
 import com.gmail.nossr50.config.mods.LoadCustomTools;
+import com.gmail.nossr50.datatypes.mods.CustomItem;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
 
 public class ModChecks {
+    private static LoadCustomTools toolInstance = LoadCustomTools.getInstance();
+    private static LoadCustomArmor armorInstance = LoadCustomArmor.getInstance();
 
     /**
      * Check if this custom tool can use abilities.
@@ -14,25 +18,59 @@ public class ModChecks {
      * @return true if the tool can use abilities, false otherwise
      */
     public static boolean toolAbilityEnabled(ItemStack item) {
-        for (CustomTool tool : LoadCustomTools.getInstance().customTools) {
-            if (tool.getItemID() == item.getTypeId()) {
-                return tool.isAbilityEnabled();
+        int id = item.getTypeId();
+
+        if (!toolInstance.customIDs.contains(id)) {
+            return false;
+        }
+
+        for (CustomItem tool : toolInstance.customItems) {
+            if (tool.getItemID() == id) {
+                return ((CustomTool) tool).isAbilityEnabled();
             }
         }
 
         return false;
     }
 
+    /**
+     * Get the custom armor associated with an item.
+     *
+     * @param item The item to check
+     * @return the ay if it exists, null otherwise
+     */
+    public static CustomItem getArmorFromItemStack(ItemStack item) {
+        int id = item.getTypeId();
+
+        if (!armorInstance.customIDs.contains(id)) {
+            return null;
+        }
+
+        for (CustomItem armor : armorInstance.customItems) {
+            if (armor.getItemID() == id) {
+                return armor;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Get the custom tool associated with an item.
      *
      * @param item The item to check
-     * @return the tool if it exists, null otherwise
+     * @return the armor if it exists, null otherwise
      */
     public static CustomTool getToolFromItemStack(ItemStack item) {
-        for (CustomTool tool : LoadCustomTools.getInstance().customTools) {
-            if (tool.getItemID() == item.getTypeId()) {
-                return tool;
+        int id = item.getTypeId();
+
+        if (!toolInstance.customIDs.contains(id)) {
+            return null;
+        }
+
+        for (CustomItem tool : toolInstance.customItems) {
+            if (tool.getItemID() == id) {
+                return (CustomTool) tool;
             }
         }