From e449268b3a3ef6261dc2423c0c372bc11207d713 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 21 Jul 2024 11:58:52 +0100 Subject: [PATCH] Removed @ConfigUpdater --- .../com/willfp/reforges/ReforgesPlugin.kt | 9 ++++++ .../com/willfp/reforges/gui/ReforgeGUI.kt | 5 +--- .../reforges/reforges/PriceMultipliers.kt | 18 +---------- .../reforges/reforges/ReforgeTargets.kt | 30 +------------------ .../core-plugin/src/main/resources/eco.yml | 1 + 5 files changed, 13 insertions(+), 50 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt index a2de236..fff7276 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt +++ b/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 { return listOf( DiscoverRecipeListener(this), diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt index f77f03e..6b00188 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt +++ b/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 - @ConfigUpdater - fun update(plugin: EcoPlugin) { + internal fun update(plugin: EcoPlugin) { itemToReforge = CaptiveItem() reforgeStone = CaptiveItem() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt index dbd602f..f82d52d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt +++ b/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() 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 { return REGISTRY.toList() } - @ConfigUpdater - @JvmStatic - fun update(plugin: EcoPlugin) { + internal fun update(plugin: EcoPlugin) { REGISTRY.clear() for (config in plugin.configYml.getSubsections("price-multipliers")) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt index e8b5bc7..dd4905d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt +++ b/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 { if (item == null) { return emptyList() @@ -44,14 +29,7 @@ object ReforgeTargets { .filter { it.matches(item) } } - /** - * Update all targets. - * - * @param plugin Instance of Reforges. - */ - @ConfigUpdater - @JvmStatic - fun update(plugin: ReforgesPlugin) { + internal 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 { return ImmutableSet.copyOf(registered.values) } diff --git a/eco-core/core-plugin/src/main/resources/eco.yml b/eco-core/core-plugin/src/main/resources/eco.yml index 73765c0..0161399 100644 --- a/eco-core/core-plugin/src/main/resources/eco.yml +++ b/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