From 651b51e869eea51e4e5291cb3733ff36983a5cec Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Sat, 1 Apr 2023 12:31:40 +0300 Subject: [PATCH] Screwed the @ConfigUpdater, fixed custom skills/effects/stats loading --- .../willfp/ecoskills/effects/CustomEffects.java | 7 +++++++ .../java/com/willfp/ecoskills/effects/Effects.java | 1 - .../com/willfp/ecoskills/skills/CustomSkills.java | 8 ++++++++ .../java/com/willfp/ecoskills/skills/Skills.java | 1 - .../com/willfp/ecoskills/stats/CustomStats.java | 8 ++++++++ .../java/com/willfp/ecoskills/stats/Stats.java | 1 - .../kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt | 14 ++++++++++++++ .../willfp/ecoskills/commands/TabCompleteHelper.kt | 1 - .../kotlin/com/willfp/ecoskills/gui/SkillGUI.kt | 2 -- .../kotlin/com/willfp/ecoskills/gui/StatsGUI.kt | 1 - 10 files changed, 37 insertions(+), 7 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/CustomEffects.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/CustomEffects.java index 4966ed4..7a1310d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/CustomEffects.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/CustomEffects.java @@ -54,4 +54,11 @@ public final class CustomEffects extends ConfigCategory { @NotNull final Config config) { REGISTRY.register(new CustomEffect(id, config)); } + + @Override + public void afterReload(@NotNull LibreforgePlugin plugin) { + for (CustomEffect effect : REGISTRY.values()) { + effect.update(); + } + } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/Effects.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/Effects.java index 93c4a55..5904e9e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/Effects.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/effects/Effects.java @@ -95,7 +95,6 @@ public final class Effects { return ImmutableSet.copyOf(REGISTRY.values()); } - @ConfigUpdater public static void update() { for (Effect effect : Effects.values()) { effect.update(); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/CustomSkills.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/CustomSkills.java index fed806c..ab8705c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/CustomSkills.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/CustomSkills.java @@ -3,6 +3,7 @@ package com.willfp.ecoskills.skills; import com.google.common.collect.ImmutableSet; import com.willfp.eco.core.config.interfaces.Config; import com.willfp.eco.core.registry.Registry; +import com.willfp.ecoskills.effects.CustomEffect; import com.willfp.libreforge.loader.LibreforgePlugin; import com.willfp.libreforge.loader.configs.ConfigCategory; import org.jetbrains.annotations.NotNull; @@ -43,4 +44,11 @@ public final class CustomSkills extends ConfigCategory { @NotNull final Config config) { REGISTRY.register(new CustomSkill(id, config)); } + + @Override + public void afterReload(@NotNull LibreforgePlugin plugin) { + for (CustomSkill skill : REGISTRY.values()) { + skill.update(); + } + } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java index 7a9076c..f932376 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/skills/Skills.java @@ -64,7 +64,6 @@ public class Skills { return ImmutableSet.copyOf(REGISTRY.values()); } - @ConfigUpdater public static void update(@NotNull final EcoSkillsPlugin plugin) { new PlayerPlaceholder( plugin, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/CustomStats.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/CustomStats.java index 69d9b8b..065f9bf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/CustomStats.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/CustomStats.java @@ -3,6 +3,7 @@ package com.willfp.ecoskills.stats; import com.google.common.collect.ImmutableSet; import com.willfp.eco.core.config.interfaces.Config; import com.willfp.eco.core.registry.Registry; +import com.willfp.ecoskills.skills.CustomSkill; import com.willfp.libreforge.loader.LibreforgePlugin; import com.willfp.libreforge.loader.configs.ConfigCategory; import com.willfp.libreforge.loader.configs.LegacyLocation; @@ -52,4 +53,11 @@ public final class CustomStats extends ConfigCategory { @NotNull final Config config) { registry.register(new CustomStat(id, config)); } + + @Override + public void afterReload(@NotNull LibreforgePlugin plugin) { + for (CustomStat stat : registry.values()) { + stat.update(); + } + } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/Stats.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/Stats.java index 116a311..9e857ac 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/Stats.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoskills/stats/Stats.java @@ -61,7 +61,6 @@ public class Stats { return ImmutableSet.copyOf(REGISTRY.values()); } - @ConfigUpdater public static void update(@NotNull final EcoSkillsPlugin plugin) { for (Stat stat : Stats.values()) { stat.update(); diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt index 13d99f9..a2728f9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt @@ -13,12 +13,15 @@ import com.willfp.ecoskills.actionbar.ActionBarUtils.startRunnable import com.willfp.ecoskills.actionbar.HealthScaleListener import com.willfp.ecoskills.commands.CommandEcoSkills import com.willfp.ecoskills.commands.CommandSkills +import com.willfp.ecoskills.commands.TabCompleteHelper import com.willfp.ecoskills.config.EffectsYml import com.willfp.ecoskills.data.DataListener import com.willfp.ecoskills.data.LeaderboardHandler import com.willfp.ecoskills.effects.CustomEffects import com.willfp.ecoskills.effects.Effects import com.willfp.ecoskills.effects.customEffects +import com.willfp.ecoskills.gui.SkillGUI +import com.willfp.ecoskills.gui.StatsGUI import com.willfp.ecoskills.integrations.EcoEnchantsEnchantingLeveller import com.willfp.ecoskills.integrations.enchantgui.EnchantGuiHandler import com.willfp.ecoskills.libreforge.ConditionHasSkillLevel @@ -76,6 +79,11 @@ class EcoSkillsPlugin : LibreforgePlugin() { EcoSkillsTopPlaceholder.register(this) Skills.update(this) + Effects.update() + Stats.update(this) + StatsGUI.update(this) + SkillGUI.update(this) + TabCompleteHelper.update() registerHolderProvider { it.customEffects.map { h -> SimpleProvidedHolder(h) } } registerHolderProvider { it.customStats.map { h -> SimpleProvidedHolder(h) } } @@ -101,6 +109,12 @@ class EcoSkillsPlugin : LibreforgePlugin() { tickBossBars(this) scheduler.runAsyncTimer(LeaderboardHandler.Runnable(), 50, 2400) + Skills.update(this) + Effects.update() + Stats.update(this) + StatsGUI.update(this) + SkillGUI.update(this) + TabCompleteHelper.update() } override fun loadListeners(): List { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/TabCompleteHelper.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/TabCompleteHelper.kt index ec6cead..98a541b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/TabCompleteHelper.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/TabCompleteHelper.kt @@ -44,7 +44,6 @@ object TabCompleteHelper { /** * Update lists. */ - @ConfigUpdater @JvmStatic fun update() { SKILL_NAMES.clear() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/SkillGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/SkillGUI.kt index aaf1b1a..0116932 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/SkillGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/SkillGUI.kt @@ -20,8 +20,6 @@ object SkillGUI { @JvmStatic private lateinit var menu: Menu - @JvmStatic - @ConfigUpdater fun update(plugin: EcoSkillsPlugin) { menu = buildHomeMenu(plugin) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/StatsGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/StatsGUI.kt index de59884..3361753 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/StatsGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/StatsGUI.kt @@ -24,7 +24,6 @@ object StatsGUI { private lateinit var menu: Menu @JvmStatic - @ConfigUpdater fun update(plugin: EcoSkillsPlugin) { menu = buildStatsMenu(plugin) }