Added ability to specify local storage usage individually for each persistent data key via a constructor parameter

eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java

@@ -29,6 +29,31 @@ public final class PersistentDataKey<T> {
      */
     private final PersistentDataKeyType<T> type;
 
+    /**
+     * If the key uses local storage.
+     */
+    private final boolean local;
+
+    /**
+     * Create a new Persistent Data Key.
+     *
+     * @param key          The key.
+     * @param type         The data type.
+     * @param defaultValue The default value.
+     * @param local        If the key uses local storage.
+     */
+    public PersistentDataKey(@NotNull final NamespacedKey key,
+                             @NotNull final PersistentDataKeyType<T> type,
+                             @NotNull final T defaultValue,
+                             final boolean local) {
+        this.key = key;
+        this.defaultValue = defaultValue;
+        this.type = type;
+        this.local = local;
+
+        Eco.get().registerPersistentKey(this);
+    }
+
     /**
      * Create a new Persistent Data Key.
      *
@@ -42,6 +67,7 @@ public PersistentDataKey(@NotNull final NamespacedKey key,
         this.key = key;
         this.defaultValue = defaultValue;
         this.type = type;
+        this.local = false;
 
         Eco.get().registerPersistentKey(this);
     }
@@ -82,6 +108,8 @@ public PersistentDataKeyType<T> getType() {
         return this.type;
     }
 
+    public boolean isLocalStorage() { return this.local; }
+
     /**
      * Get all persistent data keys.
      *

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserEntity.kt

@@ -0,0 +1,64 @@
+package com.willfp.eco.internal.items
+
+import com.willfp.eco.core.items.args.LookupArgParser
+import org.bukkit.block.CreatureSpawner
+import org.bukkit.entity.EntityType
+import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.BlockStateMeta
+import org.bukkit.inventory.meta.ItemMeta
+import java.util.function.Predicate
+
+object ArgParserEntity : LookupArgParser {
+    override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
+        if (meta !is BlockStateMeta) {
+            return null
+        }
+
+        if (meta.hasBlockState() || meta.blockState !is CreatureSpawner) {
+            return null
+        }
+
+        val state = meta.blockState as CreatureSpawner
+
+        var type: String? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("entity", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            type = argSplit[1]
+        }
+
+        type ?: return null
+
+        val entityType = runCatching { EntityType.valueOf(type.uppercase()) }.getOrNull() ?: return null
+
+        state.spawnedType = entityType
+
+        meta.blockState = state
+
+        return Predicate {
+            val testMeta = ((it.itemMeta as? BlockStateMeta) as? CreatureSpawner) ?: return@Predicate false
+
+            testMeta.spawnedType?.name?.equals(type, true) == true
+        }
+    }
+
+    override fun serializeBack(meta: ItemMeta): String? {
+        if (meta !is BlockStateMeta) {
+            return null
+        }
+
+        if (meta.hasBlockState() || meta.blockState !is CreatureSpawner) {
+            return null
+        }
+
+        val state = meta.blockState as CreatureSpawner
+
+        return state.spawnedType?.let { "entity:${state.spawnedType!!.name}" } ?: return null
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt

@@ -22,34 +22,8 @@ import com.willfp.eco.core.particle.Particles
 import com.willfp.eco.core.price.Prices
 import com.willfp.eco.internal.data.MavenVersionToStringAdapter
 import com.willfp.eco.internal.data.VersionToStringAdapter
-import com.willfp.eco.internal.entities.EntityArgParserAdult
-import com.willfp.eco.internal.entities.EntityArgParserAttackDamage
-import com.willfp.eco.internal.entities.EntityArgParserAttackSpeed
-import com.willfp.eco.internal.entities.EntityArgParserBaby
-import com.willfp.eco.internal.entities.EntityArgParserCharged
-import com.willfp.eco.internal.entities.EntityArgParserEquipment
-import com.willfp.eco.internal.entities.EntityArgParserExplosionRadius
-import com.willfp.eco.internal.entities.EntityArgParserFlySpeed
-import com.willfp.eco.internal.entities.EntityArgParserFollowRange
-import com.willfp.eco.internal.entities.EntityArgParserHealth
-import com.willfp.eco.internal.entities.EntityArgParserJumpStrength
-import com.willfp.eco.internal.entities.EntityArgParserKnockback
-import com.willfp.eco.internal.entities.EntityArgParserKnockbackResistance
-import com.willfp.eco.internal.entities.EntityArgParserName
-import com.willfp.eco.internal.entities.EntityArgParserNoAI
-import com.willfp.eco.internal.entities.EntityArgParserSilent
-import com.willfp.eco.internal.entities.EntityArgParserSize
-import com.willfp.eco.internal.entities.EntityArgParserSpawnReinforcements
-import com.willfp.eco.internal.entities.EntityArgParserSpeed
-import com.willfp.eco.internal.items.ArgParserColor
-import com.willfp.eco.internal.items.ArgParserCustomModelData
-import com.willfp.eco.internal.items.ArgParserEnchantment
-import com.willfp.eco.internal.items.ArgParserFlag
-import com.willfp.eco.internal.items.ArgParserHead
-import com.willfp.eco.internal.items.ArgParserName
-import com.willfp.eco.internal.items.ArgParserTexture
-import com.willfp.eco.internal.items.ArgParserTrim
-import com.willfp.eco.internal.items.ArgParserUnbreakable
+import com.willfp.eco.internal.entities.*
+import com.willfp.eco.internal.items.*
 import com.willfp.eco.internal.lookup.SegmentParserGroup
 import com.willfp.eco.internal.lookup.SegmentParserUseIfPresent
 import com.willfp.eco.internal.particle.ParticleFactoryRGB
@@ -69,37 +43,10 @@ import com.willfp.eco.internal.spigot.eventlisteners.armor.ArmorListener
 import com.willfp.eco.internal.spigot.gui.GUIListener
 import com.willfp.eco.internal.spigot.integrations.afk.AFKIntegrationCMI
 import com.willfp.eco.internal.spigot.integrations.afk.AFKIntegrationEssentials
-import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatAAC
-import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatAlice
-import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatMatrix
-import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatNCP
-import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatSpartan
-import com.willfp.eco.internal.spigot.integrations.anticheat.AnticheatVulcan
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefBentoBox
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV10
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV11
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCrashClaim
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefDeluxeCombat
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFabledSkyBlock
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFactionsUUID
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefGriefPrevention
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefIridiumSkyblock
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefKingdoms
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefLands
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefPvPManager
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefRPGHorses
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefSuperiorSkyblock2
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefTowny
-import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefWorldGuard
+import com.willfp.eco.internal.spigot.integrations.anticheat.*
+import com.willfp.eco.internal.spigot.integrations.antigrief.*
 import com.willfp.eco.internal.spigot.integrations.customentities.CustomEntitiesMythicMobs
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsCustomCrafting
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsDenizen
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsExecutableItems
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsHeadDatabase
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsItemsAdder
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsMythicMobs
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsOraxen
-import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsScyther
+import com.willfp.eco.internal.spigot.integrations.customitems.*
 import com.willfp.eco.internal.spigot.integrations.customrecipes.CustomRecipeCustomCrafting
 import com.willfp.eco.internal.spigot.integrations.economy.EconomyVault
 import com.willfp.eco.internal.spigot.integrations.entitylookup.EntityLookupModelEngine
@@ -149,6 +96,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         Items.registerArgParser(ArgParserUnbreakable)
         Items.registerArgParser(ArgParserName)
         Items.registerArgParser(ArgParserHead)
+        Items.registerArgParser(ArgParserEntity)
         if (Prerequisite.HAS_1_20.isMet) {
             Items.registerArgParser(ArgParserTrim)
         }
@@ -367,8 +315,10 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             },
             IntegrationLoader("PlayerPoints") { Prices.registerPriceFactory(PriceFactoryPlayerPoints()) },
             IntegrationLoader("RoyaleEconomy") {
-                for (currency in MultiCurrencyHandler.getCurrencies()) {
-                    Prices.registerPriceFactory(PriceFactoryRoyaleEconomy(currency))
+                if (!MultiCurrencyHandler.getCurrencies().isNullOrEmpty()) {
+                    for (currency in MultiCurrencyHandler.getCurrencies()) {
+                        Prices.registerPriceFactory(PriceFactoryRoyaleEconomy(currency))
+                    }
                 }
             },
 

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfile.kt

@@ -106,3 +106,4 @@ class EcoServerProfile(
 
 private val PersistentDataKey<*>.isLocal: Boolean
     get() = this == localServerIDKey || EcoPlugin.getPlugin(this.key.namespace)?.isUsingLocalStorage == true
+            || this.isLocalStorage

eco-core/core-plugin/src/main/resources/paper-plugin.yml

@@ -5,6 +5,10 @@ api-version: 1.19
 load: STARTUP
 
 dependencies:
+  - name: Terra
+    required: false
+    bootstrap: false
+
   - name: ProtocolLib
     required: false
     bootstrap: false

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -6,6 +6,7 @@ authors: [ Auxilor ]
 website: willfp.com
 load: STARTUP
 softdepend:
+  - Terra
   - ProtocolLib
   - WorldGuard
   - GriefPrevention