diff --git a/build.gradle b/build.gradle index 5aee0397..64c7dd25 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:6.35.1' + compileOnly 'com.willfp:eco:6.37.2' compileOnly 'org.jetbrains:annotations:22.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index 8a5eb48b..081cb1c7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants; +import com.willfp.eco.core.Prerequisite; import com.willfp.eco.core.command.impl.PluginCommand; import com.willfp.eco.core.display.DisplayModule; import com.willfp.eco.core.fast.FastItemStack; @@ -22,6 +23,7 @@ import com.willfp.ecoenchants.enchantments.support.merging.grindstone.Grindstone import com.willfp.ecoenchants.enchantments.support.obtaining.EnchantingListeners; import com.willfp.ecoenchants.enchantments.support.obtaining.LootPopulator; import com.willfp.ecoenchants.enchantments.support.obtaining.VillagerListeners; +import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.enchantments.util.ItemConversions; import com.willfp.ecoenchants.enchantments.util.LazyHealthFixListener; import com.willfp.ecoenchants.enchantments.util.TimedRunnable; @@ -33,7 +35,10 @@ import com.willfp.ecoenchants.integrations.registration.plugins.IntegrationCMI; import com.willfp.ecoenchants.integrations.registration.plugins.IntegrationEssentials; import com.willfp.libreforge.LibReforgePlugin; import org.bukkit.Bukkit; +import org.bukkit.NamespacedKey; import org.bukkit.World; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.enchantments.EnchantmentWrapper; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.jetbrains.annotations.NotNull; @@ -179,7 +184,7 @@ public class EcoEnchantsPlugin extends LibReforgePlugin { @NotNull @Override public String getMinimumEcoVersion() { - return "6.35.1"; + return "6.37.1"; } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java index 62135cff..e59a4699 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java @@ -41,14 +41,6 @@ public class Thrive extends EcoEnchant { points = 0; } - if (player.getHealth() >= inst.getValue() && player.getHealth() >= 20) { - this.getPlugin().getScheduler().runLater(() -> { - player.setHealth(Math.min(player.getHealth(), player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())); - }, 1); - } - - inst.setBaseValue(inst.getDefaultValue()); - inst.removeModifier(modifier); if (points > 0) { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java index b3c1058f..5867e03c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java @@ -41,14 +41,6 @@ public class Prosperity extends EcoEnchant { points = 0; } - if (player.getHealth() >= inst.getValue() && player.getHealth() >= 20) { - this.getPlugin().getScheduler().runLater(() -> { - player.setHealth(Math.min(player.getHealth(), player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())); - }, 1); - } - - inst.setBaseValue(inst.getDefaultValue()); - inst.removeModifier(modifier); if (points > 0) {