Added McMMOPlayerRepairCheckEvent for API usage - fires before repair

process begins, can be cancelled.

Changelog.txt

@@ -9,6 +9,7 @@ Key:
   
 Version 1.3.04-dev
  + Added McMMOPlayerRepairEvent for API usage - fires after completion of a repair.
+ + Added McMMOPlayerRepairCheckEvent for API usage - fires before repair process begins, can be cancelled.
  + Added ability to get skill level from McMMOPlayerExperience events
  = Fixed Shake ability dropping bonemeal instead of ink for squids.
  = Fixed Green Terra & Super Breaker awarding 4x drops at high levels.

src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairCheckEvent.java

@@ -0,0 +1,46 @@
+package com.gmail.nossr50.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.datatypes.SkillType;
+
+public class McMMOPlayerRepairCheckEvent extends McMMOPlayerSkillEvent implements Cancellable{
+
+    private int repairAmount;
+    private ItemStack repairMaterial;
+    private ItemStack repairedObject;
+    private boolean cancelled;
+
+    public McMMOPlayerRepairCheckEvent(Player player, int repairAmount, ItemStack repairMaterial, ItemStack repairedObject) {
+        super(player, SkillType.REPAIR);
+        this.repairAmount = repairAmount;
+        this.repairMaterial = repairMaterial;
+        this.repairedObject = repairedObject;
+        this.cancelled = false;
+    }
+
+    public int getRepairAmount() {
+        return repairAmount;
+    }
+
+    public ItemStack getRepairMaterial() {
+        return repairMaterial;
+    }
+
+    public ItemStack getRepairedObject() {
+        return repairedObject;
+    }
+
+    /** Following are required for Cancellable **/
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+}

src/main/java/com/gmail/nossr50/m.java

@@ -262,10 +262,9 @@ public class m {
         if (event.isCancelled()) {
             return;
         }
-        else {
+
         location.getWorld().dropItemNaturally(location, itemStack);
     }
-    }
 
     /**
      * Check if a skill level is higher than the max bonus level of the ability.

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

@@ -22,6 +22,7 @@ import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.McMMOPlayerRepairCheckEvent;
 import com.gmail.nossr50.events.McMMOPlayerRepairEvent;
 import com.gmail.nossr50.locale.mcLocale;
 
@@ -48,23 +49,19 @@ public class Repair {
              */
             if (ItemChecks.isArmor(is) && LoadProperties.repairArmor && mcPermissions.getInstance().armorRepair(player)) {
                 if (ItemChecks.isDiamondArmor(is) && inventory.contains(LoadProperties.rDiamond) && skillLevel >= LoadProperties.repairdiamondlevel && mcPermissions.getInstance().diamondRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rDiamond));
+                    repairItem(player, is, new ItemStack(LoadProperties.rDiamond));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 6, true);
                 }
                 else if (ItemChecks.isIronArmor(is) && inventory.contains(LoadProperties.rIron) && skillLevel >= LoadProperties.repairIronLevel && mcPermissions.getInstance().ironRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rIron));
+                    repairItem(player, is, new ItemStack(LoadProperties.rIron));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 2, true);
                 }
                 else if (ItemChecks.isGoldArmor(is) && inventory.contains(LoadProperties.rGold) && skillLevel >= LoadProperties.repairGoldLevel && mcPermissions.getInstance().goldRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rGold));
+                    repairItem(player, is, new ItemStack(LoadProperties.rGold));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 4, true);
                 }
                 else if (ItemChecks.isLeatherArmor(is) && inventory.contains(LoadProperties.rLeather)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rLeather));
+                    repairItem(player, is, new ItemStack(LoadProperties.rLeather));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 1, true);
                 }
                 else {
@@ -77,33 +74,27 @@ public class Repair {
              */
             else if (ItemChecks.isTool(is) && LoadProperties.repairTools && mcPermissions.getInstance().toolRepair(player)) {
                 if (ItemChecks.isStoneTool(is) && inventory.contains(LoadProperties.rStone) && skillLevel >= LoadProperties.repairStoneLevel && mcPermissions.getInstance().stoneRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rStone));
+                    repairItem(player, is, new ItemStack(LoadProperties.rStone));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 2, false);
                 }
                 else if (ItemChecks.isWoodTool(is) && inventory.contains(LoadProperties.rWood)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rWood));
+                    repairItem(player, is, new ItemStack(LoadProperties.rWood));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 2, false);
                 }
                 else if (ItemChecks.isIronTool(is) && inventory.contains(LoadProperties.rIron) && skillLevel >= LoadProperties.repairIronLevel && mcPermissions.getInstance().ironRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rIron));
+                    repairItem(player, is, new ItemStack(LoadProperties.rIron));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 1, true);
                 }
                 else if (ItemChecks.isDiamondTool(is) && inventory.contains(LoadProperties.rDiamond) && skillLevel >= LoadProperties.repairdiamondlevel && mcPermissions.getInstance().diamondRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rDiamond));
+                    repairItem(player, is, new ItemStack(LoadProperties.rDiamond));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 1, true);
                 }
                 else if (ItemChecks.isGoldTool(is) && inventory.contains(LoadProperties.rGold) && skillLevel >= LoadProperties.repairGoldLevel && mcPermissions.getInstance().goldRepair(player)) {
-                    inventory.removeItem(new ItemStack(LoadProperties.rGold));
+                    repairItem(player, is, new ItemStack(LoadProperties.rGold));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 8, true);
                 }
                 else if (is.getType().equals(Material.BOW) && inventory.contains(LoadProperties.rString)){
-                    inventory.removeItem(new ItemStack(LoadProperties.rString));
+                    repairItem(player, is, new ItemStack(LoadProperties.rString));
-                    repairItem(player, is);
                     xpHandler(player, PP, is, durabilityBefore, 2, false);
                 }
                 else {
@@ -429,21 +420,32 @@ public class Repair {
      * Repairs an item.
      *
      * @param player The player repairing an item
-     * @param enchants The enchantments on the item
+     * @param item The item being repaired
-     * @param enchantsLevel The level of the enchantments on the item
+     * @param repairMaterial The repair reagent
      */
-    public static void repairItem(Player player, ItemStack is) {
+    public static void repairItem(Player player, ItemStack item, ItemStack repairMaterial) {
-        short initialDurability = is.getDurability();
+        short initialDurability = item.getDurability();
+        short newDurability = getRepairAmount(item, player);
+
+        McMMOPlayerRepairCheckEvent preEvent = new McMMOPlayerRepairCheckEvent(player, (short) (initialDurability - newDurability), repairMaterial, item);
+        Bukkit.getPluginManager().callEvent(preEvent);
+
+        if (preEvent.isCancelled()) {
+            return;
+        }
+
+        player.getInventory().removeItem(repairMaterial);
 
         /* Handle the enchants */
         if (LoadProperties.mayLoseEnchants && !mcPermissions.getInstance().arcaneBypass(player)) {
-            addEnchants(player, is);
+            addEnchants(player, item);
         }
 
-        is.setDurability(getRepairAmount(is, player));
+        item.setDurability(newDurability);
 
-        McMMOPlayerRepairEvent event = new McMMOPlayerRepairEvent(player, is, (short) (initialDurability - is.getDurability()));
+        /* Post-repair Event */
-        Bukkit.getPluginManager().callEvent(event);
+        McMMOPlayerRepairEvent postEvent = new McMMOPlayerRepairEvent(player, item, (short) (initialDurability - newDurability));
+        Bukkit.getPluginManager().callEvent(postEvent);
     }
 
     /**