Merge branch 'develop'

Fix PvPManager integration

eco-api/src/main/java/com/willfp/eco/core/Eco.java

@@ -401,15 +401,6 @@ public interface Eco {
     @NotNull
     ServerProfile getServerProfile();
 
-    /**
-     * Unload a player profile from memory.
-     * <p>
-     * This will not save the profile first.
-     *
-     * @param uuid The uuid.
-     */
-    void unloadPlayerProfile(@NotNull UUID uuid);
-
     /**
      * Create dummy entity - never spawned, exists purely in code.
      *

eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java

@@ -164,6 +164,11 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      */
     private final ListMap<LifecyclePosition, Runnable> afterLoad = new ListMap<>();
 
+    /**
+     * The tasks to run on task creation.
+     */
+    private final ListMap<LifecyclePosition, Runnable> createTasks = new ListMap<>();
+
     /**
      * Create a new plugin.
      * <p>
@@ -632,6 +637,10 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
 
         this.handleLifecycle(this.onReload, this::handleReload);
 
+        if (cancelTasks) {
+            this.handleLifecycle(this.createTasks, this::createTasks);
+        }
+
         for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
             extension.handleReload();
         }
@@ -745,6 +754,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
 
     }
 
+    /**
+     * The plugin-specific code to create tasks.
+     * <p>
+     * Override when needed.
+     */
+    protected void createTasks() {
+
+    }
+
     /**
      * The plugin-specific code to be executed after the server is up.
      * <p>

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

@@ -4,6 +4,7 @@ import com.willfp.eco.core.config.interfaces.Config;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -49,6 +50,11 @@ public final class PersistentDataKeyType<T> {
      */
     public static final PersistentDataKeyType<Config> CONFIG = new PersistentDataKeyType<>("CONFIG");
 
+    /**
+     * Big Decimal.
+     */
+    public static final PersistentDataKeyType<BigDecimal> BIG_DECIMAL = new PersistentDataKeyType<>("BIG_DECIMAL");
+
     /**
      * The name of the key type.
      */

eco-api/src/main/java/com/willfp/eco/core/integrations/IntegrationRegistry.java

@@ -17,6 +17,13 @@ import java.util.function.Supplier;
  * @param <T> The type of integration.
  */
 public class IntegrationRegistry<T extends Integration> extends Registry<T> {
+    /**
+     * Create a new integration registry.
+     */
+    public IntegrationRegistry() {
+        super();
+    }
+
     @Override
     public @NotNull T register(@NotNull final T element) {
         return executeSafely(() -> super.register(element), element);

eco-api/src/main/java/com/willfp/eco/core/map/DefaultMap.java

@@ -150,7 +150,7 @@ public class DefaultMap<K, V> implements Map<K, V> {
      */
     @NotNull
     public static <K, K1, V> DefaultMap<K, Map<K1, V>> createNestedMap() {
-        return new DefaultMap<>(new HashMap<>());
+        return new DefaultMap<>(HashMap::new);
     }
 
     /**
@@ -163,6 +163,6 @@ public class DefaultMap<K, V> implements Map<K, V> {
      */
     @NotNull
     public static <K, K1, V> DefaultMap<K, ListMap<K1, V>> createNestedListMap() {
-        return new DefaultMap<>(new ListMap<>());
+        return new DefaultMap<>(ListMap::new);
     }
 }

eco-api/src/main/kotlin/com/willfp/eco/core/map/DefaultMap.kt

@@ -8,7 +8,7 @@ package com.willfp.eco.core.map
  * @see ListMap
  */
 @Suppress("RedundantOverride")
-class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
+class MutableListMap<K : Any, V> : ListMap<K, V>() {
     /**
      * Override with enforced MutableList type.
      */
@@ -18,7 +18,7 @@ class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
     /**
      * Override with enforced MutableList type.
      */
-    override fun getOrDefault(key: K, defaultValue: MutableList<V>?): MutableList<V> {
+    override fun getOrDefault(key: K, defaultValue: MutableList<V>): MutableList<V> {
         return super.getOrDefault(key, defaultValue)
     }
 }
@@ -29,6 +29,12 @@ class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
 fun <K : Any, V : Any> defaultMap(defaultValue: V) =
     DefaultMap<K, V>(defaultValue)
 
+/**
+ * @see DefaultMap
+ */
+fun <K : Any, V : Any> defaultMap(defaultValue: () -> V) =
+    DefaultMap<K, V>(defaultValue())
+
 /**
  * @see ListMap
  */
@@ -38,11 +44,13 @@ fun <K : Any, V : Any> listMap() =
 /**
  * @see DefaultMap.createNestedMap
  */
-fun <K : Any, K1 : Any, V : Any> nestedMap() =
+fun <K : Any, K1 : Any, V> nestedMap() =
     DefaultMap.createNestedMap<K, K1, V>()
 
 /**
  * @see DefaultMap.createNestedListMap
  */
-fun <K : Any, K1 : Any, V : Any> nestedListMap() =
-    DefaultMap<K, MutableListMap<K1, V>>(MutableListMap())
+fun <K : Any, K1 : Any, V> nestedListMap() =
+    DefaultMap<K, MutableListMap<K1, V>>() {
+        MutableListMap()
+    }

eco-api/src/main/kotlin/com/willfp/eco/util/ListUtils.kt

@@ -15,5 +15,5 @@ fun <T> create2DList(rows: Int, columns: Int): MutableList<MutableList<T>> =
     ListUtils.create2DList(rows, columns)
 
 /** @see ListUtils.toSingletonList */
-fun <T> T.toSingletonList(): List<T> =
+fun <T> T?.toSingletonList(): List<T> =
     ListUtils.toSingletonList(this)

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt

@@ -8,10 +8,12 @@ import org.bukkit.command.TabCompleter
 
 class DelegatedBukkitCommand(
     private val delegate: EcoPluginCommand
-) : Command(delegate.name), TabCompleter, PluginIdentifiableCommand {
-    private var _aliases: List<String>? = null
-    private var _description: String? = null
-
+) : Command(
+    delegate.name,
+    delegate.description ?: "",
+    "/${delegate.name}",
+    delegate.aliases
+), TabCompleter, PluginIdentifiableCommand {
     override fun execute(sender: CommandSender, label: String, args: Array<out String>?): Boolean {
         return delegate.onCommand(sender, this, label, args)
     }
@@ -36,16 +38,4 @@ class DelegatedBukkitCommand(
 
     override fun getPlugin() = delegate.plugin
     override fun getPermission() = delegate.permission
-    override fun getDescription() = _description ?: delegate.description ?: ""
-    override fun getAliases(): List<String> = _aliases ?: delegate.aliases
-
-    override fun setDescription(description: String): Command {
-        this._description = description
-        return this
-    }
-
-    override fun setAliases(aliases: List<String>): Command {
-        this._aliases = aliases
-        return this
-    }
 }

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

@@ -286,9 +286,6 @@ class EcoImpl : EcoSpigotPlugin(), Eco {
     override fun loadPlayerProfile(uuid: UUID) =
         profileHandler.load(uuid)
 
-    override fun unloadPlayerProfile(uuid: UUID) =
-        profileHandler.unloadPlayer(uuid)
-
     override fun createDummyEntity(location: Location): Entity =
         getProxy(DummyEntityFactoryProxy::class.java).createDummyEntity(location)
 

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

@@ -112,6 +112,7 @@ import com.willfp.eco.internal.spigot.integrations.mcmmo.McmmoIntegrationImpl
 import com.willfp.eco.internal.spigot.integrations.multiverseinventories.MultiverseInventoriesIntegration
 import com.willfp.eco.internal.spigot.integrations.placeholder.PlaceholderIntegrationPAPI
 import com.willfp.eco.internal.spigot.integrations.price.PriceFactoryPlayerPoints
+import com.willfp.eco.internal.spigot.integrations.price.PriceFactoryRoyaleEconomy
 import com.willfp.eco.internal.spigot.integrations.price.PriceFactoryUltraEconomy
 import com.willfp.eco.internal.spigot.integrations.shop.ShopDeluxeSellwands
 import com.willfp.eco.internal.spigot.integrations.shop.ShopEconomyShopGUI
@@ -127,6 +128,7 @@ import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapedCraftingRecipe
 import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapelessCraftingRecipeStackHandler
 import com.willfp.eco.util.ClassUtils
 import me.TechsCode.UltraEconomy.UltraEconomy
+import me.qKing12.RoyaleEconomy.MultiCurrency.MultiCurrencyHandler
 import net.kyori.adventure.platform.bukkit.BukkitAudiences
 import net.milkbowl.vault.economy.Economy
 import org.bukkit.Bukkit
@@ -219,8 +221,6 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             this.logger.info("No conflicts found!")
         }
 
-
-        CollatedRunnable(this)
         CustomItemsManager.registerProviders() // Do it again here
 
         // Register events for ShopSellEvent
@@ -251,7 +251,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         Eco.get().adventure?.close()
     }
 
-    override fun handleReload() {
+    override fun createTasks() {
         CollatedRunnable(this)
 
         this.scheduler.runLater(3) {
@@ -360,6 +360,11 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
                 }
             },
             IntegrationLoader("PlayerPoints") { Prices.registerPriceFactory(PriceFactoryPlayerPoints()) },
+            IntegrationLoader("RoyaleEconomy") {
+                for (currency in MultiCurrencyHandler.getCurrencies()) {
+                    Prices.registerPriceFactory(PriceFactoryRoyaleEconomy(currency))
+                }
+            },
 
             // Placeholder
             IntegrationLoader("PlaceholderAPI") { PlaceholderManager.addIntegration(PlaceholderIntegrationPAPI()) },
@@ -384,7 +389,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             GUIListener(this),
             ArrowDataListener(this),
             ArmorChangeEventListeners(this),
-            DataListener(this),
+            DataListener(this, profileHandler),
             PlayerBlockListener(this),
             ServerLocking
         )

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.internal.spigot.data
 
-import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.util.PlayerUtils
 import org.bukkit.event.EventHandler
@@ -11,11 +10,14 @@ import org.bukkit.event.player.PlayerLoginEvent
 import org.bukkit.event.player.PlayerQuitEvent
 
 class DataListener(
-    private val plugin: EcoPlugin
+    private val plugin: EcoPlugin,
+    private val handler: ProfileHandler
 ) : Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     fun onLeave(event: PlayerQuitEvent) {
-        Eco.get().unloadPlayerProfile(event.player.uniqueId)
+        val profile = handler.accessLoadedProfile(event.player.uniqueId) ?: return
+        handler.saveKeysFor(event.player.uniqueId, profile.data.keys)
+        handler.unloadPlayer(event.player.uniqueId)
     }
 
     @EventHandler
@@ -27,6 +29,6 @@ class DataListener(
 
     @EventHandler(priority = EventPriority.LOWEST)
     fun onLogin(event: PlayerLoginEvent) {
-        Eco.get().unloadPlayerProfile(event.player.uniqueId)
+        handler.unloadPlayer(event.player.uniqueId)
     }
 }

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

@@ -4,6 +4,7 @@ import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.data.keys.PersistentDataKey
 import com.willfp.eco.core.data.keys.PersistentDataKeyType
 import org.bukkit.NamespacedKey
+import java.math.BigDecimal
 
 object KeyRegistry {
     private val registry = mutableMapOf<NamespacedKey, PersistentDataKey<*>>()
@@ -44,6 +45,9 @@ object KeyRegistry {
             PersistentDataKeyType.CONFIG -> if (default !is Config) {
                 throw IllegalArgumentException("Invalid Data Type! Should be Config")
             }
+            PersistentDataKeyType.BIG_DECIMAL -> if (default !is BigDecimal) {
+                throw IllegalArgumentException("Invalid Data Type! Should be BigDecimal")
+            }
 
             else -> throw NullPointerException("Null value found!")
         }

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

@@ -58,11 +58,18 @@ class ProfileHandler(
     }
 
     fun saveKeysFor(uuid: UUID, keys: Set<PersistentDataKey<*>>) {
-        handler.saveKeysFor(uuid, keys)
+        val profile = accessLoadedProfile(uuid) ?: return
+        val map = mutableMapOf<PersistentDataKey<*>, Any>()
+
+        for (key in keys) {
+            map[key] = profile.data[key] ?: continue
+        }
+
+        handler.saveKeysFor(uuid, map)
 
         // Don't save to local handler if it's the same handler.
         if (localHandler != handler) {
-            localHandler.saveKeysFor(uuid, keys)
+            localHandler.saveKeysFor(uuid, map)
         }
     }
 

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

@@ -19,7 +19,7 @@ abstract class DataHandler(
     /**
      * Save a set of keys for a given UUID.
      */
-    abstract fun saveKeysFor(uuid: UUID, keys: Set<PersistentDataKey<*>>)
+    abstract fun saveKeysFor(uuid: UUID, keys: Map<PersistentDataKey<*>, Any>)
 
     // Everything below this are methods that are only needed for certain implementations.
 

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.internal.spigot.data.storage
 
-import com.willfp.eco.core.data.Profile
 import com.willfp.eco.core.data.keys.PersistentDataKey
 import com.willfp.eco.internal.spigot.EcoSpigotPlugin
 import com.willfp.eco.internal.spigot.data.ProfileHandler
@@ -51,18 +50,16 @@ class MongoDataHandler(
         }
     }
 
-    override fun saveKeysFor(uuid: UUID, keys: Set<PersistentDataKey<*>>) {
-        val profile = handler.loadGenericProfile(uuid)
-
+    override fun saveKeysFor(uuid: UUID, keys: Map<PersistentDataKey<*>, Any>) {
         scope.launch {
-            for (key in keys) {
-                saveKey(profile, uuid, key)
+            for ((key, value) in keys) {
+                saveKey(uuid, key, value)
             }
         }
     }
 
-    private suspend fun <T : Any> saveKey(profile: Profile, uuid: UUID, key: PersistentDataKey<T>) {
-        val data = profile.read(key)
+    private suspend fun <T : Any> saveKey(uuid: UUID, key: PersistentDataKey<T>, value: Any) {
+        val data = value as T
         doWrite(uuid, key, data)
     }
 

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

@@ -21,6 +21,7 @@ import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import java.math.BigDecimal
 import java.util.UUID
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
@@ -84,6 +85,9 @@ class MySQLDataHandler(
             PersistentDataKeyType.BOOLEAN -> data.getBoolOrNull(key.key.toString())
             PersistentDataKeyType.STRING_LIST -> data.getStringsOrNull(key.key.toString())
             PersistentDataKeyType.CONFIG -> data.getSubsectionOrNull(key.key.toString())
+            PersistentDataKeyType.BIG_DECIMAL -> if (data.has(key.key.toString()))
+                BigDecimal(data.getString(key.key.toString())) else null
+
             else -> null
         }
 
@@ -97,16 +101,15 @@ class MySQLDataHandler(
         setData(uuid, data)
     }
 
-    override fun saveKeysFor(uuid: UUID, keys: Set<PersistentDataKey<*>>) {
-        val profile = handler.loadGenericProfile(uuid)
-
+    override fun saveKeysFor(uuid: UUID, keys: Map<PersistentDataKey<*>, Any>) {
         executor.submit {
             val data = getData(uuid)
-            for (key in keys) {
-                data.set(key.key.toString(), profile.read(key))
+
+            for ((key, value) in keys) {
+                data.set(key.key.toString(), value)
             }
 
-            setData(uuid, data)
+            doSetData(uuid, data)
         }
     }
 
@@ -136,10 +139,14 @@ class MySQLDataHandler(
 
     private fun setData(uuid: UUID, config: Config) {
         executor.submit {
-            transaction(database) {
-                table.update({ table.id eq uuid }) {
-                    it[dataColumn] = config.toPlaintext()
-                }
+            doSetData(uuid, config)
+        }
+    }
+
+    private fun doSetData(uuid: UUID, config: Config) {
+        transaction(database) {
+            table.update({ table.id eq uuid }) {
+                it[dataColumn] = config.toPlaintext()
             }
         }
     }

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

@@ -5,6 +5,7 @@ import com.willfp.eco.core.data.keys.PersistentDataKeyType
 import com.willfp.eco.internal.spigot.EcoSpigotPlugin
 import com.willfp.eco.internal.spigot.data.ProfileHandler
 import org.bukkit.NamespacedKey
+import java.math.BigDecimal
 import java.util.UUID
 
 @Suppress("UNCHECKED_CAST")
@@ -27,6 +28,9 @@ class YamlDataHandler(
             PersistentDataKeyType.BOOLEAN -> dataYml.getBoolOrNull("player.$uuid.${key.key}") as T?
             PersistentDataKeyType.STRING_LIST -> dataYml.getStringsOrNull("player.$uuid.${key.key}") as T?
             PersistentDataKeyType.CONFIG -> dataYml.getSubsectionOrNull("player.$uuid.${key.key}") as T?
+            PersistentDataKeyType.BIG_DECIMAL -> (if (dataYml.has(key.key.toString()))
+                BigDecimal(dataYml.getString(key.key.toString())) else null) as T?
+
             else -> null
         }
 
@@ -37,11 +41,9 @@ class YamlDataHandler(
         doWrite(uuid, key.key, value)
     }
 
-    override fun saveKeysFor(uuid: UUID, keys: Set<PersistentDataKey<*>>) {
-        val profile = handler.loadGenericProfile(uuid)
-
-        for (key in keys) {
-            doWrite(uuid, key.key, profile.read(key))
+    override fun saveKeysFor(uuid: UUID, keys: Map<PersistentDataKey<*>, Any>) {
+        for ((key, value) in keys) {
+            doWrite(uuid, key.key, value)
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefPvPManager.kt

@@ -27,7 +27,8 @@ class AntigriefPvPManager: AntigriefIntegration {
     override fun canInjure(player: Player, victim: LivingEntity): Boolean {
         return when(victim) {
             is Player -> {
-                (PvPlayer.get(victim).isInCombat)}
+                val defender = PvPlayer.get(victim)
+                (defender.hasPvPEnabled() && !defender.isNewbie || defender.isInCombat)}
             else -> true
         }
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/price/PriceFactoryRoyaleEconomy.kt

@@ -0,0 +1,54 @@
+package com.willfp.eco.internal.spigot.integrations.price
+
+import com.willfp.eco.core.placeholder.context.PlaceholderContext
+import com.willfp.eco.core.placeholder.context.PlaceholderContextSupplier
+import com.willfp.eco.core.price.Price
+import com.willfp.eco.core.price.PriceFactory
+import com.willfp.eco.util.toSingletonList
+import me.qKing12.RoyaleEconomy.MultiCurrency.Currency
+import org.bukkit.entity.Player
+import java.util.*
+
+class PriceFactoryRoyaleEconomy(private val currency: Currency) : PriceFactory {
+
+    override fun getNames(): List<String> {
+        return currency.currencyId.lowercase().toSingletonList()
+    }
+
+    override fun create(baseContext: PlaceholderContext, function: PlaceholderContextSupplier<Double>): Price {
+        return PriceRoyaleEconomy(currency, baseContext) { function.get(it) }
+    }
+
+    private class PriceRoyaleEconomy(
+        private val currency: Currency,
+        private val baseContext: PlaceholderContext,
+        private val function: (PlaceholderContext) -> Double
+    ) : Price {
+        private val multipliers = mutableMapOf<UUID, Double>()
+
+        override fun canAfford(player: Player, multiplier: Double): Boolean {
+            return currency.getAmount(player.uniqueId.toString()) >= getValue(player, multiplier)
+        }
+
+        override fun pay(player: Player, multiplier: Double) {
+            currency.removeAmount(player.uniqueId.toString(), getValue(player, multiplier))
+        }
+
+        override fun giveTo(player: Player, multiplier: Double) {
+            currency.addAmount(player.uniqueId.toString(), getValue(player, multiplier))
+        }
+
+        override fun getValue(player: Player, multiplier: Double): Double {
+            return function(baseContext.copyWithPlayer(player)) * getMultiplier(player) * multiplier
+        }
+
+        override fun getMultiplier(player: Player): Double {
+            return multipliers[player.uniqueId] ?: 1.0
+        }
+
+        override fun setMultiplier(player: Player, multiplier: Double) {
+            multipliers[player.uniqueId] = multiplier
+        }
+    }
+
+}

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

@@ -194,5 +194,9 @@ dependencies:
     bootstrap: false
 
   - name: Denizen
+    required: false
+    bootstrap: false
+
+  - name: RoyaleEconomy
     required: false
     bootstrap: false

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

@@ -54,3 +54,4 @@ softdepend:
   - UltraEconomy
   - PlayerPoints
   - Denizen
+  - RoyaleEconomy

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.58.0
+version = 6.60.4
 plugin-name = eco
 kotlin.code.style = official