From 52d54f0905f5887f52f9466098d09922b31a923d Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 5 Feb 2022 13:27:05 +0000 Subject: [PATCH] Updated libreforge --- build.gradle | 2 +- .../com/willfp/talismans/TalismansPlugin.kt | 7 +++++++ .../src/main/resources/talismans.yml | 20 +++++++++++++++++++ gradle.properties | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8de0ac6..2271ed3 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.13.1' + implementation 'com.willfp:libreforge:3.14.2' 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 32f1f1d..cc1ef5c 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,6 +4,7 @@ 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 @@ -26,6 +27,12 @@ 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/resources/talismans.yml b/eco-core/core-plugin/src/main/resources/talismans.yml index 527717b..3e83906 100644 --- a/eco-core/core-plugin/src/main/resources/talismans.yml +++ b/eco-core/core-plugin/src/main/resources/talismans.yml @@ -1,3 +1,23 @@ +chains: + - id: example_chain + effects: + - id: teleport + - id: potion_effect + args: + effect: blindness + level: 3 + duration: 30 + apply_to_player: true + - id: send_message + args: + message: "&fYou have been teleported!" + action_bar: true + - id: play_sound + args: + sound: entity_dragon_fireball_explode + pitch: 1.5 + volume: 4 + talismans: - id: archery_1 name: "&aArchery Talisman I" diff --git a/gradle.properties b/gradle.properties index b1cfe4c..0cb9d08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 5.21.1 +version = 5.22.0 plugin-name = Talismans \ No newline at end of file