From 7f26cf911fc1beee02cf45aa9e8d646067befeb4 Mon Sep 17 00:00:00 2001 From: ShinyDialga Date: Mon, 11 Jun 2018 22:33:08 -0500 Subject: [PATCH] Fix OP axes for tools mutation --- .../pgm/mutation/types/kit/ToolsMutation.java | 3 ++- .../oc/commons/bukkit/item/ItemBuilder.java | 20 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/PGM/src/main/java/tc/oc/pgm/mutation/types/kit/ToolsMutation.java b/PGM/src/main/java/tc/oc/pgm/mutation/types/kit/ToolsMutation.java index bfa8f16..7446cfb 100644 --- a/PGM/src/main/java/tc/oc/pgm/mutation/types/kit/ToolsMutation.java +++ b/PGM/src/main/java/tc/oc/pgm/mutation/types/kit/ToolsMutation.java @@ -2,6 +2,7 @@ package tc.oc.pgm.mutation.types.kit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import tc.oc.commons.bukkit.inventory.Slot; import tc.oc.commons.bukkit.item.ItemBuilder; @@ -22,7 +23,7 @@ public class ToolsMutation extends KitMutation{ final static FreeItemKit[] TOOLS = new FreeItemKit[] { new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_PICKAXE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Pick").unbreakable(true).get()), - new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_AXE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Axe").unbreakable(true).get()), + new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_AXE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Axe").unbreakable(true).attackDamage(5, EquipmentSlot.HAND).attackSpeed(-2.5, EquipmentSlot.HAND).get()), new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_SPADE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Shovel").unbreakable(true).get()), new FreeItemKit(new ItemBuilder(item(Material.SHEARS)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Shears").unbreakable(true).get()), new FreeItemKit(new ItemBuilder(item(Material.GLASS)).amount(64).get()) diff --git a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/item/ItemBuilder.java b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/item/ItemBuilder.java index 353bd04..b75f604 100644 --- a/Util/bukkit/src/main/java/tc/oc/commons/bukkit/item/ItemBuilder.java +++ b/Util/bukkit/src/main/java/tc/oc/commons/bukkit/item/ItemBuilder.java @@ -145,8 +145,24 @@ public class ItemBuilder> { public S armor(double amount, EquipmentSlot slot) { meta().addAttributeModifier(Attribute.GENERIC_ARMOR, new ItemAttributeModifier(slot, - new AttributeModifier(Attribute.GENERIC_ARMOR.getName(), - amount, AttributeModifier.Operation.ADD_NUMBER))); + new AttributeModifier(Attribute.GENERIC_ARMOR.getName(), + amount, AttributeModifier.Operation.ADD_NUMBER))); + return self(); + } + + public S attackDamage(double amount, EquipmentSlot slot) { + meta().addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE, + new ItemAttributeModifier(slot, + new AttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE.getName(), + amount, AttributeModifier.Operation.ADD_NUMBER))); + return self(); + } + + public S attackSpeed(double amount, EquipmentSlot slot) { + meta().addAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, + new ItemAttributeModifier(slot, + new AttributeModifier(Attribute.GENERIC_ATTACK_SPEED.getName(), + amount, AttributeModifier.Operation.ADD_NUMBER))); return self(); }