Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-21 05:21:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed libreforge v4 bugs

Browse Source
This commit is contained in:
Auxilor 2023-03-18 15:06:02 +00:00
parent 0d8b6c1d41
commit fdc3bdb236
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eco-core/core-plugin/build.gradle.kts
View File

@ -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 {

5
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/display/EnchantDisplay.kt
View File

@ -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
}
}

8
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/EnchantingTableSupport.kt
View File

@ -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
)
}
}