Skip to content

feat: lore system rework [EcoHub-195] #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exanthiax merged 4 commits into from
Oct 4, 2026
Merged

feat: lore system rework [EcoHub-195] #397

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48df4fc
feat: component not met lines
Exanthiax Sep 27, 2026
b4a8dbd
feat: item flag display on context api
Exanthiax Sep 27, 2026
ebb1030
Update gradle.properties
Exanthiax Oct 4, 2026
37b4d0b
Merge branch 'master' into feat/lore-rework
Exanthiax Oct 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/common/src/main/kotlin/com/willfp/libreforge/Holder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.willfp.libreforge

import com.willfp.eco.util.NamespacedKeyUtils
import com.willfp.eco.util.toComponent
import com.willfp.libreforge.conditions.ConditionList
import com.willfp.libreforge.effects.EffectList
import net.kyori.adventure.text.Component
import org.bukkit.NamespacedKey
import org.bukkit.entity.Entity
import org.bukkit.entity.Player
Expand Down Expand Up @@ -104,6 +106,12 @@ interface ProvidedHolder {
fun getNotMetLines(player: Player): List<String> =
getNotMetLines(player.toDispatcher())

/**
* Get not met lines for a [player], as components for display lore.
*/
fun getNotMetLineComponents(player: Player): List<Component> =
getNotMetLines(player).map { it.toComponent() }

/**
* Get if the holder is showing any not met lines for a [dispatcher], or if any
* conditions are not met and have showNotMet set to true (e.g. for Enchantment Strikethrough).
Expand Down
15 changes: 4 additions & 11 deletions core/common/src/main/kotlin/com/willfp/libreforge/display/ItemFlagDisplay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.willfp.libreforge.display

import com.willfp.eco.core.display.DisplayContext
import com.willfp.eco.core.display.DisplayModule
import com.willfp.eco.core.display.DisplayPriority
import com.willfp.eco.core.fast.fast
Expand Down Expand Up @@ -36,26 +37,18 @@ class ItemFlagDisplay(
}
}

override fun display(itemStack: ItemStack, vararg args: Any) {
override fun display(context: DisplayContext) {
if (!enabled) {
return
}

val fis = itemStack.fast()

var existingFlags = ""

for (flag in flags) {
if (fis.hasItemFlag(flag)) {
existingFlags += flag.toString()
}
}
val fis = context.itemStack.fast()

fis.persistentDataContainer.set(pdcKey, PersistentDataType.STRING, flags.joinToString(","))

fis.addItemFlags(*flags.toTypedArray())
}

@Suppress("OVERRIDE_DEPRECATION")
override fun revert(itemStack: ItemStack) {
if (!enabled) {
return
Expand Down
Loading