From 231b54d638ccb38b54c5f3c9436a2ad6452ab83a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 14 Dec 2021 11:03:21 +0000 Subject: [PATCH] Fixed stupidity --- eco-core/core-plugin/build.gradle | 2 +- .../main/kotlin/com/willfp/talismans/TalismansPlugin.kt | 7 ++++++- .../main/kotlin/com/willfp/talismans/talismans/Talisman.kt | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 14580ec..32e7dac 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -2,7 +2,7 @@ group 'com.willfp' version rootProject.version dependencies { - compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' } build.dependsOn publishToMavenLocal 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 767529a..408792b 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 @@ -9,7 +9,11 @@ import com.willfp.talismans.command.CommandTalismans import com.willfp.talismans.config.TalismansYml import com.willfp.talismans.display.TalismanDisplay import com.willfp.talismans.talismans.Talismans -import com.willfp.talismans.talismans.util.* +import com.willfp.talismans.talismans.util.BlockPlaceListener +import com.willfp.talismans.talismans.util.DiscoverRecipeListener +import com.willfp.talismans.talismans.util.TalismanChecks +import com.willfp.talismans.talismans.util.TalismanCraftListener +import com.willfp.talismans.talismans.util.TalismanEnableListeners import org.bukkit.event.Listener class TalismansPlugin : EcoPlugin(611, 9865, "&6", true) { @@ -22,6 +26,7 @@ class TalismansPlugin : EcoPlugin(611, 9865, "&6", true) { instance = this LibReforge.init(this) LibReforge.registerHolderProvider { TalismanChecks.getTalismansOnPlayer(it) } + Talismans.update(this) } override fun handleEnable() { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt index 42c0db4..e3123ea 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/talismans/talismans/Talisman.kt @@ -75,11 +75,11 @@ class Talisman( ).apply { register() } override val effects = config.getSubsections("effects").mapNotNull { - Effects.compile(it, "Talisman ID ${net.minecraft.server.v1_16_R3.Items.id}") + Effects.compile(it, "Talisman ID $id") }.toSet() override val conditions = config.getSubsections("conditions").mapNotNull { - Conditions.compile(it, "Talisman ID ${net.minecraft.server.v1_16_R3.Items.id}") + Conditions.compile(it, "Talisman ID $id") }.toSet() init {