Added item tags

This commit is contained in:
Auxilor
2024-07-20 14:08:59 +01:00
parent b460e5782b
commit 377d4b9d98
3 changed files with 15 additions and 1 deletions

View File

@@ -37,7 +37,7 @@ allprojects {
} }
dependencies { dependencies {
compileOnly("com.willfp:eco:6.72.0") compileOnly("com.willfp:eco:6.73.0")
compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("org.jetbrains:annotations:23.0.0")
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20") compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.5") compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.5")

View File

@@ -3,6 +3,7 @@ package com.willfp.ecoitems
import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.eco.core.command.impl.PluginCommand
import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.display.DisplayModule
import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.tag.CustomItemTag
import com.willfp.ecoitems.commands.CommandEcoItems import com.willfp.ecoitems.commands.CommandEcoItems
import com.willfp.ecoitems.display.ItemsDisplay import com.willfp.ecoitems.display.ItemsDisplay
import com.willfp.ecoitems.display.RarityDisplay import com.willfp.ecoitems.display.RarityDisplay
@@ -11,6 +12,7 @@ import com.willfp.ecoitems.items.EcoItems
import com.willfp.ecoitems.items.EcoItemsRecipes import com.willfp.ecoitems.items.EcoItemsRecipes
import com.willfp.ecoitems.items.ItemAttributeListener import com.willfp.ecoitems.items.ItemAttributeListener
import com.willfp.ecoitems.items.ItemListener import com.willfp.ecoitems.items.ItemListener
import com.willfp.ecoitems.items.ecoItem
import com.willfp.ecoitems.libreforge.ConditionHasEcoItem import com.willfp.ecoitems.libreforge.ConditionHasEcoItem
import com.willfp.ecoitems.rarity.ArgParserRarity import com.willfp.ecoitems.rarity.ArgParserRarity
import com.willfp.ecoitems.rarity.Rarities import com.willfp.ecoitems.rarity.Rarities
@@ -31,6 +33,9 @@ class EcoItemsPlugin : LibreforgePlugin() {
override fun handleEnable() { override fun handleEnable() {
Items.registerArgParser(ArgParserRarity) Items.registerArgParser(ArgParserRarity)
Items.registerTag(CustomItemTag(this.createNamespacedKey("item")) {
it.ecoItem != null
})
Conditions.register(ConditionHasEcoItem) Conditions.register(ConditionHasEcoItem)

View File

@@ -3,6 +3,7 @@ package com.willfp.ecoitems.rarity
import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.display.Display import com.willfp.eco.core.display.Display
import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.tag.CustomItemTag
import com.willfp.eco.core.recipe.parts.EmptyTestableItem import com.willfp.eco.core.recipe.parts.EmptyTestableItem
import com.willfp.eco.core.registry.KRegistrable import com.willfp.eco.core.registry.KRegistrable
import com.willfp.ecoitems.EcoItemsPlugin import com.willfp.ecoitems.EcoItemsPlugin
@@ -23,6 +24,14 @@ class Rarity(
val displayLore = lore.map { Display.PREFIX + it } val displayLore = lore.map { Display.PREFIX + it }
val tag = CustomItemTag(plugin.createNamespacedKey(id)) {
it.ecoItemRarity == this
}
init {
Items.registerTag(tag)
}
fun matches(item: ItemStack): Boolean { fun matches(item: ItemStack): Boolean {
return items.any { it.matches(item) } return items.any { it.matches(item) }
} }