Most of handleRepair() done, level checking still needed

- Move Repair
- Change visibility of a few methods for repurposing Repair soon

src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -12,7 +12,7 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.util.Page;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -12,7 +12,7 @@ import com.gmail.nossr50.skills.gathering.Excavation;
 import com.gmail.nossr50.skills.gathering.Herbalism;
 import com.gmail.nossr50.skills.gathering.Mining;
 import com.gmail.nossr50.skills.gathering.WoodCutting;
-import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.ItemChecks;

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -41,7 +41,7 @@ import com.gmail.nossr50.skills.combat.Taming;
 import com.gmail.nossr50.skills.gathering.BlastMining;
 import com.gmail.nossr50.skills.gathering.Fishing;
 import com.gmail.nossr50.skills.gathering.Herbalism;
-import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Item;
 import com.gmail.nossr50.util.ItemChecks;

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills.misc;
+package com.gmail.nossr50.skills.repair;
 
 import java.util.Map;
 import java.util.Random;
@@ -211,7 +211,7 @@ public class Repair {
      * @param player Player repairing the item
      * @param is Item being repaired
      */
-    private static void addEnchants(Player player, ItemStack is) {
+    protected static void addEnchants(Player player, ItemStack is) {
         Map<Enchantment, Integer> enchants = is.getEnchantments();
 
         if (enchants.size() == 0) {
@@ -321,6 +321,19 @@ public class Repair {
      */
     private static short repairCalculate(Player player, short durability, int repairAmount) {
         int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
+        return repairCalculate(player, skillLevel, durability, repairAmount);
+    }
+
+    /**
+     * Computes repair bonuses.
+     *
+     * @param player The player repairing an item
+     * @param skillLevel the skillLevel of the player in Repair
+     * @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
+     */
+    protected static short repairCalculate(Player player, int skillLevel, short durability, int repairAmount) {
         float bonus = (float) skillLevel / 500;
 
         if (permInstance.repairMastery(player)) {

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

@@ -3,8 +3,21 @@ package com.gmail.nossr50.skills.repair;
 import java.util.HashMap;
 import java.util.List;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class SimpleRepairManager implements RepairManager {
     private HashMap<Integer, Repairable> repairables;
@@ -42,6 +55,148 @@ public class SimpleRepairManager implements RepairManager {
 
     @Override
     public void handleRepair(Player player, ItemStack item) {
-        // TODO Auto-generated method stub
+        // Load some variables for use
+        PlayerProfile PP = Users.getProfile(player);
+        short startDurability = item.getDurability();
+        PlayerInventory inventory = player.getInventory();
+        int skillLevel = PP.getSkillLevel(SkillType.REPAIR);
+        Repairable repairable = repairables.get(item.getTypeId());
+
+        // 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;
+        }
+
+        // TODO: Level check
+
+        // Check if they have the proper material to repair with
+        if(!inventory.contains(repairable.getRepairMaterialId())) {
+            String message = LocaleLoader.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + Misc.prettyItemString(repairable.getRepairMaterialId());
+            if(repairable.getRepairMaterialMetadata() != (byte) -1) {
+                // TODO: Do something nicer than append the metadata as a :# ?
+                if(findInInventory(inventory, repairable.getRepairMaterialId(), repairable.getRepairMaterialMetadata()) == -1) {
+                    message += ":" + repairable.getRepairMaterialMetadata();
+                }
+            }
+            player.sendMessage(message);
+            return;
+        }
+
+        // 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;
+        }
+
+        // Lets get down to business,
+        // To defeat, the huns.
+        int baseRepairAmount = repairable.getBaseRepairDurability();
+        short newDurability = Repair.repairCalculate(player, skillLevel, startDurability, baseRepairAmount);
+
+        // We're going to hold onto our repair item location
+        int repairItemLocation;
+        if(repairable.getRepairMaterialMetadata() != (byte) -1) {
+            repairItemLocation = findInInventory(inventory, repairable.getRepairMaterialId());
+        } else {
+            // Special case for when the repairable has metadata that must be addressed
+            repairItemLocation = findInInventory(inventory, repairable.getRepairMaterialId(), repairable.getRepairMaterialMetadata());
+        }
+
+        // This should never happen, but if it does we need to complain loudly about it.
+        if(repairItemLocation == -1) {
+            player.sendMessage("mcMMO encountered an error attempting to repair this item!");  // TODO: Locale ?
+        }
+
+        // Call event
+        McMMOPlayerRepairCheckEvent event = new McMMOPlayerRepairCheckEvent(player, (short) (startDurability - newDurability), inventory.getItem(repairItemLocation), item);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        // Handle the enchants
+        if (Config.getInstance().getArcaneForgingEnchantLossEnabled() && !Permissions.getInstance().arcaneBypass(player)) {
+            // Generalize away enchantment work
+            Repair.addEnchants(player, item);
+        }
+
+        // Remove the item
+        removeOneFrom(inventory, repairItemLocation);
+
+        // Repair the item!
+        item.setDurability(newDurability);
+    }
+
+    /**
+     * Decrease the amount of items in this slot by one
+     *
+     * @param inventory PlayerInventory to work in
+     * @param index Item index to decrement
+     */
+    private void removeOneFrom(PlayerInventory inventory, int index) {
+        ItemStack item = inventory.getItem(index);
+        if(item.getAmount() > 1) {
+            item.setAmount(item.getAmount() - 1);
+        } else {
+            item = new ItemStack(0);
+        }
+
+        // I suspect this may not be needed, but I don't think it hurts
+        inventory.setItem(index, item);
+    }
+
+    /**
+     * Search the inventory for an item and return the index.
+     *
+     * @param inventory PlayerInventory to scan
+     * @param itemId Item id to look for
+     * @return index location where the item was found, or -1 if not found
+     */
+    private int findInInventory(PlayerInventory inventory, int itemId) {
+        int location = inventory.first(itemId);
+        // VALIDATE
+        if(inventory.getItem(location).getTypeId() == itemId) {
+            return location;
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * Search the inventory for an item and return the index.
+     *
+     * @param inventory PlayerInventory to scan
+     * @param itemId Item id to look for
+     * @param metadata Metadata to look for
+     * @return index location where the item was found, or -1 if not found
+     */
+    private int findInInventory(PlayerInventory inventory, int itemId, byte metadata) {
+        int location = -1;
+
+        ItemStack[] contents = inventory.getContents();
+        for(int i = 0; i < contents.length; i++) {
+            ItemStack item = contents[i];
+            if(item.getTypeId() == itemId) {
+                if(item.getData().getData() == metadata) {
+                    location = i;
+                }
+            }
+            if(location != -1) break;
+        }
+
+        return location;
     }
 }