diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeLight.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeLight.java index f02b789..1a6b507 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeLight.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeLight.java @@ -13,27 +13,10 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; public class ReforgeLight extends Reforge { - private AttributeModifier speedModifier; - private AttributeModifier kbModifier; - public ReforgeLight() { super("light"); } - @Override - protected void postUpdate() { - this.speedModifier = new AttributeModifier( - "light-speed", - this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, - AttributeModifier.Operation.MULTIPLY_SCALAR_1 - ); - this.kbModifier = new AttributeModifier( - "light-kb", - this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1, - AttributeModifier.Operation.MULTIPLY_SCALAR_1 - ); - } - @Override public ReforgeTarget getTarget() { return ReforgeTarget.MELEE; @@ -51,8 +34,16 @@ public class ReforgeLight extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.addAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, speedModifier); - meta.addAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, kbModifier); + meta.addAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, new AttributeModifier( + "light-speed", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); + meta.addAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, new AttributeModifier( + "light-kb", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); itemStack.setItemMeta(meta); } @@ -62,8 +53,16 @@ public class ReforgeLight extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, speedModifier); - meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, kbModifier); + meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, new AttributeModifier( + "light-speed", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); + meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, new AttributeModifier( + "light-kb", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); itemStack.setItemMeta(meta); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeStrong.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeStrong.java index 0bfa371..5c7b5e4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeStrong.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeStrong.java @@ -13,8 +13,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; public class ReforgeStrong extends Reforge { - private AttributeModifier kbModifier; - public ReforgeStrong() { super("strong"); } @@ -24,15 +22,6 @@ public class ReforgeStrong extends Reforge { return ReforgeTarget.MELEE; } - @Override - protected void postUpdate() { - this.kbModifier = new AttributeModifier( - "strong-kb", - this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1, - AttributeModifier.Operation.MULTIPLY_SCALAR_1 - ); - } - @Override public void onMeleeAttack(@NotNull final LivingEntity attacker, @NotNull final LivingEntity victim, @@ -45,7 +34,11 @@ public class ReforgeStrong extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.addAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, kbModifier); + meta.addAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, new AttributeModifier( + "strong-kb", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); itemStack.setItemMeta(meta); } @@ -55,7 +48,11 @@ public class ReforgeStrong extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, kbModifier); + meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_KNOCKBACK, new AttributeModifier( + "strong-kb", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "knockback-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); itemStack.setItemMeta(meta); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeThin.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeThin.java index 1128050..93d8077 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeThin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeThin.java @@ -13,21 +13,10 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; public class ReforgeThin extends Reforge { - private AttributeModifier speedModifier; - public ReforgeThin() { super("thin"); } - @Override - protected void postUpdate() { - this.speedModifier = new AttributeModifier( - "thin-speed", - this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, - AttributeModifier.Operation.MULTIPLY_SCALAR_1 - ); - } - @Override public ReforgeTarget getTarget() { return ReforgeTarget.ARMOR; @@ -44,7 +33,11 @@ public class ReforgeThin extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.addAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, speedModifier); + meta.addAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, new AttributeModifier( + "thin-speed", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); itemStack.setItemMeta(meta); } @@ -54,7 +47,11 @@ public class ReforgeThin extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.removeAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, speedModifier); + meta.removeAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, new AttributeModifier( + "thin-speed", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); itemStack.setItemMeta(meta); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeTough.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeTough.java index 82d0da7..da11b88 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeTough.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/reforges/ReforgeTough.java @@ -13,21 +13,10 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; public class ReforgeTough extends Reforge { - private AttributeModifier speedModifier; - public ReforgeTough() { super("tough"); } - @Override - protected void postUpdate() { - this.speedModifier = new AttributeModifier( - "tough-speed", - this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, - AttributeModifier.Operation.MULTIPLY_SCALAR_1 - ); - } - @Override public ReforgeTarget getTarget() { return ReforgeTarget.ARMOR; @@ -44,7 +33,11 @@ public class ReforgeTough extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.addAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, speedModifier); + meta.addAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, new AttributeModifier( + "tough-speed", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); itemStack.setItemMeta(meta); } @@ -54,7 +47,11 @@ public class ReforgeTough extends Reforge { ItemMeta meta = itemStack.getItemMeta(); assert meta != null; - meta.removeAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, speedModifier); + meta.removeAttributeModifier(Attribute.GENERIC_MOVEMENT_SPEED, new AttributeModifier( + "tough-speed", + this.getConfig().getDouble(Reforges.CONFIG_LOCATION + "speed-multiplier") - 1, + AttributeModifier.Operation.MULTIPLY_SCALAR_1 + )); itemStack.setItemMeta(meta); } }