From 5ba84892324557525d97cc9e64929a1991337b40 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 5 Feb 2022 14:15:20 +0000 Subject: [PATCH] Updated libreforge --- build.gradle | 2 +- .../main/kotlin/com/willfp/talismans/TalismansPlugin.kt | 7 ------- .../kotlin/com/willfp/talismans/talismans/Talismans.kt | 4 ++++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 2271ed3..4cf0ab9 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ allprojects { dependencies { compileOnly 'com.willfp:eco:6.20.0' - implementation 'com.willfp:libreforge:3.14.2' + implementation 'com.willfp:libreforge:3.14.3' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/TalismansPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/TalismansPlugin.kt index cc1ef5c..32f1f1d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/TalismansPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/TalismansPlugin.kt @@ -4,7 +4,6 @@ import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.items.CustomItem import com.willfp.libreforge.LibReforgePlugin -import com.willfp.libreforge.chains.EffectChains import com.willfp.talismans.command.CommandTalismans import com.willfp.talismans.config.TalismansYml import com.willfp.talismans.display.TalismanDisplay @@ -27,12 +26,6 @@ class TalismansPlugin : LibReforgePlugin(611, 9865, "&6") { registerHolderProvider { TalismanChecks.getTalismansOnPlayer(it) } } - override fun handleEnableAdditional() { - talismansYml.getSubsections("chains").mapNotNull { - EffectChains.compile(it, "Chains") - } - } - override fun handleReloadAdditional() { logger.info("${Talismans.values().size} Talismans Loaded") CustomItem( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talismans.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talismans.kt index e7645c5..a0c9d10 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talismans.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talismans.kt @@ -4,6 +4,7 @@ import com.google.common.collect.BiMap import com.google.common.collect.HashBiMap import com.google.common.collect.ImmutableList import com.willfp.eco.core.config.updating.ConfigUpdater +import com.willfp.libreforge.chains.EffectChains import com.willfp.talismans.TalismansPlugin object Talismans { @@ -41,6 +42,9 @@ object Talismans { @ConfigUpdater @JvmStatic fun update(plugin: TalismansPlugin) { + plugin.talismansYml.getSubsections("chains").mapNotNull { + EffectChains.compile(it, "Chains") + } for (talisman in values()) { removeTalisman(talisman) }