From fdc3bdb236fb913217351f8ed0ab54c7b5ef77ca Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 18 Mar 2023 15:06:02 +0000 Subject: [PATCH] Fixed libreforge v4 bugs --- eco-core/core-plugin/build.gradle.kts | 1 + .../com/willfp/ecoenchants/display/EnchantDisplay.kt | 5 ++--- .../ecoenchants/mechanics/EnchantingTableSupport.kt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index a90f0174..25900a2f 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -9,6 +9,7 @@ dependencies { compileOnly(project(":eco-core:core-proxy")) compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") compileOnly("net.essentialsx:EssentialsX:2.19.7") + compileOnly("commons-lang:commons-lang:2.6") } tasks { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt index f20fd8f8..50a38e74 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt @@ -12,7 +12,6 @@ import com.willfp.ecoenchants.display.EnchantSorter.sortForDisplay import com.willfp.ecoenchants.enchants.EcoEnchant import com.willfp.ecoenchants.enchants.wrap import com.willfp.ecoenchants.target.EnchantmentTargets.isEnchantable -import com.willfp.libreforge.conditions.isMet import org.bukkit.Material import org.bukkit.entity.Player import org.bukkit.inventory.ItemFlag @@ -78,10 +77,10 @@ class EnchantDisplay(private val plugin: EcoEnchantsPlugin) : DisplayModule(plug if (player != null && enchant is EcoEnchant) { val enchantLevel = enchant.getLevel(level) - val enchantNotMetLines = enchantLevel.getNotMetLines(player).map { Display.PREFIX + it } + val enchantNotMetLines = enchantLevel.conditions.getNotMetLines(player).map { Display.PREFIX + it } notMetLines.addAll(enchantNotMetLines) - if (enchantNotMetLines.isNotEmpty() || enchantLevel.showAnyNotMet(player)) { + if (enchantNotMetLines.isNotEmpty()) { showNotMet = true } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/EnchantingTableSupport.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/EnchantingTableSupport.kt index 8844b125..2a3b8cf3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/EnchantingTableSupport.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/EnchantingTableSupport.kt @@ -175,7 +175,7 @@ class EnchantingTableSupport( perfectly, it's effectively 1:1 with vanilla if memory serves, so I'm not going to rewrite it. */ - event.offers.getOrNull(2)?.cost = min(event.offers[2].cost, maxObtainableLevel) + event.offers.getOrNull(2)?.cost = min(event.offers[2]?.cost ?: 0, maxObtainableLevel) val bonus = event.enchantmentBonus.coerceIn(1..15) @@ -215,9 +215,9 @@ class EnchantingTableSupport( } ExtraItemSupport.currentlyEnchantingExtraItem[event.enchanter.uniqueId] = arrayOf( - event.offers[0].enchantmentLevel, - event.offers[1].enchantmentLevel, - event.offers[2].enchantmentLevel + event.offers[0]?.enchantmentLevel ?: 0, + event.offers[1]?.enchantmentLevel ?: 0, + event.offers[2]?.enchantmentLevel ?: 0 ) } }