Removed @ConfigUpdater

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

@@ -12,9 +12,12 @@ import com.willfp.reforges.commands.CommandReforge
 import com.willfp.reforges.commands.CommandReforges
 import com.willfp.reforges.config.TargetYml
 import com.willfp.reforges.display.ReforgesDisplay
+import com.willfp.reforges.gui.ReforgeGUI
 import com.willfp.reforges.libreforge.ConditionHasReforge
+import com.willfp.reforges.reforges.PriceMultipliers
 import com.willfp.reforges.reforges.ReforgeFinder
 import com.willfp.reforges.reforges.ReforgeStoneTag
+import com.willfp.reforges.reforges.ReforgeTargets
 import com.willfp.reforges.reforges.ReforgedTag
 import com.willfp.reforges.reforges.Reforges
 import com.willfp.reforges.reforges.util.ReforgeArgParser
@@ -52,6 +55,12 @@ class ReforgesPlugin : LibreforgePlugin() {
         registerHolderProvider(ReforgeFinder.toHolderProvider())
     }
 
+    override fun handleReload() {
+        ReforgeTargets.update(this)
+        PriceMultipliers.update(this)
+        ReforgeGUI.update(this)
+    }
+
     override fun loadListeners(): List<Listener> {
         return listOf(
             DiscoverRecipeListener(this),

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

@@ -192,14 +192,11 @@ object ReforgeGUI {
 
     private lateinit var defaultPrice: ConfiguredPrice
 
-    @JvmStatic
     fun open(player: Player) {
         menu.open(player)
     }
 
-    @JvmStatic
+    internal fun update(plugin: EcoPlugin) {
-    @ConfigUpdater
-    fun update(plugin: EcoPlugin) {
         itemToReforge = CaptiveItem()
         reforgeStone = CaptiveItem()
 

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

@@ -1,7 +1,6 @@
 package com.willfp.reforges.reforges
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.config.updating.ConfigUpdater
 import org.bukkit.entity.Player
 
 @Suppress("UNUSED")
@@ -9,13 +8,6 @@ object PriceMultipliers {
     private val REGISTRY = mutableListOf<PriceMultiplier>()
     private val NO_MULTIPLIER = PriceMultiplier("none", 1.0, 0)
 
-    /**
-     * Get the permission multiplier for a given player.
-     *
-     * @param player The player.
-     * @return The multiplier.
-     */
-    @JvmStatic
     fun getForPlayer(player: Player): PriceMultiplier {
         var current = NO_MULTIPLIER
 
@@ -38,19 +30,11 @@ object PriceMultipliers {
     val Player.reforgePriceMultiplier: Double
         get() = getForPlayer(this).multiplier
 
-    /**
-     * List of all registered multipliers.
-     *
-     * @return The multipliers.
-     */
-    @JvmStatic
     fun values(): List<PriceMultiplier> {
         return REGISTRY.toList()
     }
 
-    @ConfigUpdater
+    internal fun update(plugin: EcoPlugin) {
-    @JvmStatic
-    fun update(plugin: EcoPlugin) {
         REGISTRY.clear()
 
         for (config in plugin.configYml.getSubsections("price-multipliers")) {

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

@@ -1,7 +1,6 @@
 package com.willfp.reforges.reforges
 
 import com.google.common.collect.ImmutableSet
-import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.libreforge.slot.impl.SlotTypeAny
 import com.willfp.reforges.ReforgesPlugin
 import org.bukkit.inventory.ItemStack
@@ -16,24 +15,10 @@ object ReforgeTargets {
         update(ReforgesPlugin.instance)
     }
 
-    /**
-     * Get ReforgeTarget matching name.
-     *
-     * @param name The name to search for.
-     * @return The matching ReforgeTarget, or null if not found.
-     */
-    @JvmStatic
     fun getByName(name: String): ReforgeTarget? {
         return registered[name]
     }
 
-    /**
-     * Get target from item.
-     *
-     * @param item The item.
-     * @return The target.
-     */
-    @JvmStatic
     fun getForItem(item: ItemStack?): List<ReforgeTarget> {
         if (item == null) {
             return emptyList()
@@ -44,14 +29,7 @@ object ReforgeTargets {
             .filter { it.matches(item) }
     }
 
-    /**
+    internal fun update(plugin: ReforgesPlugin) {
-     * Update all targets.
-     *
-     * @param plugin Instance of Reforges.
-     */
-    @ConfigUpdater
-    @JvmStatic
-    fun update(plugin: ReforgesPlugin) {
         ALL.items.clear()
         for (id in ArrayList(registered.keys)) {
             if (id.equals("all", ignoreCase = true)) {
@@ -70,12 +48,6 @@ object ReforgeTargets {
         }
     }
 
-    /**
-     * Get all targets.
-     *
-     * @return A set of all targets.
-     */
-    @JvmStatic
     fun values(): Set<ReforgeTarget> {
         return ImmutableSet.copyOf(registered.values)
     }

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

@@ -6,3 +6,4 @@ options:
   resource-id: 1330
   bstats-id: 12412
   color: "&3"
+  uses-reflective-reload: false