repair full

Author: RecursiveG

src/main/java/cat/nyaa/nyaautils/repair/RepairCommands.java

@@ -67,6 +67,9 @@ public void repairInfo(CommandSender sender, Arguments args) {
             int repairTime = ((Repairable) item.getItemMeta()).getRepairCost();
             msg(sender, "user.repair.info_9", repairTime, info.repairLimit);
         }
+        if (info.stat == REPAIRABLE) {
+            msg(sender, "user.repair.info_10", (int)Math.ceil(item.getDurability()/(double)info.durRecovered));
+        }
     }
 
     @SubCommand(value = "hand", permission = "nu.repair")
@@ -88,12 +91,7 @@ public void repairHand(CommandSender sender, Arguments args) {
             return;
         }
 
-        // TODO: elegant exp handling
-        int tmp = p.getTotalExperience() - info.expConsumption;
-        p.setTotalExperience(0);
-        p.setLevel(0);
-        p.setExp(0);
-        p.giveExp(tmp);
+        addPlayerExperience(p, -info.expConsumption);
 
         int dur = item.getDurability();
         dur -= info.durRecovered;
@@ -107,5 +105,70 @@ public void repairHand(CommandSender sender, Arguments args) {
             material.setAmount(count - 1);
             p.getInventory().setItemInOffHand(material);
         }
+        msg(p, "user.repair.repaired");
+    }
+
+    @SubCommand(value = "full", permission = "nu.repair")
+    public void repairFull(CommandSender sender, Arguments args) {
+        ItemStack item = getItemInHand(sender);
+        ItemStack material = getItemInOffHand(sender);
+        RepairInstance info = new RepairInstance(item, plugin.cfg.repair);
+        if (info.stat != REPAIRABLE) {
+            msg(sender, "user.repair.info_3", I18n._("user.repair.unrepairable." + info.stat.name()));
+            return;
+        }
+        if (material.getType() != info.repairMaterial || material.getAmount() <= 0) {
+            msg(sender, "user.repair.material_mismatch");
+            return;
+        }
+        Player p = asPlayer(sender);
+
+        int expMax = (int)Math.floor(p.getTotalExperience()/(double)info.expConsumption);
+        int materialMax = material.getAmount();
+        int durMax = (int)Math.ceil(item.getDurability()/(double)info.durRecovered);
+        int repairAmount = Math.min(Math.min(expMax, materialMax), durMax);
+
+        addPlayerExperience(p, -info.expConsumption*repairAmount);
+        int dur = item.getDurability();
+        dur -= info.durRecovered*repairAmount;
+        if (dur < 0) dur = 0;
+        item.setDurability((short) dur);
+        p.getInventory().setItemInMainHand(item);
+        int count = material.getAmount() - repairAmount;
+        if (count <= 0) {
+            p.getInventory().setItemInOffHand(new ItemStack(Material.AIR));
+        } else {
+            material.setAmount(count);
+            p.getInventory().setItemInOffHand(material);
+        }
+        msg(p, "user.repair.repaired");
+    }
+
+    public static void addPlayerExperience(Player p, int exp) {
+        if (exp > 0) {
+            p.giveExp(exp);
+        } else if (exp < 0) {
+            exp = -exp;
+            int totalExp = p.getTotalExperience();
+            if (totalExp < exp) throw new IllegalArgumentException("Negative Exp Left");
+            totalExp -= exp;
+            int currentLevelExp = (int)(p.getExpToLevel() * p.getExp());
+            while(exp > 0) {
+                if (currentLevelExp <= 0) {
+                    if (p.getLevel() <= 0) return;
+                    p.setLevel(p.getLevel()-1);
+                    currentLevelExp = p.getExpToLevel();
+                }
+                if (exp > currentLevelExp) {
+                    exp -= currentLevelExp;
+                    currentLevelExp = 0;
+                } else {
+                    currentLevelExp -= exp;
+                    exp = 0;
+                }
+            }
+            p.setExp(currentLevelExp/(float)p.getExpToLevel());
+            p.setTotalExperience(totalExp);
+        }
     }
 }

src/main/resources/lang/en_US.yml

@@ -175,12 +175,14 @@ user:
     info_7: "Durability gain: %d (%.01f%%) (per material)"
     info_8: "Repair limit: unlimited"
     info_9: "Repair limit: %d/%d"
+    info_10: "Full repair material cost: %d units"
     unrepairable:
       UNREPAIRABLE: "Item unrepairable."
       UNREPAIRABLE_REPAIRED: "Already fully repaired."
       UNREPAIRABLE_UNBREAKABLE: "Item is unbreakable."
       UNREPAIRABLE_RLE: "Repair count limit exceeded."
       UNREPAIRABLE_LOWRECOVER: "Durability not recoverable."
+    repaired: "You've repaired your item."
 
 manual:
   no_description: "No description"