libreforge-updater

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @WillFP

build.gradle.kts

@@ -37,7 +37,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly("com.willfp:eco:6.53.0")
+        compileOnly("com.willfp:eco:6.56.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
         compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
     }

eco-core/core-plugin/build.gradle.kts

@@ -11,9 +11,12 @@ dependencies {
 
 publishing {
     publications {
-        register("maven", MavenPublication::class) {
-            from(components["java"])
+        register<MavenPublication>("maven") {
+            groupId = project.group.toString()
+            version = project.version.toString()
             artifactId = rootProject.name
+
+            artifact(rootProject.tasks.shadowJar.get().archiveFile)
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandApply.kt

@@ -28,6 +28,7 @@ class CommandApply(
         if (sender is Player) {
             val item = sender.inventory.itemInMainHand
             item.reforge = reforge
+            reforge.runOnReforgeEffects(sender, item)
             sender.sendMessage(
                 plugin.langYml.getMessage("applied-reforge")
                     .replace("%reforge%", reforge.name)
@@ -45,7 +46,10 @@ class CommandApply(
                 return
             }
 
-            player.inventory.itemInMainHand.reforge = reforge
+            val item = player.inventory.itemInMainHand
+
+            item.reforge = reforge
+            reforge.runOnReforgeEffects(player, item)
             sender.sendMessage(
                 plugin.langYml.getMessage("applied-reforge")
                     .replace("%reforge%", reforge.name)

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt

@@ -6,10 +6,13 @@ import com.willfp.eco.core.display.DisplayPriority
 import com.willfp.eco.core.display.DisplayProperties
 import com.willfp.eco.core.fast.FastItemStack
 import com.willfp.eco.core.fast.fast
+import com.willfp.eco.core.placeholder.context.placeholderContext
 import com.willfp.eco.util.SkullUtils
 import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.formatEco
 import com.willfp.eco.util.toJSON
+import com.willfp.libreforge.ItemProvidedHolder
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.reforges.ReforgesPlugin
 import com.willfp.reforges.reforges.ReforgeTargets
 import com.willfp.reforges.util.reforge
@@ -45,12 +48,15 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
 
         val reforge = fast.persistentDataContainer.reforge
 
+        val context = placeholderContext(
+            player = player,
+            item = itemStack
+        )
+
         if (reforge == null && stone == null) {
             if (plugin.configYml.getBool("reforge.show-reforgable")) {
-                if (plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
-                    if (props.inGui) {
-                        return
-                    }
+                if (props.inGui) {
+                    return
                 }
 
                 val addLore: MutableList<String> = ArrayList()
@@ -89,10 +95,11 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
                 for (string in plugin.configYml.getFormattedStrings("reforge.reforged-prefix")) {
                     addLore.add(Display.PREFIX + string.replace("%reforge%", reforge.name))
                 }
-                addLore.addAll(reforge.description)
+                addLore.addAll(reforge.description.formatEco(context))
                 addLore.replaceAll { "${Display.PREFIX}$it" }
                 lore.addAll(addLore)
             }
+
             if (plugin.configYml.getBool("reforge.display-in-name")) {
                 val displayName = fastItemStack.displayNameComponent
 
@@ -111,7 +118,9 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
 
 
             if (player != null) {
-                val lines = reforge.conditions.getNotMetLines(player).map { Display.PREFIX + it }
+                val provided = ItemProvidedHolder(reforge, itemStack)
+
+                val lines = provided.getNotMetLines(player).map { Display.PREFIX + it }
 
                 if (lines.isNotEmpty()) {
                     lore.add(Display.PREFIX)

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt

@@ -150,6 +150,8 @@ private class ActivatorSlot(
             item.timesReforged++
             item.reforge = reforge
 
+            reforge.runOnReforgeEffects(player, item)
+
             if (usedStone) {
                 val stone = reforgeStone[player]
                 stone?.amount = stone?.amount?.minus(1) ?: 0

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt

@@ -11,12 +11,15 @@ import com.willfp.eco.core.recipe.Recipes
 import com.willfp.eco.core.registry.Registrable
 import com.willfp.eco.util.StringUtils
 import com.willfp.libreforge.Holder
+import com.willfp.libreforge.ItemProvidedHolder
 import com.willfp.libreforge.ViolationContext
 import com.willfp.libreforge.conditions.Conditions
 import com.willfp.libreforge.effects.Effects
+import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.reforges.ReforgesPlugin
 import com.willfp.reforges.util.reforgeStone
 import net.kyori.adventure.text.format.TextDecoration
+import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import java.util.Objects
 
@@ -30,7 +33,7 @@ class Reforge(
 
     val namePrefixComponent = StringUtils.toComponent("$name ").decoration(TextDecoration.ITALIC, false)
 
-    val description: List<String> = config.getFormattedStrings("description")
+    val description: List<String> = config.getStrings("description")
 
     val targets = config.getStrings("targets").mapNotNull { ReforgeTargets.getByName(it) }.toSet()
 
@@ -73,6 +76,11 @@ class Reforge(
         }
     } else null
 
+    private val onReforgeEffects = Effects.compileChain(
+        config.getSubsections("on-reforge-effects"),
+        ViolationContext(plugin, "Reforge $id").with("on-reforge-effects")
+    )
+
     init {
         stone.reforgeStone = this
 
@@ -98,6 +106,17 @@ class Reforge(
         return targets.any { target -> target.items.any { it.matches(item) } }
     }
 
+    fun runOnReforgeEffects(player: Player, item: ItemStack) {
+        onReforgeEffects?.trigger(
+            player,
+            TriggerData(
+                holder = ItemProvidedHolder(this, item),
+                player = player,
+                item = item
+            )
+        )
+    }
+
     override fun getID(): String {
         return this.id.key
     }

eco-core/core-plugin/src/main/resources/config.yml

@@ -146,12 +146,11 @@ reforge:
   reforgable-suffix:
     - ""
     - "&8This item can be reforged!"
-  no-reforgable-in-gui: true # Not perfect, won't work 100% of the time
-  # due to how GUIs are handled differently in different plugins, but should help.
 
   display-in-lore: true
   display-in-name: true
 
+  # The lore to display if an item is reforged, above the reforge description
   reforged-prefix:
     - ""
     - "%reforge%"

eco-core/core-plugin/src/main/resources/reforges/_example.yml

@@ -54,3 +54,6 @@ effects:
 
 # The conditions required to use the reforge
 conditions: [ ]
+
+# Effects to run when the reforge is applied to an item.
+on-reforge-effects: [ ]

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Wed Mar 29 15:46:54 BST 2023
+#Fri Nov 17 19:01:58 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.0.0
-version=6.0.0
+libreforge-version=4.43.0
+version=6.43.0