diff --git a/src/main/java/com/gmail/nossr50/config/LoadProperties.java b/src/main/java/com/gmail/nossr50/config/LoadProperties.java index 1043a68b7..cf0039892 100644 --- a/src/main/java/com/gmail/nossr50/config/LoadProperties.java +++ b/src/main/java/com/gmail/nossr50/config/LoadProperties.java @@ -69,7 +69,8 @@ public class LoadProperties { mvines, mlilypad, mnetherbrick, mendstone, mmossstone, mstonebrick, levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation, levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair, - levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting; + levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting, + anvilID; public static double xpbackground_r, xpbackground_g, xpbackground_b, xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g, @@ -327,6 +328,7 @@ public class LoadProperties { acrobaticsxpmodifier = readDouble("Experience.Formula.Multiplier.Acrobatics", 1.0); anvilmessages = readBoolean("Skills.Repair.Anvil_Messages", true); + anvilID = readInteger("Skills.Repair.Anvil_ID", 42); rGold = readInteger("Skills.Repair.Gold.ID", 266); nGold = readString("Skills.Repair.Gold.Name", "Gold Bars"); @@ -341,7 +343,7 @@ public class LoadProperties { rString = readInteger("Skills.Repair.String.ID", 287); nString = readString("Skills.Repair.String.Name", "String"); rLeather = readInteger("Skills.Repair.Leather.ID", 334); - nLeather = readString("Skills.Repair.String.Name", "Leather"); + nLeather = readString("Skills.Repair.Leather.Name", "Leather"); levelCapAcrobatics = readInteger("Skills.Acrobatics.Level_Cap", 0); levelCapArchery = readInteger("Skills.Archery.Level_Cap", 0); diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index a9b657e80..5f160295b 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -92,7 +92,7 @@ public class mcBlockListener implements Listener } } - if(block.getTypeId() == 42 && LoadProperties.anvilmessages) + if(block.getTypeId() == LoadProperties.anvilID && LoadProperties.anvilmessages) { PlayerProfile PP = Users.getProfile(player); if(LoadProperties.spoutEnabled) diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java index 7640bf82e..0cdf73cd8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -199,7 +199,7 @@ public class mcPlayerListener implements Listener } if(block != null && player != null && mcPermissions.getInstance().repair(player) - && event.getClickedBlock().getTypeId() == 42 && (Repair.isTools(player.getItemInHand()) || Repair.isArmor(player.getItemInHand()))) + && event.getClickedBlock().getTypeId() == LoadProperties.anvilID && (Repair.isTools(player.getItemInHand()) || Repair.isArmor(player.getItemInHand()))) { Repair.repairCheck(player, is, event.getClickedBlock()); event.setCancelled(true); diff --git a/src/main/java/com/gmail/nossr50/m.java b/src/main/java/com/gmail/nossr50/m.java index ac3eff9eb..11b03917d 100644 --- a/src/main/java/com/gmail/nossr50/m.java +++ b/src/main/java/com/gmail/nossr50/m.java @@ -95,7 +95,7 @@ public class m return id == 2 || id == 3 || id == 12 || id == 13 || id == 82 || //Excavation id == 1 || id == 14 || id == 15 || id == 16 || id == 21 || id == 24 || id == 49 || id == 56 || id == 73 || id == 74 || id == 87 || id == 89 || id == 112 || id == 121 || id == 48 || id == 98 || //Mining id == 17 || id == 37 || id == 38 || id == 39 || id == 40 || id == 81 || id == 83 || id == 86 || id == 91 || id == 103 || id == 106 || id == 111 || //Woodcutting & Herbalism - id == 42; //Anvil + id == LoadProperties.anvilID; //Anvil } public static int getPowerLevel(Player player) @@ -210,7 +210,7 @@ public class m public static boolean abilityBlockCheck(Block block) { int i = block.getTypeId(); - if(i == 107 ||i == 117 || i == 116 || i == 96 || i == 68 || i == 355 || i == 26 || i == 323 || i == 25 || i == 54 || i == 69 || i == 92 || i == 77 || i == 58 || i == 61 || i == 62 || i == 42 || i == 71 || i == 64 || i == 84 || i == 324 || i == 330){ + if(i == 107 ||i == 117 || i == 116 || i == 96 || i == 68 || i == 355 || i == 26 || i == 323 || i == 25 || i == 54 || i == 69 || i == 92 || i == 77 || i == 58 || i == 61 || i == 62 || i == LoadProperties.anvilID || i == 71 || i == 64 || i == 84 || i == 324 || i == 330){ return false; } else { return true; diff --git a/src/main/java/com/gmail/nossr50/skills/Excavation.java b/src/main/java/com/gmail/nossr50/skills/Excavation.java index e278af8fb..8dc9256f0 100644 --- a/src/main/java/com/gmail/nossr50/skills/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/Excavation.java @@ -32,7 +32,6 @@ import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import org.getspout.spoutapi.sound.SoundEffect; - public class Excavation { public static void gigaDrillBreakerActivationCheck(Player player, Block block)