From 58d5b26848b1d8e80cbb63ec99f7095ccf349038 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 20 Jul 2024 15:28:31 +0100 Subject: [PATCH] Updated tags --- .../kotlin/com/willfp/reforges/ReforgesPlugin.kt | 14 ++++++++------ .../willfp/reforges/reforges/ReforgeStoneTag.kt | 16 ++++++++++++++++ .../com/willfp/reforges/reforges/ReforgedTag.kt | 13 +++++++++++++ 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeStoneTag.kt create mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgedTag.kt 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 2071990..973e35b 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 @@ -14,13 +14,18 @@ import com.willfp.reforges.config.TargetYml import com.willfp.reforges.display.ReforgesDisplay import com.willfp.reforges.libreforge.ConditionHasReforge import com.willfp.reforges.reforges.ReforgeFinder +import com.willfp.reforges.reforges.ReforgeStoneTag +import com.willfp.reforges.reforges.ReforgedTag import com.willfp.reforges.reforges.Reforges import com.willfp.reforges.reforges.util.ReforgeArgParser import com.willfp.reforges.util.AntiPlaceListener import com.willfp.reforges.util.DiscoverRecipeListener import com.willfp.reforges.util.reforge import com.willfp.reforges.util.reforgeStone +import com.willfp.talismans.talismans.Talismans +import com.willfp.talismans.talismans.util.TalismanChecks import org.bukkit.event.Listener +import org.bukkit.inventory.ItemStack class ReforgesPlugin : LibreforgePlugin() { val targetYml: TargetYml = @@ -40,12 +45,9 @@ class ReforgesPlugin : LibreforgePlugin() { Conditions.register(ConditionHasReforge) Items.registerArgParser(ReforgeArgParser) - Items.registerTag(CustomItemTag(this.createNamespacedKey("stone")) { - it.reforgeStone != null - }) - Items.registerTag(CustomItemTag(this.createNamespacedKey("reforged")) { - it.reforge != null - }) + + Items.registerTag(ReforgedTag(this)) + Items.registerTag(ReforgeStoneTag(this)) registerHolderProvider(ReforgeFinder.toHolderProvider()) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeStoneTag.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeStoneTag.kt new file mode 100644 index 0000000..ea09f21 --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeStoneTag.kt @@ -0,0 +1,16 @@ +package com.willfp.reforges.reforges + +import com.willfp.eco.core.EcoPlugin +import com.willfp.eco.core.items.tag.CustomItemTag +import com.willfp.reforges.util.reforgeStone +import org.bukkit.inventory.ItemStack + +class ReforgeStoneTag(plugin: EcoPlugin): CustomItemTag(plugin.createNamespacedKey("stone")) { + override fun matches(p0: ItemStack): Boolean { + return p0.reforgeStone != null + } + + override fun getExampleItem(): ItemStack { + return Reforges.values().random().stone + } +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgedTag.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgedTag.kt new file mode 100644 index 0000000..f4c29cb --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgedTag.kt @@ -0,0 +1,13 @@ +package com.willfp.reforges.reforges + +import com.willfp.eco.core.EcoPlugin +import com.willfp.eco.core.items.tag.CustomItemTag +import com.willfp.reforges.util.reforge +import com.willfp.reforges.util.reforgeStone +import org.bukkit.inventory.ItemStack + +class ReforgedTag(plugin: EcoPlugin): CustomItemTag(plugin.createNamespacedKey("reforged")) { + override fun matches(p0: ItemStack): Boolean { + return p0.reforge != null + } +}