libreforge-updater

Update custom item register ID

build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     java
     `java-library`
     `maven-publish`
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.9.20"
     id("com.github.johnrengelman.shadow") version "8.0.0"
     id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
 }
@@ -39,7 +39,7 @@ allprojects {
     dependencies {
         compileOnly("com.willfp:eco:6.56.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
     }
 
     java {

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

@@ -9,6 +9,8 @@ import com.willfp.libreforge.loader.LibreforgePlugin
 import com.willfp.libreforge.loader.configs.ConfigCategory
 import com.willfp.libreforge.registerHolderProvider
 import com.willfp.libreforge.registerPlayerRefreshFunction
+import com.willfp.libreforge.registerSpecificHolderProvider
+import com.willfp.libreforge.registerSpecificRefreshFunction
 import com.willfp.reforges.commands.CommandReforge
 import com.willfp.reforges.commands.CommandReforges
 import com.willfp.reforges.config.TargetYml
@@ -20,6 +22,7 @@ import com.willfp.reforges.reforges.util.ReforgeArgParser
 import com.willfp.reforges.util.AntiPlaceListener
 import com.willfp.reforges.util.DiscoverRecipeListener
 import com.willfp.reforges.util.ReforgeLookup
+import org.bukkit.entity.Player
 import org.bukkit.event.Listener
 
 class ReforgesPlugin : LibreforgePlugin() {
@@ -41,8 +44,13 @@ class ReforgesPlugin : LibreforgePlugin() {
 
         Items.registerArgParser(ReforgeArgParser)
 
-        registerHolderProvider { ReforgeLookup.provideReforges(it) }
-        registerPlayerRefreshFunction { ReforgeLookup.clearCache(it) }
+        registerSpecificHolderProvider<Player> {
+            ReforgeLookup.provideReforges(it)
+        }
+
+        registerSpecificRefreshFunction<Player> {
+            ReforgeLookup.clearCache(it)
+        }
     }
 
     override fun loadListeners(): List<Listener> {

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

@@ -6,6 +6,7 @@ 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
@@ -47,13 +48,16 @@ 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
                 }
-                }
 
                 val addLore: MutableList<String> = ArrayList()
                 for (string in plugin.configYml.getFormattedStrings("reforge.reforgable-suffix")) {
@@ -91,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
 
@@ -115,7 +120,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
             if (player != null) {
                 val provided = ItemProvidedHolder(reforge, itemStack)
 
-                val lines = reforge.conditions.getNotMetLines(player, provided).map { Display.PREFIX + it }
+                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/libreforge/ConditionHasReforge.kt

@@ -2,9 +2,12 @@ package com.willfp.reforges.libreforge
 
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.util.containsIgnoreCase
+import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.arguments
 import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
 import com.willfp.reforges.reforges.Reforge
 import com.willfp.reforges.util.ReforgeLookup
 import org.bukkit.entity.Player
@@ -14,7 +17,14 @@ object ConditionHasReforge : Condition<NoCompileData>("has_reforge") {
         require("reforge", "You must specify the reforge!")
     }
 
-    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+    override fun isMet(
+        dispatcher: Dispatcher<*>,
+        config: Config,
+        holder: ProvidedHolder,
+        compileData: NoCompileData
+    ): Boolean {
+        val player = dispatcher.get<Player>() ?: return false
+
         return ReforgeLookup.provideReforges(player)
             .map { it.holder }
             .filterIsInstance<Reforge>()

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

@@ -15,6 +15,7 @@ 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.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.reforges.ReforgesPlugin
 import com.willfp.reforges.util.reforgeStone
@@ -33,7 +34,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()
 
@@ -86,7 +87,7 @@ class Reforge(
 
         if (config.getBool("stone.enabled")) {
             CustomItem(
-                plugin.namespacedKeyFactory.create("stone_" + this.id),
+                plugin.namespacedKeyFactory.create("stone_" + this.id.key),
                 { test -> test.reforgeStone == this },
                 stone
             ).register()
@@ -108,7 +109,7 @@ class Reforge(
 
     fun runOnReforgeEffects(player: Player, item: ItemStack) {
         onReforgeEffects?.trigger(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 holder = ItemProvidedHolder(this, item),
                 player = player,

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/paper-plugin.yml

@@ -1,58 +0,0 @@
-name: ${pluginName}
-version: ${version}
-main: com.willfp.reforges.ReforgesPlugin
-api-version: 1.19
-
-dependencies:
-  - name: eco
-    required: true
-    bootstrap: false
-
-  - name: libreforge
-    required: false
-    bootstrap: false
-
-  - name: Talismans
-    required: false
-    bootstrap: false
-
-load-after:
-  - name: eco
-    bootstrap: false
-
-
-permissions:
-  reforges.*:
-    description: All reforges permissions
-    default: op
-    children:
-      reforges.command.*: true
-  reforges.command.*:
-    description: All commands
-    default: op
-    children:
-      reforges.command.reload: true
-      reforges.command.reforges: true
-      reforges.command.reforge: true
-      reforges.command.give: true
-      reforges.command.apply: true
-      reforges.command.open: true
-
-  reforges.command.reload:
-    description: Allows reloading the config
-    default: op
-  reforges.command.reforges:
-    description: Allows the user of /reforges.
-    default: true
-  reforges.command.reforge:
-    description: Allows the user of /reforge.
-    default: true
-  reforges.command.give:
-    description: Allows the user of /reforges give.
-    default: op
-  reforges.command.open:
-    description: Allows the user of /reforges open.
-    default: op
-  reforges.command.apply:
-    description: Allows the user of /reforges apply.
-    default: op

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Fri Nov 10 13:58:55 GMT 2023
+#Sun Dec 24 14:54:24 CET 2023
 kotlin.code.style=official
-libreforge-version=4.41.0
-version=6.41.0
+libreforge-version=4.51.0
+version=6.51.0