diff --git a/build.gradle b/build.gradle index 18e76407..3e85c1d3 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:6.6.0' + compileOnly 'com.willfp:eco:6.7.5' compileOnly 'org.jetbrains:annotations:19.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java index 4fa6818e..fde33d2b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java @@ -33,6 +33,7 @@ public class Electroshock extends EcoEnchant { return; } - LightningUtils.strike(attacker, damage); + boolean silent = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "local-lightning-sound"); + LightningUtils.strike(attacker, damage, silent); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java index 2e0a3ac5..0156fa6e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java @@ -36,6 +36,7 @@ public class Thor extends EcoEnchant { double damage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "lightning-damage"); - LightningUtils.strike(victim, damage); + boolean silent = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "local-lightning-sound"); + LightningUtils.strike(attacker, damage, silent); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java index c2deb5bb..e532da4b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java @@ -34,6 +34,7 @@ public class Zeus extends EcoEnchant { double damage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "lightning-damage"); - LightningUtils.strike(victim, damage); + boolean silent = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "local-lightning-sound"); + LightningUtils.strike(victim, damage, silent); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java index 7a1f72da..ae15875c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java @@ -35,6 +35,7 @@ public class Bolt extends EcoEnchant { double damage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "lightning-damage"); - LightningUtils.strike(victim, damage); + boolean silent = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "local-lightning-sound"); + LightningUtils.strike(victim, damage, silent); } } diff --git a/eco-core/core-plugin/src/main/resources/enchants/normal/electroshock.yml b/eco-core/core-plugin/src/main/resources/enchants/normal/electroshock.yml index 983de530..cf437949 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/normal/electroshock.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/normal/electroshock.yml @@ -22,5 +22,6 @@ general-config: maximum-level: 3 config: + local-lightning-sound: false # Should be lightning sound played locally chance-per-level: 5 damage: 4 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/enchants/normal/thor.yml b/eco-core/core-plugin/src/main/resources/enchants/normal/thor.yml index 31f39e9b..e759a0b0 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/normal/thor.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/normal/thor.yml @@ -25,6 +25,7 @@ general-config: maximum-level: 6 config: + local-lightning-sound: false # Should be lightning sound played locally chance-per-level: 2 allow-not-fully-charged: false # dont require sword attack to be at full charge lightning-damage: 2.5 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/enchants/normal/zeus.yml b/eco-core/core-plugin/src/main/resources/enchants/normal/zeus.yml index 211a6ad3..de93ee2d 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/normal/zeus.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/normal/zeus.yml @@ -26,5 +26,6 @@ general-config: maximum-level: 6 config: + local-lightning-sound: false # Should be lightning sound played locally chance-per-level: 1 lightning-damage: 2.5 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/enchants/special/bolt.yml b/eco-core/core-plugin/src/main/resources/enchants/special/bolt.yml index 74015257..11facbad 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/special/bolt.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/special/bolt.yml @@ -25,6 +25,7 @@ general-config: maximum-level: 4 config: + local-lightning-sound: false # Should be lightning sound played locally chance-per-level: 5 allow-not-fully-charged: false # dont require sword attack to be at full charge lightning-damage: 8 \ No newline at end of file