From cb4d99f33825bbd95de186068580c214884befa4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 20 Apr 2022 11:52:13 +0100 Subject: [PATCH] Updated eco/libreforge --- build.gradle | 2 +- eco-core/build.gradle | 2 +- .../src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java | 2 +- .../java/com/willfp/ecoenchants/enchantments/EcoEnchant.java | 2 +- .../com/willfp/ecoenchants/enchantments/util/EnchantChecks.java | 2 +- gradle.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 8a5ef31e74..abce804c4f 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:6.33.0' + compileOnly 'com.willfp:eco:6.34.0' compileOnly 'org.jetbrains:annotations:22.0.0' diff --git a/eco-core/build.gradle b/eco-core/build.gradle index 3a05a68c77..d8b1a96ab6 100644 --- a/eco-core/build.gradle +++ b/eco-core/build.gradle @@ -3,6 +3,6 @@ version rootProject.version subprojects { dependencies { - implementation 'com.willfp:libreforge:3.34.0' + implementation 'com.willfp:libreforge:3.34.1' } } \ No newline at end of file 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 abe5496f7f..3dbc0ff2ed 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 @@ -89,7 +89,7 @@ public EcoEnchantsPlugin() { public void handleEnableAdditional() { this.getLogger().info(EcoEnchants.values().size() + " Enchantments Loaded"); - TelekinesisUtils.registerTest(player -> FastItemStack.wrap(player.getInventory().getItemInMainHand()).getLevelOnItem(EcoEnchants.TELEKINESIS, false) > 0); + TelekinesisUtils.registerTest(player -> FastItemStack.wrap(player.getInventory().getItemInMainHand()).getEnchantmentLevel(EcoEnchants.TELEKINESIS, false) > 0); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index 5c00d17faa..b239ca28e2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -474,7 +474,7 @@ public boolean conflictsWith(@NotNull final Enchantment enchantment) { @Override public boolean canEnchantItem(@NotNull final ItemStack itemStack) { if (this.type.isSingular() && EcoEnchants.hasAnyOfType(itemStack, this.type)) { - return FastItemStack.wrap(itemStack).getLevelOnItem(this, true) > 0; + return FastItemStack.wrap(itemStack).getEnchantmentLevel(this, true) > 0; } if (itemStack.getType() == Material.BOOK || itemStack.getType() == Material.ENCHANTED_BOOK) { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java index 16a219014d..bdb67719a0 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java @@ -51,7 +51,7 @@ public static int getItemLevel(@Nullable final ItemStack item, return 0; } - return FastItemStack.wrap(item).getLevelOnItem(enchantment, false); + return FastItemStack.wrap(item).getEnchantmentLevel(enchantment, false); } /** diff --git a/gradle.properties b/gradle.properties index f89c9dca11..8147c5b535 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 8.57.1 +version = 8.57.2 plugin-name = EcoEnchants \ No newline at end of file