Updating permissions for consistency.

src/main/java/com/gmail/nossr50/skills/repair/Repair.java

@@ -27,7 +27,6 @@ public class Repair {
 
     private static Random random = new Random();
     private static Config configInstance = Config.getInstance();
-    private static Permissions permInstance = Permissions.getInstance();
 
     static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
 
@@ -92,7 +91,7 @@ public class Repair {
      * @param is Item being repaired
      */
     protected static void addEnchants(Player player, ItemStack is) {
-        if(permInstance.arcaneBypass(player)) {
+        if(Permissions.arcaneBypass(player)) {
             player.sendMessage(LocaleLoader.getString("Repair.Arcane.Perfect"));
             return;
         }
@@ -104,7 +103,7 @@ public class Repair {
 
         int rank = getArcaneForgingRank(Users.getProfile(player));
 
-        if (rank == 0 || !permInstance.arcaneForging(player)) {
+        if (rank == 0 || !Permissions.arcaneForging(player)) {
             for (Enchantment x : enchants.keySet()) {
                 is.removeEnchantment(x);
             }
@@ -120,7 +119,7 @@ public class Repair {
 
             int randomChance = 100;
 
-            if (player.hasPermission("mcmmo.perks.lucky.repair")) {
+            if (Permissions.luckyRepair(player)) {
                 randomChance = (int) (randomChance * 0.75);
             }
 
@@ -244,7 +243,7 @@ public class Repair {
         if(skillLevel >= repairMasteryMaxBonusLevel) bonus = ((float) repairMasteryChanceMax / 100F);
         else bonus = (((float) skillLevel) / ((float) repairMasteryMaxBonusLevel)) * (((float) repairMasteryChanceMax) / 100F);
 
-        if (permInstance.repairMastery(player)) {
+        if (Permissions.repairMastery(player)) {
             bonus = (((float) repairAmount) * bonus);
             repairAmount += (int) bonus;
         }
@@ -281,9 +280,9 @@ public class Repair {
         int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillLevel);
         if (skillLevel >= MAX_BONUS_LEVEL) chance = MAX_CHANCE;
 
-        if (player.hasPermission("mcmmo.perks.lucky.repair")) randomChance = (int) (randomChance * 0.75);
+        if (Permissions.luckyRepair(player)) randomChance = (int) (randomChance * 0.75);
 
-        if (chance > random.nextInt(randomChance) && permInstance.repairBonus(player)){
+        if (chance > random.nextInt(randomChance) && Permissions.repairBonus(player)){
             player.sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
             return true;
         }

src/main/java/com/gmail/nossr50/skills/repair/RepairItemType.java

@@ -18,13 +18,13 @@ public enum RepairItemType {
     public boolean getPermissions(Player player) {
         switch (this) {
         case ARMOR:
-            return Permissions.getInstance().armorRepair(player);
+            return Permissions.armorRepair(player);
 
         case TOOL:
-            return Permissions.getInstance().toolRepair(player);
+            return Permissions.toolRepair(player);
 
         case OTHER:
-            return Permissions.getInstance().otherRepair(player);
+            return Permissions.otherRepair(player);
 
         default:
             return false;

src/main/java/com/gmail/nossr50/skills/repair/RepairMaterialType.java

@@ -23,28 +23,28 @@ public enum RepairMaterialType {
     public boolean getPermissions(Player player) {
         switch (this) {
         case STRING:
-            return Permissions.getInstance().stringRepair(player);
+            return Permissions.stringRepair(player);
 
         case LEATHER:
-            return Permissions.getInstance().leatherRepair(player);
+            return Permissions.leatherRepair(player);
 
         case WOOD:
-            return Permissions.getInstance().woodRepair(player);
+            return Permissions.woodRepair(player);
 
         case STONE:
-            return Permissions.getInstance().stoneRepair(player);
+            return Permissions.stoneRepair(player);
 
         case IRON:
-            return Permissions.getInstance().ironRepair(player);
+            return Permissions.ironRepair(player);
 
         case GOLD:
-            return Permissions.getInstance().goldRepair(player);
+            return Permissions.goldRepair(player);
 
         case DIAMOND:
-            return Permissions.getInstance().diamondRepair(player);
+            return Permissions.diamondRepair(player);
 
         case OTHER:
-            return Permissions.getInstance().otherMaterialRepair(player);
+            return Permissions.otherMaterialRepair(player);
 
         default:
             return false;

src/main/java/com/gmail/nossr50/skills/repair/Salvage.java

@@ -21,10 +21,9 @@ import com.gmail.nossr50.util.Users;
 public class Salvage {
 
     private static Config configInstance = Config.getInstance();
-    private static Permissions permInstance = Permissions.getInstance();
 
     public static void handleSalvage(final Player player, final Location location, final ItemStack inHand) {
-        if (!permInstance.salvage(player) || !configInstance.getSalvageEnabled()) {
+        if (!Permissions.salvage(player) || !configInstance.getSalvageEnabled()) {
             return;
         }
 

src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java

@@ -138,7 +138,7 @@ public class SimpleRepairManager implements RepairManager {
         }
 
         // Handle the enchants
-        if (Config.getInstance().getArcaneForgingEnchantLossEnabled() && !Permissions.getInstance().arcaneBypass(player)) {
+        if (Config.getInstance().getArcaneForgingEnchantLossEnabled() && !Permissions.arcaneBypass(player)) {
             // Generalize away enchantment work
             Repair.addEnchants(player, item);
         }