From 154fa7d183e5f8df1d49fca98601ed89d9f5299b Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 7 Dec 2021 08:51:02 +0000 Subject: [PATCH] Moved flags, unbreakability, custom model data to arg parsers --- .../main/kotlin/com/willfp/ecoweapons/weapons/Weapon.kt | 8 -------- eco-core/core-plugin/src/main/resources/ecoweapons.yml | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoweapons/weapons/Weapon.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoweapons/weapons/Weapon.kt index 0a8fad8..7812cd6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoweapons/weapons/Weapon.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoweapons/weapons/Weapon.kt @@ -11,10 +11,8 @@ import com.willfp.ecoweapons.fuels.Fuels import com.willfp.libreforge.Holder import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.effects.Effects -import org.bukkit.inventory.ItemFlag import org.bukkit.inventory.ItemStack import org.bukkit.persistence.PersistentDataType -import org.jetbrains.annotations.NotNull import java.util.Objects class Weapon( @@ -35,12 +33,6 @@ class Weapon( val itemConfig = config.getSubsection("item") ItemStackBuilder(Items.lookup(itemConfig.getString("item")).item).apply { setDisplayName(itemConfig.getFormattedString("displayName")) - addItemFlag( - *itemConfig.getStrings("flags") - .mapNotNull { ItemFlag.valueOf(it.uppercase()) } - .toTypedArray<@NotNull ItemFlag>() - ) - setUnbreakable(itemConfig.getBool("unbreakable")) addLoreLines( itemConfig.getFormattedStrings("lore").map { "${Display.PREFIX}$it" }) writeMetaKey( diff --git a/eco-core/core-plugin/src/main/resources/ecoweapons.yml b/eco-core/core-plugin/src/main/resources/ecoweapons.yml index 0dadf35..dc081b2 100644 --- a/eco-core/core-plugin/src/main/resources/ecoweapons.yml +++ b/eco-core/core-plugin/src/main/resources/ecoweapons.yml @@ -39,9 +39,6 @@ weapons: - '' - "&8&oYou must have &oReaper Souls&8&o to fuel the scythe" attributes: [] - unbreakable: false - flags: - - hide_attributes craftable: true recipe: - nether_star @@ -53,6 +50,7 @@ weapons: - nether_star - netherite_sword - nether_star + fuels: - id: reaper_soul item: