Large diffs are not rendered by default.

@@ -7,6 +7,7 @@

public class ItemChecks {
private static Config configInstance = Config.getInstance();
private static boolean customToolsEnabled = configInstance.getToolModsEnabled();

/**
* Checks if the item is a sword.
@@ -24,7 +25,7 @@ public static boolean isSword(ItemStack is) {
return true;

default:
if (configInstance.getToolModsEnabled() && LoadCustomTools.getInstance().customSwordIDs.contains(is.getTypeId())) {
if (customToolsEnabled && LoadCustomTools.getInstance().customSwordIDs.contains(is.getTypeId())) {
return true;
}
else {
@@ -49,7 +50,7 @@ public static boolean isHoe(ItemStack is) {
return true;

default:
if (configInstance.getToolModsEnabled() && LoadCustomTools.getInstance().customHoeIDs.contains(is.getTypeId())) {
if (customToolsEnabled && LoadCustomTools.getInstance().customHoeIDs.contains(is.getTypeId())) {
return true;
}
else {
@@ -74,7 +75,7 @@ public static boolean isShovel(ItemStack is) {
return true;

default:
if (configInstance.getToolModsEnabled() && LoadCustomTools.getInstance().customShovelIDs.contains(is.getTypeId())) {
if (customToolsEnabled && LoadCustomTools.getInstance().customShovelIDs.contains(is.getTypeId())) {
return true;
}
else {
@@ -99,7 +100,7 @@ public static boolean isAxe(ItemStack is) {
return true;

default:
if (configInstance.getToolModsEnabled() && LoadCustomTools.getInstance().customAxeIDs.contains(is.getTypeId())) {
if (customToolsEnabled && LoadCustomTools.getInstance().customAxeIDs.contains(is.getTypeId())) {
return true;
}
else {
@@ -124,7 +125,7 @@ public static boolean isPickaxe(ItemStack is) {
return true;

default:
if (configInstance.getToolModsEnabled() && LoadCustomTools.getInstance().customPickaxeIDs.contains(is.getTypeId())) {
if (customToolsEnabled && LoadCustomTools.getInstance().customPickaxeIDs.contains(is.getTypeId())) {
return true;
}
else {
@@ -305,6 +306,21 @@ public static boolean isTool(ItemStack is) {
return isStoneTool(is) || isWoodTool(is) || isGoldTool(is) || isIronTool(is) || isDiamondTool(is) || isStringTool(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 isCustomTool(ItemStack is) {
if (customToolsEnabled && LoadCustomTools.getInstance().customIDs.contains(is.getTypeId())) {
return true;
}
else {
return false;
}
}

/**
* Checks to see if an item is a stone tool.
*
@@ -5,35 +5,43 @@ Axes:
Axe_1:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999
Axe_2:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999

#
# Settings for Bows
###
Bows:
Bow_1:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999
Bow_2:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999

#
@@ -43,16 +51,20 @@ Hoes:
Hoe_1:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999
Hoe_2:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999

#
@@ -62,16 +74,20 @@ Pickaxes:
Pickaxe_1:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999
Pickaxe_2:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999

#
@@ -81,16 +97,20 @@ Shovels:
Shovel_1:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999
Shovel_2:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999

#
@@ -100,14 +120,18 @@ Swords:
Sword_1:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999
Sword_2:
ID: 999
XP_Modifer: 1.0
Ability_Enabled: true
Repairable: true
Repair_Material_ID: 99
Repair_Material_Data_Value: 0
Repair_Material_Quantity: 9
Durability: 9999