text=auto

.gitattributes

@@ -1,4 +1,4 @@
-* text
+* text=auto
 
 *.png binary
 *.wav binary

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

@@ -1,350 +1,350 @@
-package com.gmail.nossr50.skills.repair;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.getspout.spoutapi.SpoutManager;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillManager;
-import com.gmail.nossr50.skills.repair.Repair.Tier;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
-
-public class RepairManager extends SkillManager {
-    public RepairManager(McMMOPlayer mcMMOPlayer) {
-        super(mcMMOPlayer, SkillType.REPAIR);
-    }
-
-    /**
-     * Handles notifications for placing an anvil.
-     *
-     * @param anvilID The item ID of the anvil block
-     */
-    public void placedAnvilCheck(int anvilId) {
-        Player player = getPlayer();
-
-        if (mcMMOPlayer.getPlacedAnvil(anvilId)) {
-            return;
-        }
-
-        if (mcMMO.spoutEnabled) {
-            SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
-
-            if (spoutPlayer.isSpoutCraftEnabled()) {
-                String[] spoutMessages = Repair.getSpoutAnvilMessages(anvilId);
-                spoutPlayer.sendNotification(spoutMessages[0], spoutMessages[1], Material.getMaterial(anvilId));
-            }
-            else {
-                player.sendMessage(Repair.getAnvilMessage(anvilId));
-            }
-        }
-        else {
-            player.sendMessage(Repair.getAnvilMessage(anvilId));
-        }
-
-        player.playSound(player.getLocation(), Sound.ANVIL_LAND, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
-        mcMMOPlayer.togglePlacedAnvil(anvilId);
-    }
-
-    public void handleRepair(ItemStack item) {
-        Player player = getPlayer();
-        int itemId = item.getTypeId();
-
-        Repairable repairable = mcMMO.repairableManager.getRepairable(itemId);
-
-        // Permissions checks on material and item types
-        if (!repairable.getRepairItemType().getPermissions(player)) {
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-            return;
-        }
-
-        if (!repairable.getRepairMaterialType().getPermissions(player)) {
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-            return;
-        }
-
-        int skillLevel = getSkillLevel();
-        int minimumRepairableLevel = repairable.getMinimumLevel();
-
-        // Level check
-        if (skillLevel < minimumRepairableLevel) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", minimumRepairableLevel, StringUtils.getPrettyItemString(itemId)));
-            return;
-        }
-
-        PlayerInventory inventory = player.getInventory();
-
-        int repairMaterialId = repairable.getRepairMaterialId();
-        byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
-
-        // Check if they have the proper material to repair with
-        if (!inventory.contains(repairMaterialId)) {
-            String message = LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(repairMaterialId));
-
-            if (repairMaterialMetadata != (byte) -1) {
-                // TODO: Do something nicer than append the metadata as a :# ?
-                if (Repair.findInInventory(inventory, repairMaterialId, repairMaterialMetadata) == -1) {
-                    message += ":" + repairMaterialMetadata;
-                }
-            }
-
-            player.sendMessage(message);
-            return;
-        }
-
-        short startDurability = item.getDurability();
-
-        // Do not repair if at full durability
-        if (startDurability <= 0) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.FullDurability"));
-            return;
-        }
-
-        // Do not repair stacked items
-        if (item.getAmount() != 1) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.StackedItems"));
-            return;
-        }
-
-        // Clear ability buffs before trying to repair.
-        SkillUtils.removeAbilityBuff(item);
-
-        // Lets get down to business,
-        // To defeat, the huns.
-        int baseRepairAmount = repairable.getBaseRepairDurability(); // Did they send me daughters?
-        short newDurability = repairCalculate(startDurability, baseRepairAmount); // When I asked for sons?
-
-        // We're going to hold onto our repair item location
-        int repairItemLocation;
-        if (repairable.getRepairMaterialMetadata() == (byte) -1) {
-            repairItemLocation = Repair.findInInventory(inventory, repairMaterialId);
-        }
-        else {
-            // Special case for when the repairable has metadata that must be addressed
-            repairItemLocation = Repair.findInInventory(inventory, repairMaterialId, repairMaterialMetadata);
-        }
-
-        // This should never happen, but if it does we need to complain loudly about it.
-        if (repairItemLocation == -1) {
-            player.sendMessage(LocaleLoader.getString("Repair.Error"));
-            return;
-        }
-
-        // Call event
-        McMMOPlayerRepairCheckEvent event = new McMMOPlayerRepairCheckEvent(player, (short) (startDurability - newDurability), inventory.getItem(repairItemLocation), item);
-        mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        // Handle the enchants
-        if (Repair.arcaneForgingEnchantLoss) {
-            addEnchants(item);
-        }
-
-        // Remove the item
-        Repair.removeOneFrom(inventory, repairItemLocation);
-
-        // Give out XP like candy
-        applyXpGain((int) ((startDurability - newDurability) * repairable.getXpMultiplier()) * 10);
-
-        // BWONG BWONG BWONG
-        player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
-
-        // Repair the item!
-        item.setDurability(newDurability);
-    }
-
-    public void handleSalvage(Location location, ItemStack item) {
-        Player player = getPlayer();
-
-        if (player.getGameMode() != GameMode.SURVIVAL) {
-            return;
-        }
-
-        if (getSkillLevel() < Repair.salvageUnlockLevel) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
-            return;
-        }
-
-        if (item.getDurability() == 0) {
-            player.setItemInHand(new ItemStack(Material.AIR));
-            location.setY(location.getY() + 1);
-
-            Misc.dropItems(location, new ItemStack(Repair.getSalvagedItem(item)), Repair.getSalvagedAmount(item) * item.getAmount());
-
-            player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
-        }
-    }
-
-    /**
-     * Gets the Arcane Forging rank
-     *
-     * @return the current Arcane Forging rank
-     */
-    public int getArcaneForgingRank() {
-        int skillLevel = getSkillLevel();
-
-        for (Tier tier : Tier.values()) {
-            if (skillLevel >= tier.getLevel()) {
-                return tier.toNumerical();
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Gets chance of keeping enchantment during repair.
-     *
-     * @return The chance of keeping the enchantment
-     */
-    public int getKeepEnchantChance() {
-        int skillLevel = getSkillLevel();
-
-        for (Tier tier : Tier.values()) {
-            if (skillLevel >= tier.getLevel()) {
-                return tier.getKeepEnchantChance();
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Gets chance of enchantment being downgraded during repair.
-     *
-     * @return The chance of the enchantment being downgraded
-     */
-    public int getDowngradeEnchantChance() {
-        int skillLevel = getSkillLevel();
-
-        for (Tier tier : Tier.values()) {
-            if (skillLevel >= tier.getLevel()) {
-                return tier.getDowngradeEnchantChance();
-            }
-        }
-
-        return 100;
-    }
-
-    /**
-     * Computes repair bonuses.
-     *
-     * @param durability The durability of the item being repaired
-     * @param repairAmount The base amount of durability repaired to the item
-     * @return The final amount of durability repaired to the item
-     */
-    private short repairCalculate(short durability, int repairAmount) {
-        Player player = getPlayer();
-
-        if (Permissions.repairMastery(player)) {
-            double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
-            repairAmount += bonus;
-        }
-
-        if (Permissions.superRepair(player) && checkPlayerProcRepair()) {
-            repairAmount *= 2.0D;
-        }
-
-        if (repairAmount <= 0 || repairAmount > Short.MAX_VALUE) {
-            repairAmount = Short.MAX_VALUE;
-        }
-
-        return (short) Math.max(durability - repairAmount, 0);
-    }
-
-    /**
-     * Checks for Super Repair bonus.
-     *
-     * @return true if bonus granted, false otherwise
-     */
-    private boolean checkPlayerProcRepair() {
-        if (SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Repair.superRepairMaxChance, Repair.superRepairMaxBonusLevel)) {
-            getPlayer().sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Handles removing & downgrading enchants.
-     *
-     * @param item Item being repaired
-     */
-    private void addEnchants(ItemStack item) {
-        Player player = getPlayer();
-
-        if (Permissions.arcaneBypass(player)) {
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Perfect"));
-            return;
-        }
-
-        Map<Enchantment, Integer> enchants = item.getEnchantments();
-
-        if (enchants.isEmpty()) {
-            return;
-        }
-
-        if (getArcaneForgingRank() == 0 || !Permissions.arcaneForging(player)) {
-            for (Enchantment enchant : enchants.keySet()) {
-                item.removeEnchantment(enchant);
-            }
-
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Lost"));
-            return;
-        }
-
-        boolean downgraded = false;
-
-        for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
-            Enchantment enchantment = enchant.getKey();
-
-            if (getKeepEnchantChance() > Misc.getRandom().nextInt(activationChance)) {
-                int enchantLevel = enchant.getValue();
-
-                if (Repair.arcaneForgingDowngrades && enchantLevel > 1 && getDowngradeEnchantChance() > Misc.getRandom().nextInt(activationChance)) {
-                    item.addEnchantment(enchantment, enchantLevel--);
-                    downgraded = true;
-                }
-            }
-            else {
-                item.removeEnchantment(enchantment);
-            }
-        }
-
-        Map<Enchantment, Integer> newEnchants = item.getEnchantments();
-
-        if (newEnchants.isEmpty()) {
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Fail"));
-        }
-        else if (downgraded || newEnchants.size() < enchants.size()) {
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Downgrade"));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Perfect"));
-        }
-    }
-}
+package com.gmail.nossr50.skills.repair;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.getspout.spoutapi.SpoutManager;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.SkillManager;
+import com.gmail.nossr50.skills.repair.Repair.Tier;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class RepairManager extends SkillManager {
+    public RepairManager(McMMOPlayer mcMMOPlayer) {
+        super(mcMMOPlayer, SkillType.REPAIR);
+    }
+
+    /**
+     * Handles notifications for placing an anvil.
+     *
+     * @param anvilID The item ID of the anvil block
+     */
+    public void placedAnvilCheck(int anvilId) {
+        Player player = getPlayer();
+
+        if (mcMMOPlayer.getPlacedAnvil(anvilId)) {
+            return;
+        }
+
+        if (mcMMO.spoutEnabled) {
+            SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
+
+            if (spoutPlayer.isSpoutCraftEnabled()) {
+                String[] spoutMessages = Repair.getSpoutAnvilMessages(anvilId);
+                spoutPlayer.sendNotification(spoutMessages[0], spoutMessages[1], Material.getMaterial(anvilId));
+            }
+            else {
+                player.sendMessage(Repair.getAnvilMessage(anvilId));
+            }
+        }
+        else {
+            player.sendMessage(Repair.getAnvilMessage(anvilId));
+        }
+
+        player.playSound(player.getLocation(), Sound.ANVIL_LAND, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
+        mcMMOPlayer.togglePlacedAnvil(anvilId);
+    }
+
+    public void handleRepair(ItemStack item) {
+        Player player = getPlayer();
+        int itemId = item.getTypeId();
+
+        Repairable repairable = mcMMO.repairableManager.getRepairable(itemId);
+
+        // Permissions checks on material and item types
+        if (!repairable.getRepairItemType().getPermissions(player)) {
+            player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+            return;
+        }
+
+        if (!repairable.getRepairMaterialType().getPermissions(player)) {
+            player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+            return;
+        }
+
+        int skillLevel = getSkillLevel();
+        int minimumRepairableLevel = repairable.getMinimumLevel();
+
+        // Level check
+        if (skillLevel < minimumRepairableLevel) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", minimumRepairableLevel, StringUtils.getPrettyItemString(itemId)));
+            return;
+        }
+
+        PlayerInventory inventory = player.getInventory();
+
+        int repairMaterialId = repairable.getRepairMaterialId();
+        byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
+
+        // Check if they have the proper material to repair with
+        if (!inventory.contains(repairMaterialId)) {
+            String message = LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(repairMaterialId));
+
+            if (repairMaterialMetadata != (byte) -1) {
+                // TODO: Do something nicer than append the metadata as a :# ?
+                if (Repair.findInInventory(inventory, repairMaterialId, repairMaterialMetadata) == -1) {
+                    message += ":" + repairMaterialMetadata;
+                }
+            }
+
+            player.sendMessage(message);
+            return;
+        }
+
+        short startDurability = item.getDurability();
+
+        // Do not repair if at full durability
+        if (startDurability <= 0) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.FullDurability"));
+            return;
+        }
+
+        // Do not repair stacked items
+        if (item.getAmount() != 1) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.StackedItems"));
+            return;
+        }
+
+        // Clear ability buffs before trying to repair.
+        SkillUtils.removeAbilityBuff(item);
+
+        // Lets get down to business,
+        // To defeat, the huns.
+        int baseRepairAmount = repairable.getBaseRepairDurability(); // Did they send me daughters?
+        short newDurability = repairCalculate(startDurability, baseRepairAmount); // When I asked for sons?
+
+        // We're going to hold onto our repair item location
+        int repairItemLocation;
+        if (repairable.getRepairMaterialMetadata() == (byte) -1) {
+            repairItemLocation = Repair.findInInventory(inventory, repairMaterialId);
+        }
+        else {
+            // Special case for when the repairable has metadata that must be addressed
+            repairItemLocation = Repair.findInInventory(inventory, repairMaterialId, repairMaterialMetadata);
+        }
+
+        // This should never happen, but if it does we need to complain loudly about it.
+        if (repairItemLocation == -1) {
+            player.sendMessage(LocaleLoader.getString("Repair.Error"));
+            return;
+        }
+
+        // Call event
+        McMMOPlayerRepairCheckEvent event = new McMMOPlayerRepairCheckEvent(player, (short) (startDurability - newDurability), inventory.getItem(repairItemLocation), item);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        // Handle the enchants
+        if (Repair.arcaneForgingEnchantLoss) {
+            addEnchants(item);
+        }
+
+        // Remove the item
+        Repair.removeOneFrom(inventory, repairItemLocation);
+
+        // Give out XP like candy
+        applyXpGain((int) ((startDurability - newDurability) * repairable.getXpMultiplier()) * 10);
+
+        // BWONG BWONG BWONG
+        player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
+
+        // Repair the item!
+        item.setDurability(newDurability);
+    }
+
+    public void handleSalvage(Location location, ItemStack item) {
+        Player player = getPlayer();
+
+        if (player.getGameMode() != GameMode.SURVIVAL) {
+            return;
+        }
+
+        if (getSkillLevel() < Repair.salvageUnlockLevel) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
+            return;
+        }
+
+        if (item.getDurability() == 0) {
+            player.setItemInHand(new ItemStack(Material.AIR));
+            location.setY(location.getY() + 1);
+
+            Misc.dropItems(location, new ItemStack(Repair.getSalvagedItem(item)), Repair.getSalvagedAmount(item) * item.getAmount());
+
+            player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
+        }
+    }
+
+    /**
+     * Gets the Arcane Forging rank
+     *
+     * @return the current Arcane Forging rank
+     */
+    public int getArcaneForgingRank() {
+        int skillLevel = getSkillLevel();
+
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.toNumerical();
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Gets chance of keeping enchantment during repair.
+     *
+     * @return The chance of keeping the enchantment
+     */
+    public int getKeepEnchantChance() {
+        int skillLevel = getSkillLevel();
+
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getKeepEnchantChance();
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Gets chance of enchantment being downgraded during repair.
+     *
+     * @return The chance of the enchantment being downgraded
+     */
+    public int getDowngradeEnchantChance() {
+        int skillLevel = getSkillLevel();
+
+        for (Tier tier : Tier.values()) {
+            if (skillLevel >= tier.getLevel()) {
+                return tier.getDowngradeEnchantChance();
+            }
+        }
+
+        return 100;
+    }
+
+    /**
+     * Computes repair bonuses.
+     *
+     * @param durability The durability of the item being repaired
+     * @param repairAmount The base amount of durability repaired to the item
+     * @return The final amount of durability repaired to the item
+     */
+    private short repairCalculate(short durability, int repairAmount) {
+        Player player = getPlayer();
+
+        if (Permissions.repairMastery(player)) {
+            double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
+            repairAmount += bonus;
+        }
+
+        if (Permissions.superRepair(player) && checkPlayerProcRepair()) {
+            repairAmount *= 2.0D;
+        }
+
+        if (repairAmount <= 0 || repairAmount > Short.MAX_VALUE) {
+            repairAmount = Short.MAX_VALUE;
+        }
+
+        return (short) Math.max(durability - repairAmount, 0);
+    }
+
+    /**
+     * Checks for Super Repair bonus.
+     *
+     * @return true if bonus granted, false otherwise
+     */
+    private boolean checkPlayerProcRepair() {
+        if (SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Repair.superRepairMaxChance, Repair.superRepairMaxBonusLevel)) {
+            getPlayer().sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Handles removing & downgrading enchants.
+     *
+     * @param item Item being repaired
+     */
+    private void addEnchants(ItemStack item) {
+        Player player = getPlayer();
+
+        if (Permissions.arcaneBypass(player)) {
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Perfect"));
+            return;
+        }
+
+        Map<Enchantment, Integer> enchants = item.getEnchantments();
+
+        if (enchants.isEmpty()) {
+            return;
+        }
+
+        if (getArcaneForgingRank() == 0 || !Permissions.arcaneForging(player)) {
+            for (Enchantment enchant : enchants.keySet()) {
+                item.removeEnchantment(enchant);
+            }
+
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Lost"));
+            return;
+        }
+
+        boolean downgraded = false;
+
+        for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
+            Enchantment enchantment = enchant.getKey();
+
+            if (getKeepEnchantChance() > Misc.getRandom().nextInt(activationChance)) {
+                int enchantLevel = enchant.getValue();
+
+                if (Repair.arcaneForgingDowngrades && enchantLevel > 1 && getDowngradeEnchantChance() > Misc.getRandom().nextInt(activationChance)) {
+                    item.addEnchantment(enchantment, enchantLevel--);
+                    downgraded = true;
+                }
+            }
+            else {
+                item.removeEnchantment(enchantment);
+            }
+        }
+
+        Map<Enchantment, Integer> newEnchants = item.getEnchantments();
+
+        if (newEnchants.isEmpty()) {
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Fail"));
+        }
+        else if (downgraded || newEnchants.size() < enchants.size()) {
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Downgrade"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Perfect"));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java

@@ -1,192 +1,192 @@
-package com.gmail.nossr50.skills.woodcutting;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Tree;
-
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.AbilityType;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillManager;
-import com.gmail.nossr50.skills.woodcutting.Woodcutting.ExperienceGainMethod;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.skills.CombatUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
-
-public class WoodcuttingManager extends SkillManager {
-    protected static boolean treeFellerReachedThreshold = false;
-
-    public WoodcuttingManager(McMMOPlayer mcMMOPlayer) {
-        super(mcMMOPlayer, SkillType.WOODCUTTING);
-    }
-
-    public boolean canUseLeafBlower(ItemStack heldItem) {
-        return getSkillLevel() >= Woodcutting.leafBlowerUnlockLevel && ItemUtils.isAxe(heldItem);
-    }
-
-    public boolean canUseTreeFeller(ItemStack heldItem) {
-        return mcMMOPlayer.getAbilityMode(AbilityType.TREE_FELLER) && Permissions.treeFeller(getPlayer()) && ItemUtils.isAxe(heldItem);
-    }
-
-    protected boolean canGetDoubleDrops() {
-        return Permissions.doubleDrops(getPlayer(), skill) && SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Woodcutting.doubleDropsMaxChance, Woodcutting.doubleDropsMaxLevel);
-    }
-
-    /**
-     * Begins Woodcutting
-     *
-     * @param blockState Block being broken
-     */
-    public void woodcuttingBlockCheck(BlockState blockState) {
-        int xp = Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.DEFAULT);
-
-        switch (blockState.getType()) {
-            case HUGE_MUSHROOM_1:
-            case HUGE_MUSHROOM_2:
-                break;
-
-            default:
-                if (canGetDoubleDrops()) {
-                    Woodcutting.checkForDoubleDrop(blockState);
-                }
-        }
-
-        applyXpGain(xp);
-    }
-
-    /**
-     * Begins Tree Feller
-     *
-     * @param blockState Block being broken
-     */
-    public void processTreeFeller(BlockState blockState) {
-        Player player = getPlayer();
-        List<BlockState> treeFellerBlocks = new ArrayList<BlockState>();
-
-        switch (blockState.getType()) {
-            case LOG:
-            case HUGE_MUSHROOM_1:
-                Woodcutting.processRegularTrees(blockState, treeFellerBlocks);
-                break;
-
-            case HUGE_MUSHROOM_2:
-                Woodcutting.processRedMushroomTrees(blockState, treeFellerBlocks);
-                break;
-
-            default:
-                if (ModUtils.isCustomLogBlock(blockState)) {
-                    Woodcutting.processRegularTrees(blockState, treeFellerBlocks);
-                }
-                break;
-        }
-
-        // If the player is trying to break too many blocks
-        if (treeFellerReachedThreshold) {
-            treeFellerReachedThreshold = false;
-
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFellerThreshold"));
-            return;
-        }
-
-        // If the tool can't sustain the durability loss
-        if (!Woodcutting.handleDurabilityLoss(treeFellerBlocks, player.getItemInHand())) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFeller.Splinter"));
-
-            int health = player.getHealth();
-
-            if (health > 1) {
-                CombatUtils.dealDamage(player, Misc.getRandom().nextInt(health - 1));
-            }
-
-            return;
-        }
-
-        dropBlocks(treeFellerBlocks);
-        treeFellerReachedThreshold = false; // Reset the value after we're done with Tree Feller each time.
-    }
-
-    /**
-     * Handles the dropping of blocks
-     *
-     * @param treeFellerBlocks List of blocks to be dropped
-     * @param player Player using the ability
-     */
-    private void dropBlocks(List<BlockState> treeFellerBlocks) {
-        Player player = getPlayer();
-        int xp = 0;
-
-        for (BlockState blockState : treeFellerBlocks) {
-            if (!SkillUtils.blockBreakSimulate(blockState.getBlock(), player, true)) {
-                break; // TODO: Shouldn't we use continue instead?
-            }
-
-            Material material = blockState.getType();
-
-            if (material == Material.HUGE_MUSHROOM_1 || material == Material.HUGE_MUSHROOM_2) {
-                xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
-
-                for (ItemStack drop : blockState.getBlock().getDrops()) {
-                    Misc.dropItem(blockState.getLocation(), drop);
-                }
-            }
-            else if (ModUtils.isCustomLogBlock(blockState)) {
-                if (canGetDoubleDrops()) {
-                    Woodcutting.checkForDoubleDrop(blockState);
-                }
-
-                CustomBlock customBlock = ModUtils.getCustomBlock(blockState);
-                xp = customBlock.getXpGain();
-                int minimumDropAmount = customBlock.getMinimumDropAmount();
-                int maximumDropAmount = customBlock.getMaximumDropAmount();
-                Location location = blockState.getLocation();
-                ItemStack item = customBlock.getItemDrop();;
-
-                Misc.dropItems(location, item, minimumDropAmount);
-
-                if (minimumDropAmount < maximumDropAmount) {
-                    Misc.randomDropItems(location, item, maximumDropAmount - minimumDropAmount);
-                }
-            }
-            else if (ModUtils.isCustomLeafBlock(blockState)) {
-                Misc.randomDropItem(blockState.getLocation(), ModUtils.getCustomBlock(blockState).getItemDrop(), 10);
-            }
-            else {
-                Tree tree = (Tree) blockState.getData();
-                switch (material) {
-                    case LOG:
-                        if (canGetDoubleDrops()) {
-                            Woodcutting.checkForDoubleDrop(blockState);
-                        }
-                        xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
-                        Misc.dropItem(blockState.getLocation(), new ItemStack(Material.LOG, 1, tree.getSpecies().getData()));
-                        break;
-
-                    case LEAVES:
-                        Misc.randomDropItem(blockState.getLocation(), new ItemStack(Material.SAPLING, 1, tree.getSpecies().getData()), 10);
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-
-            blockState.setRawData((byte) 0x0);
-            blockState.setType(Material.AIR);
-            blockState.update(true);
-        }
-
-        applyXpGain(xp);
-    }
-
-}
+package com.gmail.nossr50.skills.woodcutting;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.Tree;
+
+import com.gmail.nossr50.datatypes.mods.CustomBlock;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.SkillManager;
+import com.gmail.nossr50.skills.woodcutting.Woodcutting.ExperienceGainMethod;
+import com.gmail.nossr50.util.ItemUtils;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.ModUtils;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.skills.CombatUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class WoodcuttingManager extends SkillManager {
+    protected static boolean treeFellerReachedThreshold = false;
+
+    public WoodcuttingManager(McMMOPlayer mcMMOPlayer) {
+        super(mcMMOPlayer, SkillType.WOODCUTTING);
+    }
+
+    public boolean canUseLeafBlower(ItemStack heldItem) {
+        return getSkillLevel() >= Woodcutting.leafBlowerUnlockLevel && ItemUtils.isAxe(heldItem);
+    }
+
+    public boolean canUseTreeFeller(ItemStack heldItem) {
+        return mcMMOPlayer.getAbilityMode(AbilityType.TREE_FELLER) && Permissions.treeFeller(getPlayer()) && ItemUtils.isAxe(heldItem);
+    }
+
+    protected boolean canGetDoubleDrops() {
+        return Permissions.doubleDrops(getPlayer(), skill) && SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Woodcutting.doubleDropsMaxChance, Woodcutting.doubleDropsMaxLevel);
+    }
+
+    /**
+     * Begins Woodcutting
+     *
+     * @param blockState Block being broken
+     */
+    public void woodcuttingBlockCheck(BlockState blockState) {
+        int xp = Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.DEFAULT);
+
+        switch (blockState.getType()) {
+            case HUGE_MUSHROOM_1:
+            case HUGE_MUSHROOM_2:
+                break;
+
+            default:
+                if (canGetDoubleDrops()) {
+                    Woodcutting.checkForDoubleDrop(blockState);
+                }
+        }
+
+        applyXpGain(xp);
+    }
+
+    /**
+     * Begins Tree Feller
+     *
+     * @param blockState Block being broken
+     */
+    public void processTreeFeller(BlockState blockState) {
+        Player player = getPlayer();
+        List<BlockState> treeFellerBlocks = new ArrayList<BlockState>();
+
+        switch (blockState.getType()) {
+            case LOG:
+            case HUGE_MUSHROOM_1:
+                Woodcutting.processRegularTrees(blockState, treeFellerBlocks);
+                break;
+
+            case HUGE_MUSHROOM_2:
+                Woodcutting.processRedMushroomTrees(blockState, treeFellerBlocks);
+                break;
+
+            default:
+                if (ModUtils.isCustomLogBlock(blockState)) {
+                    Woodcutting.processRegularTrees(blockState, treeFellerBlocks);
+                }
+                break;
+        }
+
+        // If the player is trying to break too many blocks
+        if (treeFellerReachedThreshold) {
+            treeFellerReachedThreshold = false;
+
+            player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFellerThreshold"));
+            return;
+        }
+
+        // If the tool can't sustain the durability loss
+        if (!Woodcutting.handleDurabilityLoss(treeFellerBlocks, player.getItemInHand())) {
+            player.sendMessage(LocaleLoader.getString("Woodcutting.Skills.TreeFeller.Splinter"));
+
+            int health = player.getHealth();
+
+            if (health > 1) {
+                CombatUtils.dealDamage(player, Misc.getRandom().nextInt(health - 1));
+            }
+
+            return;
+        }
+
+        dropBlocks(treeFellerBlocks);
+        treeFellerReachedThreshold = false; // Reset the value after we're done with Tree Feller each time.
+    }
+
+    /**
+     * Handles the dropping of blocks
+     *
+     * @param treeFellerBlocks List of blocks to be dropped
+     * @param player Player using the ability
+     */
+    private void dropBlocks(List<BlockState> treeFellerBlocks) {
+        Player player = getPlayer();
+        int xp = 0;
+
+        for (BlockState blockState : treeFellerBlocks) {
+            if (!SkillUtils.blockBreakSimulate(blockState.getBlock(), player, true)) {
+                break; // TODO: Shouldn't we use continue instead?
+            }
+
+            Material material = blockState.getType();
+
+            if (material == Material.HUGE_MUSHROOM_1 || material == Material.HUGE_MUSHROOM_2) {
+                xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
+
+                for (ItemStack drop : blockState.getBlock().getDrops()) {
+                    Misc.dropItem(blockState.getLocation(), drop);
+                }
+            }
+            else if (ModUtils.isCustomLogBlock(blockState)) {
+                if (canGetDoubleDrops()) {
+                    Woodcutting.checkForDoubleDrop(blockState);
+                }
+
+                CustomBlock customBlock = ModUtils.getCustomBlock(blockState);
+                xp = customBlock.getXpGain();
+                int minimumDropAmount = customBlock.getMinimumDropAmount();
+                int maximumDropAmount = customBlock.getMaximumDropAmount();
+                Location location = blockState.getLocation();
+                ItemStack item = customBlock.getItemDrop();;
+
+                Misc.dropItems(location, item, minimumDropAmount);
+
+                if (minimumDropAmount < maximumDropAmount) {
+                    Misc.randomDropItems(location, item, maximumDropAmount - minimumDropAmount);
+                }
+            }
+            else if (ModUtils.isCustomLeafBlock(blockState)) {
+                Misc.randomDropItem(blockState.getLocation(), ModUtils.getCustomBlock(blockState).getItemDrop(), 10);
+            }
+            else {
+                Tree tree = (Tree) blockState.getData();
+                switch (material) {
+                    case LOG:
+                        if (canGetDoubleDrops()) {
+                            Woodcutting.checkForDoubleDrop(blockState);
+                        }
+                        xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
+                        Misc.dropItem(blockState.getLocation(), new ItemStack(Material.LOG, 1, tree.getSpecies().getData()));
+                        break;
+
+                    case LEAVES:
+                        Misc.randomDropItem(blockState.getLocation(), new ItemStack(Material.SAPLING, 1, tree.getSpecies().getData()), 10);
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+
+            blockState.setRawData((byte) 0x0);
+            blockState.setType(Material.AIR);
+            blockState.update(true);
+        }
+
+        applyXpGain(xp);
+    }
+
+}