libreforge-updater

Custom default animation feature

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -47,13 +47,13 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.65.0'
+        compileOnly 'com.willfp:eco:6.42.0'
+        implementation 'com.willfp:libreforge:3.113.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
 
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
     }
 
     tasks.withType(JavaCompile) {

eco-core/core-plugin/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'net.kyori:adventure-api:4.10.1'
     compileOnly 'net.essentialsx:EssentialsX:2.19.0'
     compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
-    compileOnly 'com.ticxo.modelengine:api:R2.5.0'
+    compileOnly 'com.ticxo.modelengine:api:R3.0.0'
 }
 
 build.dependsOn publishToMavenLocal

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsPlugin.kt

@@ -6,7 +6,7 @@ import com.willfp.eco.core.placeholder.PlayerPlaceholder
 import com.willfp.eco.util.toSingletonList
 import com.willfp.ecopets.commands.CommandEcopets
 import com.willfp.ecopets.commands.CommandPets
-import com.willfp.ecopets.config.PetsYml
+import com.willfp.ecopets.pets.DiscoverRecipeListener
 import com.willfp.ecopets.pets.PetDisplay
 import com.willfp.ecopets.pets.PetLevelListener
 import com.willfp.ecopets.pets.PetTriggerXPGainListener
@@ -19,17 +19,16 @@ import com.willfp.libreforge.LibReforgePlugin
 import org.bukkit.event.Listener
 
 class EcoPetsPlugin : LibReforgePlugin() {
-    val petsYml: PetsYml
-
     private val petDisplay = PetDisplay(this)
 
     init {
         instance = this
-        petsYml = PetsYml(this)
         registerHolderProvider { it.activePetLevel?.toSingletonList() ?: emptyList() }
     }
 
     override fun handleEnableAdditional() {
+        this.copyConfigs("pets")
+
         PlayerPlaceholder(
             this,
             "pet"
@@ -55,7 +54,7 @@ class EcoPetsPlugin : LibReforgePlugin() {
         return listOf(
             IntegrationLoader("ModelEngine") {
                 PetEntity.registerPetEntity("modelengine") { pet, id ->
-                    ModelEnginePetEntity(pet, id)
+                    ModelEnginePetEntity(pet, id, this)
                 }
             }
         )
@@ -73,7 +72,8 @@ class EcoPetsPlugin : LibReforgePlugin() {
             PetLevelListener(this),
             PetTriggerXPGainListener,
             SpawnEggHandler(this),
-            petDisplay
+            petDisplay,
+            DiscoverRecipeListener(this)
         )
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandActivate.kt

@@ -0,0 +1,65 @@
+package com.willfp.ecopets.commands
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.command.impl.Subcommand
+import com.willfp.eco.util.StringUtils
+import com.willfp.ecopets.pets.Pets
+import com.willfp.ecopets.pets.activePet
+import com.willfp.ecopets.pets.hasPet
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
+
+class CommandActivate(plugin: EcoPlugin) : Subcommand(plugin, "activate", "ecopets.command.activate", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (args.isEmpty()) {
+            player.sendMessage(plugin.langYml.getMessage("needs-pet"))
+            return
+        }
+
+        val id = args[0]
+
+        val pet = Pets.getByID(id)
+
+        if (pet == null || !player.hasPet(pet)) {
+            player.sendMessage(plugin.langYml.getMessage("invalid-pet"))
+            return
+        }
+
+        if (player.activePet == pet) {
+            player.sendMessage(plugin.langYml.getMessage("pet-already-active"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("activated-pet", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%pet%", pet.name)
+        )
+        player.activePet = pet
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        if (sender !is Player) {
+            return emptyList()
+        }
+
+        val completions = mutableListOf<String>()
+        if (args.isEmpty()) {
+            // Currently, this case is not ever reached
+            return Pets.values().filter { sender.hasPet(it) }.map { it.id }
+        }
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[1],
+                Pets.values().filter { sender.hasPet(it) }.map { it.id },
+                completions
+            )
+            return completions
+        }
+
+        return emptyList()
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandDeactivate.kt

@@ -0,0 +1,26 @@
+package com.willfp.ecopets.commands
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.command.impl.Subcommand
+import com.willfp.eco.util.StringUtils
+import com.willfp.ecopets.pets.activePet
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class CommandDeactivate(plugin: EcoPlugin) : Subcommand(plugin, "deactivate", "ecopets.command.deactivate", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (player.activePet == null) {
+            player.sendMessage(plugin.langYml.getMessage("no-pet-active"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("deactivated-pet", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%pet%", player.activePet?.name ?: "")
+        )
+
+        player.activePet = null
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandEcopets.kt

@@ -1,16 +1,29 @@
 package com.willfp.ecopets.commands
 
-import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.ecopets.pets.Pets
+import com.willfp.libreforge.LibReforgePlugin
+import com.willfp.libreforge.lrcdb.CommandExport
+import com.willfp.libreforge.lrcdb.CommandImport
+import com.willfp.libreforge.lrcdb.ExportableConfig
 import org.bukkit.command.CommandSender
 
-class CommandEcopets(plugin: EcoPlugin) : PluginCommand(plugin, "ecopets", "ecopets.command.ecopets", false) {
+class CommandEcopets(plugin: LibReforgePlugin) : PluginCommand(plugin, "ecopets", "ecopets.command.ecopets", false) {
     init {
         this.addSubcommand(CommandReload(plugin))
             .addSubcommand(CommandGive(plugin))
             .addSubcommand(CommandGiveEgg(plugin))
             .addSubcommand(CommandGiveXP(plugin))
             .addSubcommand(CommandReset(plugin))
+            .addSubcommand(CommandImport("pets", plugin))
+            .addSubcommand(CommandExport(plugin) {
+                Pets.values().map {
+                    ExportableConfig(
+                        it.id,
+                        it.config
+                    )
+                }
+            })
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/commands/CommandPets.kt

@@ -7,6 +7,11 @@ import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class CommandPets(plugin: EcoPlugin) : PluginCommand(plugin, "pets", "ecopets.command.pets", true) {
+    init {
+        this.addSubcommand(CommandActivate(plugin))
+            .addSubcommand(CommandDeactivate(plugin))
+    }
+
     override fun onExecute(player: CommandSender, args: List<String>) {
         player as Player
         PetsGUI.open(player)

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/config/PetsYml.kt

@@ -1,7 +0,0 @@
-package com.willfp.ecopets.config
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.config.BaseConfig
-import com.willfp.eco.core.config.ConfigType
-
-class PetsYml(plugin: EcoPlugin) : BaseConfig("pets", plugin, false, ConfigType.YAML)

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/DiscoverRecipeListener.kt

@@ -0,0 +1,24 @@
+package com.willfp.ecopets.pets
+
+import com.willfp.eco.core.EcoPlugin
+import org.bukkit.Bukkit
+import org.bukkit.Keyed
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.inventory.Recipe
+
+class DiscoverRecipeListener(private val plugin: EcoPlugin) : Listener {
+    @EventHandler
+    fun onJoin(event: PlayerJoinEvent) {
+        if (!plugin.configYml.getBool("discover-recipes")) {
+            return
+        }
+        mutableListOf<Recipe>()
+            .apply { Bukkit.getServer().recipeIterator().forEachRemaining(this::add) }
+            .filterIsInstance<Keyed>().map { it.key }
+            .filter { it.namespace == plugin.name.lowercase() }
+            .filter { !it.key.contains("displayed") }
+            .forEach { event.player.discoverRecipe(it) }
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/Pet.kt

@@ -32,15 +32,15 @@ import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import org.bukkit.persistence.PersistentDataType
-import java.util.*
+import java.util.Objects
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 
 class Pet(
+    val id: String,
     val config: Config,
     private val plugin: EcoPetsPlugin
 ) {
-    val id = config.getString("id")
     val name = config.getFormattedString("name")
     val description = config.getFormattedString("description")
 
@@ -107,12 +107,13 @@ class Pet(
                 "${this.id}_spawn_egg",
                 egg,
                 config.getStrings("spawn-egg.recipe"),
-                config.getString("spawn-egg.recipe-permission")
+                config.getStringOrNull("spawn-egg.recipe-permission")
             )
         }
     }
 
     val entityTexture = config.getString("entity-texture")
+    val modelEngineAnimation = config.getStringOrNull("modelengine-animation")
 
     private val levelXpRequirements = listOf(0) + config.getInts("level-xp-requirements")
 
@@ -157,7 +158,8 @@ class Pet(
         trigger to PetXPGain(
             trigger,
             multiplier,
-            conditions
+            conditions,
+            it.getSubsection("filters")
         )
     }.toMap()
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetDisplay.kt

@@ -10,7 +10,7 @@ import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerQuitEvent
-import java.util.*
+import java.util.UUID
 import kotlin.math.PI
 import kotlin.math.abs
 
@@ -19,7 +19,7 @@ class PetDisplay(
 ) : Listener {
     private var tick = 0
 
-    private val trackedEntities = mutableMapOf<UUID, ArmorStand>()
+    private val trackedEntities = mutableMapOf<UUID, PetArmorStand>()
 
     fun tickAll() {
         for (player in Bukkit.getOnlinePlayers()) {
@@ -44,7 +44,19 @@ class PetDisplay(
 
             location.y += NumberUtils.fastSin(tick / (2 * PI) * 0.5) * 0.15
 
-            stand.teleport(location)
+            if (location.world != null) {
+                try {
+                    stand.teleport(location)
+                } catch (_: Throwable) {
+                    /*
+                    For anyone reading - I KNOW TO NEVER CATCH THROWABLE
+                    but NMS is really stupid and does this sometimes:
+                    java.lang.Throwable: null
+	                at net.minecraft.world.entity.Entity.teleportTo(Entity.java:3336) ~[paper-1.19.2.jar:git-Paper-186]
+	                so I guess that's what has to be done. Not sure what the actual cause is.
+                     */
+                }
+            }
 
             if (!pet.entityTexture.contains(":")) {
                 stand.setRotation((20 * tick / (2 * PI)).toFloat(), 0f)
@@ -55,15 +67,30 @@ class PetDisplay(
     private fun getLocation(player: Player): Location {
         val offset = player.eyeLocation.direction.clone().normalize()
             .multiply(-1)
-            .apply { y = abs(y) }
+            .apply {
+                y = abs(y)
+
+                if (abs(x) < 0.5) {
+                    x = 0.5
+                }
+
+                if (abs(z) < 0.5) {
+                    z = 0.5
+                }
+            }
             .rotateAroundY(PI / 6)
 
         return player.eyeLocation.clone().add(offset)
     }
 
     private fun getOrNew(player: Player): ArmorStand? {
-        val existing = trackedEntities[player.uniqueId]
+        val tracked = trackedEntities[player.uniqueId]
+        val existing = tracked?.stand
+
         val pet = player.activePet
+        if (pet != tracked?.pet) {
+            tracked?.stand?.remove()
+        }
 
         if (existing == null || existing.isDead || pet == null) {
             existing?.remove()
@@ -76,15 +103,15 @@ class PetDisplay(
             val location = getLocation(player)
             val stand = pet.makePetEntity().spawn(location)
 
-            trackedEntities[player.uniqueId] = stand
+            trackedEntities[player.uniqueId] = PetArmorStand(stand, pet)
         }
 
-        return trackedEntities[player.uniqueId]
+        return trackedEntities[player.uniqueId]?.stand
     }
 
     fun shutdown() {
         for (stand in trackedEntities.values) {
-            stand.remove()
+            stand.stand.remove()
         }
 
         trackedEntities.clear()
@@ -92,7 +119,12 @@ class PetDisplay(
 
     @EventHandler
     fun onLeave(event: PlayerQuitEvent) {
-        trackedEntities[event.player.uniqueId]?.remove()
+        trackedEntities[event.player.uniqueId]?.stand?.remove()
         trackedEntities.remove(event.player.uniqueId)
     }
+
+    private data class PetArmorStand(
+        val stand: ArmorStand,
+        val pet: Pet
+    )
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetLevelGUI.kt

@@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
 import com.willfp.eco.core.gui.slot
+import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
@@ -178,6 +179,14 @@ class PetLevelGUI(
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("level-gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    ConfigSlot(config)
+                )
+            }
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetXPGain.kt

@@ -1,7 +1,9 @@
 package com.willfp.ecopets.pets
 
+import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.libreforge.conditions.ConfiguredCondition
 import com.willfp.libreforge.events.TriggerPreProcessEvent
+import com.willfp.libreforge.filters.Filter
 import com.willfp.libreforge.triggers.Trigger
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
@@ -9,7 +11,8 @@ import org.bukkit.event.Listener
 data class PetXPGain(
     val trigger: Trigger,
     val multiplier: Double,
-    val conditions: Iterable<ConfiguredCondition>
+    val conditions: Iterable<ConfiguredCondition>,
+    val filters: Config
 )
 
 object PetTriggerXPGainListener : Listener {
@@ -18,6 +21,7 @@ object PetTriggerXPGainListener : Listener {
         val player = event.player
         val trigger = event.trigger
         val value = event.value
+        val data = event.data
 
         val pet = event.player.activePet ?: return
 
@@ -27,6 +31,10 @@ object PetTriggerXPGainListener : Listener {
             return
         }
 
+        if (!Filter.matches(data, xpGain.filters)) {
+            return
+        }
+
         player.givePetExperience(
             pet,
             value * xpGain.multiplier

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/Pets.kt

@@ -3,9 +3,11 @@ package com.willfp.ecopets.pets
 import com.google.common.collect.BiMap
 import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableList
+import com.willfp.eco.core.config.ConfigType
+import com.willfp.eco.core.config.TransientConfig
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.ecopets.EcoPetsPlugin
-import com.willfp.libreforge.chains.EffectChains
+import java.io.File
 
 object Pets {
     private val BY_ID: BiMap<String, Pet> = HashBiMap.create()
@@ -39,14 +41,18 @@ object Pets {
     @ConfigUpdater
     @JvmStatic
     fun update(plugin: EcoPetsPlugin) {
-        plugin.petsYml.getSubsections("chains").mapNotNull {
-            EffectChains.compile(it, "Effect Chains")
-        }
         for (set in values()) {
             removePet(set)
         }
-        for (petConfig in plugin.petsYml.getSubsections("pets")) {
-            addNewPet(Pet(petConfig, plugin))
+
+        val petsYml = TransientConfig(File(plugin.dataFolder, "pets.yml"), ConfigType.YAML)
+
+        for ((id, petConfig) in plugin.fetchConfigs("pets")) {
+            addNewPet(Pet(id, petConfig, plugin))
+        }
+
+        for (petConfig in petsYml.getSubsections("pets")) {
+            addNewPet(Pet(petConfig.getString("id"), petConfig, plugin))
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/PetsGUI.kt

@@ -4,6 +4,7 @@ import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
 import com.willfp.eco.core.gui.slot
+import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
@@ -13,7 +14,6 @@ import org.bukkit.Material
 import org.bukkit.Sound
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import org.checkerframework.checker.units.qual.m
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
@@ -42,8 +42,8 @@ object PetsGUI {
         val bottomRightColumn = plugin.configYml.getInt("gui.pet-area.bottom-right.column")
 
         petAreaSlots.clear()
-        for (column in topLeftColumn..bottomRightColumn) {
-            for (row in topLeftRow..bottomRightRow) {
+        for (row in topLeftRow..bottomRightRow) {
+            for (column in topLeftColumn..bottomRightColumn) {
                 petAreaSlots.add(Pair(row, column))
             }
         }
@@ -201,6 +201,14 @@ object PetsGUI {
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    ConfigSlot(config)
+                )
+            }
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/entity/ModelEnginePetEntity.kt

@@ -1,36 +1,41 @@
 package com.willfp.ecopets.pets.entity
 
 import com.ticxo.modelengine.api.ModelEngineAPI
+import com.willfp.ecopets.EcoPetsPlugin
 import com.willfp.ecopets.pets.Pet
 import org.bukkit.Location
 import org.bukkit.entity.ArmorStand
-import org.bukkit.entity.EntityType
-import org.bukkit.inventory.EquipmentSlot
 
 class ModelEnginePetEntity(
     pet: Pet,
-    private val modelID: String
+    private val modelID: String,
+    private val plugin: EcoPetsPlugin
 ) : PetEntity(pet) {
     override fun spawn(location: Location): ArmorStand {
-        val stand = location.world!!.spawnEntity(location, EntityType.ARMOR_STAND) as ArmorStand
-        stand.isVisible = false
-        stand.isInvulnerable = true
-        stand.isPersistent = true
-        stand.removeWhenFarAway = false
-        stand.isSmall = true
-        stand.setGravity(false)
-        stand.isCollidable = false
-
-        for (slot in EquipmentSlot.values()) {
-            stand.addEquipmentLock(slot, ArmorStand.LockType.ADDING_OR_CHANGING)
-        }
+        val stand = emptyArmorStandAt(location, pet)
+        val meAnimation = pet.modelEngineAnimation
 
         val model = ModelEngineAPI.createActiveModel(modelID)
-        val modelled = ModelEngineAPI.createModeledEntity(stand)
-        modelled.addActiveModel(model)
 
-        stand.isCustomNameVisible = true
-        stand.customName = pet.name
+        if (meAnimation != null) {
+            val animationHandler = model.animationHandler
+            val animationProperty = animationHandler.getAnimation(meAnimation)
+
+            if (animationProperty != null) {
+                animationHandler.playAnimation(animationProperty, true)
+            } else {
+                plugin.logger.warning("Animation $meAnimation not found in model $modelID, defaulting to walk!")
+                val animationPropertyWalk = animationHandler.getAnimation("walk")
+                if (animationPropertyWalk != null) {
+                    animationHandler.playAnimation(animationPropertyWalk, true)
+                } else {
+                    plugin.logger.warning("Walk animation not found in $modelID!")
+                }
+            }
+        }
+
+        val modelled = ModelEngineAPI.createModeledEntity(stand)
+        modelled.addModel(model, true)
 
         return stand
     }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/entity/PetEntity.kt

@@ -3,6 +3,8 @@ package com.willfp.ecopets.pets.entity
 import com.willfp.ecopets.pets.Pet
 import org.bukkit.Location
 import org.bukkit.entity.ArmorStand
+import org.bukkit.entity.EntityType
+import org.bukkit.inventory.EquipmentSlot
 
 abstract class PetEntity(
     val pet: Pet
@@ -31,3 +33,23 @@ abstract class PetEntity(
         }
     }
 }
+
+internal fun emptyArmorStandAt(location: Location, pet: Pet): ArmorStand {
+    val stand = location.world!!.spawnEntity(location, EntityType.ARMOR_STAND) as ArmorStand
+
+    stand.isVisible = false
+    stand.isInvulnerable = true
+    stand.isSmall = true
+    stand.setGravity(false)
+    stand.isCollidable = false
+    stand.isPersistent = false
+
+    for (slot in EquipmentSlot.values()) {
+        stand.addEquipmentLock(slot, ArmorStand.LockType.ADDING_OR_CHANGING)
+    }
+
+    stand.isCustomNameVisible = true
+    stand.customName = pet.name
+
+    return stand
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/pets/entity/SkullPetEntity.kt

@@ -4,35 +4,18 @@ import com.willfp.eco.core.items.builder.SkullBuilder
 import com.willfp.ecopets.pets.Pet
 import org.bukkit.Location
 import org.bukkit.entity.ArmorStand
-import org.bukkit.entity.Entity
-import org.bukkit.entity.EntityType
-import org.bukkit.inventory.EquipmentSlot
 import org.bukkit.inventory.ItemStack
 
 class SkullPetEntity(pet: Pet) : PetEntity(pet) {
     override fun spawn(location: Location): ArmorStand {
-        val newStand = location.world!!.spawnEntity(location, EntityType.ARMOR_STAND) as ArmorStand
-        newStand.isVisible = false
-        newStand.isInvulnerable = true
-        newStand.isPersistent = true
-        newStand.removeWhenFarAway = false
-        newStand.isSmall = true
-        newStand.setGravity(false)
-        newStand.isCollidable = false
-
-        for (slot in EquipmentSlot.values()) {
-            newStand.addEquipmentLock(slot, ArmorStand.LockType.ADDING_OR_CHANGING)
-        }
-
+        val stand = emptyArmorStandAt(location, pet)
 
         val skull: ItemStack = SkullBuilder()
             .setSkullTexture(pet.entityTexture)
             .build()
 
-        newStand.equipment?.helmet = skull
-        newStand.isCustomNameVisible = true
-        newStand.customName = pet.name
+        stand.equipment?.helmet = skull
 
-        return newStand
+        return stand
     }
 }

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

@@ -0,0 +1,21 @@
+# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains
+
+chains:
+  - id: example_chain
+    effects:
+      - id: teleport
+      - id: potion_effect
+        args:
+          effect: blindness
+          level: 3
+          duration: 30
+          apply_to_player: true
+      - id: send_message
+        args:
+          message: "&fYou have been teleported!"
+          action_bar: true
+      - id: play_sound
+        args:
+          sound: entity_dragon_fireball_explode
+          pitch: 1.5
+          volume: 4

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

@@ -3,6 +3,8 @@
 # by Auxilor
 #
 
+discover-recipes: true
+
 gui:
   rows: 6
 
@@ -114,6 +116,9 @@ gui:
       row: 6
       column: 2
 
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  custom-slots: [ ]
+
 level-gui:
   rows: 6
 
@@ -208,6 +213,9 @@ level-gui:
       row: 6
       column: 5
 
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  custom-slots: [ ]
+
 pet-entity:
   name: "%player%&f's %pet%&f (Lvl. %level%)"
 
@@ -255,7 +263,6 @@ point-names: # If you have point names that look ugly (eg g_souls) then you can
 
 use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
 raytrace-distance: 80 # The distance that alt_click should check for a location
-block-item-drop-place-check: true # If the block_item_drop trigger should only fire on naturally placed blocks (prevents dupes)
 
 potions:
   icon:

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

@@ -21,6 +21,17 @@ messages:
   gave-pet-egg: "&fSuccessfully gave %player%&f the %pet%&f pet egg!"
   cannot-spawn-pet: "&cYou already have this pet unlocked!"
   invalid-amount: "&cInvalid amount!"
+  pet-already-active: "&cYou already have this pet active!"
+  no-pet-active: "&cYou don't have a pet active!"
+  activated-pet: "&fYou have activated the %pet%&f pet!"
+  deactivated-pet: "&fYou have deactivated the %pet%&f pet!"
+  must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
+  lrcdb-import-error: "&cError importing config: &f%message%"
+  lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
+  must-specify-config-name: "&cYou must specify the config name!"
+  invalid-config-name: "&cInvalid config name!"
+  lrcdb-export-error: "&cError exporting config: &f%message%"
+  lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
 
 menu:
   title: "Pets"

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

@@ -0,0 +1,19 @@
+# Options for lrcdb (https://lrcdb.auxilor.io), a website to share configs
+# with other server owners, so you can get more configs without making them
+# yourself!
+
+author: "Unknown Author" # The name attached to configs you export
+
+# Options about automatically sharing configs you create
+share-configs:
+  # If you want all your configs to automatically be publicly available,
+  # set this to true. This really helps out other users!
+  publicly: false
+
+  # If you don't want your configs to be usable to gather information about
+  # plugin usage or to improve the plugins in the future, disable this.
+  # Nothing identifying is shared.
+  enabled: true
+
+# If you disable share-configs, you can still share select configs publicly
+# with /ecopets export <config>.

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

@@ -1,338 +0,0 @@
-pets:
-  - id: tiger
-
-    # The display name of the pet
-    name: "&6Tiger"
-
-    # The description of the pet
-    description: "&8&oLevel up by dealing melee damage"
-
-    # The xp requirements for each pet level - add new levels by adding more to this list
-    level-xp-requirements:
-      - 50
-      - 125
-      - 200
-      - 300
-      - 500
-      - 750
-      - 1000
-      - 1500
-      - 2000
-      - 3500
-      - 5000
-      - 7500
-      - 10000
-      - 15000
-      - 20000
-      - 30000
-      - 50000
-      - 75000
-      - 100000
-      - 200000
-      - 300000
-      - 400000
-      - 500000
-      - 600000
-      - 700000
-      - 800000
-      - 900000
-      - 1000000
-      - 1100000
-      - 1200000
-      - 1300000
-      - 1400000
-      - 1500000
-      - 1600000
-      - 1700000
-      - 1800000
-      - 1900000
-      - 2000000
-      - 2100000
-      - 2200000
-      - 2300000
-      - 2400000
-      - 2500000
-      - 2600000
-      - 2750000
-      - 2900000
-      - 3100000
-      - 3400000
-      - 3700000
-
-    # An XP Gain method takes a trigger as the ID and a multiplier
-    # The multiplier takes the value produced by the trigger and multiplies it
-    # by some value to calculate the experience that should be given
-    xp-gain-methods:
-      - id: melee_attack
-        multiplier: 0.5
-        conditions: [ ] # You can add a list of conditions that must be met on xp gain
-
-    # Custom placeholders to be used in descriptions,
-    # Don't add % to the IDs, this is done automatically
-    # The value takes a %level% placeholder and is a mathetmatical expression
-    level-placeholders:
-      - id: "damage_multiplier"
-        value: "%level%"
-
-    # The text shown with the %effects% placeholder
-    # The number dictates the minimum level for this text to show for
-    # Adding new levels will override this text on those levels or above
-    effects-description:
-      1:
-        - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
-        - "   &8melee damage"
-
-    # Same as above, but for %rewards%
-    rewards-description:
-      1:
-        - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
-        - "   &8melee damage"
-
-    # Same as above, but for %level_up_messages%
-    level-up-messages:
-      1:
-        - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
-        - "   &8melee damage"
-
-    # Commands to be sent on levelup, can be formatted two ways:
-    # level:command (e.g. 10:eco give %player% 1000), which would execute that command for level 10
-    # command (e.g. eco give %player% 5000), which would execute that command for all levels
-    level-commands: [ ]
-
-    # The effects for the pet, has %level% as a placeholder
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: "%level% * 0.01 + 1"
-        triggers:
-          - melee_attack
-
-    # The conditions for the pet, also has %level% as a placeholder
-    conditions: [ ]
-
-    # The texture of the pet entity in game
-    # If you're using modelengine, use modelengine:id as the texture
-    entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0="
-
-    # The icon in GUIs
-    icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0=
-
-    # The spawn egg
-    spawn-egg:
-      enabled: true # If the pet should have a spawn egg
-      item: blaze_spawn_egg unbreaking:1 hide_enchants
-      name: "&6Tiger&f Pet Spawn Egg"
-      lore:
-        - ""
-        - "&8&oPlace on the ground to"
-        - "&8&ounlock the &r&6Tiger&8&o pet!"
-      craftable: false
-      recipe: [ ]
-      # recipe-permission: ecopets.craft.tiger
-
-  - id: skeleton
-    name: "<gradient:#F2F2F2>Skeleton</gradient:#DBDBDB>"
-    description: "&8&oLevel up by dealing bow damage"
-
-    level-xp-requirements:
-      - 50
-      - 125
-      - 200
-      - 300
-      - 500
-      - 750
-      - 1000
-      - 1500
-      - 2000
-      - 3500
-      - 5000
-      - 7500
-      - 10000
-      - 15000
-      - 20000
-      - 30000
-      - 50000
-      - 75000
-      - 100000
-      - 200000
-      - 300000
-      - 400000
-      - 500000
-      - 600000
-      - 700000
-      - 800000
-      - 900000
-      - 1000000
-      - 1100000
-      - 1200000
-      - 1300000
-      - 1400000
-      - 1500000
-      - 1600000
-      - 1700000
-      - 1800000
-      - 1900000
-      - 2000000
-      - 2100000
-      - 2200000
-      - 2300000
-      - 2400000
-      - 2500000
-      - 2600000
-      - 2750000
-      - 2900000
-      - 3100000
-      - 3400000
-      - 3700000
-
-    xp-gain-methods:
-      - id: bow_attack
-        multiplier: 0.5
-
-    level-placeholders:
-      - id: "damage_multiplier"
-        value: "%level%"
-
-    effects-description:
-      1:
-        - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
-        - "   &8bow damage"
-
-    rewards-description:
-      1:
-        - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
-        - "   &8bow damage"
-
-    level-up-messages:
-      1:
-        - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
-        - "   &8bow damage"
-
-    level-commands: [ ]
-
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: "%level% * 0.01 + 1"
-        triggers:
-          - bow_attack
-    conditions: [ ]
-
-    entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ0NmViNjQyZGMzYTRkZmJiNWFkNTI5N2VkYWUyOTk2ZWE0Y2ZmZjkyYWMyZWI1NmRmYWU5ZWUxZDU4ZTQwOCJ9fX0="
-
-    icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ0NmViNjQyZGMzYTRkZmJiNWFkNTI5N2VkYWUyOTk2ZWE0Y2ZmZjkyYWMyZWI1NmRmYWU5ZWUxZDU4ZTQwOCJ9fX0=
-
-    spawn-egg:
-      enabled: true # If the pet should have a spawn egg
-      item: skeleton_spawn_egg unbreaking:1 hide_enchants
-      name: "<gradient:#F2F2F2>Skeleton</gradient:#DBDBDB>&f Pet Spawn Egg"
-      lore:
-        - ""
-        - "&8&oPlace on the ground to"
-        - "&8&ounlock the &r<gradient:#F2F2F2>Skeleton</gradient:#DBDBDB>&8&o pet!"
-      craftable: false
-      recipe: [ ]
-
-  - id: ravager
-    name: "<gradient:#1e3c72>Ravager</gradient:#2a5298>"
-    description: "&8&oLevel up by successfully defending against village raids"
-
-    level-xp-requirements:
-      - 50
-      - 150
-      - 300
-      - 500
-      - 750
-      - 1000
-      - 1300
-      - 1650
-      - 2050
-      - 2500
-      - 3000
-      - 3550
-      - 4150
-      - 4800
-      - 5500
-      - 6250
-      - 7050
-      - 7900
-      - 8800
-      - 9750
-      - 10750
-      - 11800
-      - 12900
-      - 14050
-      - 15250
-      - 16500
-      - 17800
-      - 19150
-      - 20550
-      - 22000
-      - 23500
-      - 25050
-      - 26650
-      - 28300
-      - 30000
-      - 31750
-      - 33550
-      - 35400
-      - 37300
-      - 39250
-      - 41250
-      - 43300
-      - 45400
-      - 47550
-      - 49700
-      - 51950
-      - 53250
-      - 55600
-      - 57000
-
-    xp-gain-methods:
-      - id: potion_effect
-        conditions:
-          - id: has_potion_effect
-            args:
-              effect: hero_of_the_village
-        multiplier: 50
-
-    level-placeholders:
-      - id: "health_boost"
-        value: "%level%"
-
-    effects-description:
-      1:
-        - "&8» &8Gives a &a+%health_boost%%&8 bonus"
-
-    rewards-description:
-      1:
-        - "&8» &8Gives a &a+%health_boost%%&8 bonus"
-
-    level-up-messages:
-      1:
-        - "&8» &8Gives a &a+%health_boost%%&8 bonus"
-
-    level-commands: [ ]
-
-    effects:
-      - id: potion_effect
-        args:
-          effect: health_boost
-          level: "%level%"
-
-    conditions: [ ]
-
-    entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2QyMGJmNTJlYzM5MGEwNzk5Mjk5MTg0ZmM2NzhiZjg0Y2Y3MzJiYjFiZDc4ZmQxYzRiNDQxODU4ZjAyMzVhOCJ9fX0="
-
-    icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2QyMGJmNTJlYzM5MGEwNzk5Mjk5MTg0ZmM2NzhiZjg0Y2Y3MzJiYjFiZDc4ZmQxYzRiNDQxODU4ZjAyMzVhOCJ9fX0=
-
-    spawn-egg:
-      enabled: true
-      item: ravager_spawn_egg unbreaking:1 hide_enchants
-      name: "<gradient:#1e3c72>Ravager</gradient:#2a5298>&f Pet Spawn Egg"
-      lore:
-        - ""
-        - "&8&oPlace on the ground to"
-        - "&8&ounlock the &r<gradient:#1e3c72>Ravager</gradient:#2a5298>&8&o pet!"
-      craftable: false
-      recipe: [ ]

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

@@ -0,0 +1,135 @@
+# The ID of the pet is the name of the .yml file,
+# for example vampire.yml has the ID of vampire
+# You can place pets anywhere in this folder,
+# including in subfolders if you want to organize your pet configs
+# _example.yml is not loaded.
+
+# The display name of the pet
+name: "&6Tiger"
+
+# The description of the pet
+description: "&8&oLevel up by dealing melee damage"
+
+# The xp requirements for each pet level - add new levels by adding more to this list
+level-xp-requirements:
+  - 50
+  - 125
+  - 200
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1500
+  - 2000
+  - 3500
+  - 5000
+  - 7500
+  - 10000
+  - 15000
+  - 20000
+  - 30000
+  - 50000
+  - 75000
+  - 100000
+  - 200000
+  - 300000
+  - 400000
+  - 500000
+  - 600000
+  - 700000
+  - 800000
+  - 900000
+  - 1000000
+  - 1100000
+  - 1200000
+  - 1300000
+  - 1400000
+  - 1500000
+  - 1600000
+  - 1700000
+  - 1800000
+  - 1900000
+  - 2000000
+  - 2100000
+  - 2200000
+  - 2300000
+  - 2400000
+  - 2500000
+  - 2600000
+  - 2750000
+  - 2900000
+  - 3100000
+  - 3400000
+  - 3700000
+
+# An XP Gain method takes a trigger as the ID and a multiplier
+# The multiplier takes the value produced by the trigger and multiplies it
+# by some value to calculate the experience that should be given
+xp-gain-methods:
+  - id: melee_attack
+    multiplier: 0.5
+    conditions: [ ] # You can add a list of conditions that must be met on xp gain
+
+# Custom placeholders to be used in descriptions,
+# Don't add % to the IDs, this is done automatically
+# The value takes a %level% placeholder and is a mathetmatical expression
+level-placeholders:
+  - id: "damage_multiplier"
+    value: "%level%"
+
+# The text shown with the %effects% placeholder
+# The number dictates the minimum level for this text to show for
+# Adding new levels will override this text on those levels or above
+effects-description:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8melee damage"
+
+# Same as above, but for %rewards%
+rewards-description:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8melee damage"
+
+# Same as above, but for %level_up_messages%
+level-up-messages:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8melee damage"
+
+# Commands to be sent on levelup, can be formatted two ways:
+# level:command (e.g. 10:eco give %player% 1000), which would execute that command for level 10
+# command (e.g. eco give %player% 5000), which would execute that command for all levels
+level-commands: [ ]
+
+# The effects for the pet, has %level% as a placeholder
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "%level% * 0.01 + 1"
+    triggers:
+      - melee_attack
+
+# The conditions for the pet, also has %level% as a placeholder
+conditions: [ ]
+
+# The texture of the pet entity in game
+# If you're using modelengine, use modelengine:id as the texture
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0="
+modelengine-animation: "fly" # If you're using ModelEngine, you can specify an animation here
+
+# The icon in GUIs
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0=
+
+# The spawn egg
+spawn-egg:
+  enabled: true # If the pet should have a spawn egg
+  item: blaze_spawn_egg unbreaking:1 hide_enchants
+  name: "&6Tiger&f Pet Spawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &r&6Tiger&8&o pet!"
+  craftable: false
+  recipe: [ ]
+  # recipe-permission: ecopets.craft.tiger

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

@@ -0,0 +1,81 @@
+name: "&#FF6600Blaze"
+description: "&7Earn more XP from killing mobs"
+level-xp-requirements:
+  - 50
+  - 125
+  - 200
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1500
+  - 2000
+  - 3500
+  - 5000
+  - 7500
+  - 10000
+  - 15000
+  - 20000
+  - 30000
+  - 50000
+  - 75000
+  - 100000
+  - 200000
+  - 300000
+  - 400000
+  - 500000
+  - 600000
+  - 700000
+  - 800000
+  - 900000
+  - 1000000
+  - 1100000
+  - 1200000
+  - 1300000
+  - 1400000
+  - 1500000
+  - 1600000
+  - 1700000
+  - 1800000
+  - 1900000
+  - 2000000
+  - 2100000
+  - 2200000
+  - 2300000
+  - 2400000
+  - 2500000
+  - 2600000
+  - 2750000
+  - 2900000
+  - 3100000
+  - 3400000
+  - 3700000
+xp-gain-methods:
+  - id: kill
+    multiplier: 1
+level-placeholders:
+  - id: "xp_multiplier"
+    value: "%level% * 2"
+effects-description:
+  1:
+    - "&6» &7Increased XP gain by %xp_multiplier%%!"
+rewards-description: []
+level-up-messages: []
+level-commands: []
+effects:
+  - id: xp_multiplier
+    args:
+      multiplier: "%level% * 0.02 + 1"
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjIwNjU3ZTI0YjU2ZTFiMmY4ZmMyMTlkYTFkZTc4OGMwYzI0ZjM2Mzg4YjFhNDA5ZDBjZDJkOGRiYTQ0YWEzYiJ9fX0="
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjIwNjU3ZTI0YjU2ZTFiMmY4ZmMyMTlkYTFkZTc4OGMwYzI0ZjM2Mzg4YjFhNDA5ZDBjZDJkOGRiYTQ0YWEzYiJ9fX0=
+spawn-egg:
+  enabled: true # If the pet should have a spawn egg
+  item: blaze_spawn_egg unbreaking:1 hide_enchants
+  name: "&#FF6600Blaze &fSpawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &#FF6600Blaze pet!"
+  craftable: false
+  recipe: []
+  recipe-permission: ecopets.craft.blaze

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

@@ -0,0 +1,104 @@
+name: "&6Mancubus"
+description: "&8&oLevel up by taking damage while on fire"
+
+level-xp-requirements:
+  - 50
+  - 125
+  - 200
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1500
+  - 2000
+  - 3500
+  - 5000
+  - 7500
+  - 10000
+  - 15000
+  - 20000
+  - 30000
+  - 50000
+  - 75000
+  - 100000
+  - 200000
+  - 300000
+  - 400000
+  - 500000
+  - 600000
+  - 700000
+  - 800000
+  - 900000
+  - 1000000
+  - 1100000
+  - 1200000
+  - 1300000
+  - 1400000
+  - 1500000
+  - 1600000
+  - 1700000
+  - 1800000
+  - 1900000
+  - 2000000
+  - 2100000
+  - 2200000
+  - 2300000
+  - 2400000
+  - 2500000
+  - 2600000
+  - 2750000
+  - 2900000
+  - 3100000
+  - 3400000
+  - 3700000
+
+xp-gain-methods:
+  - id: take_damage
+    multiplier: 0.5
+    conditions:
+      - id: on_fire
+
+level-placeholders:
+  - id: "ignite_chance"
+    value: "1 - (%level% / 100)"
+
+effects-description:
+  1:
+    - "&8» &8Gives a &a+%ignite_chance%%&8 chance to set enemy on fire"
+
+rewards-description:
+  1:
+    - "&8» &8Gives a &a+%ignite_chance%%&8 chance to set enemy on fire"
+
+level-up-messages:
+  1:
+    - "&8» &8Gives a &a+%ignite_chance%%&8 chance to set enemy on fire"
+
+level-commands: [ ]
+
+effects:
+  - id: ignite
+    args:
+      damage_per_tick: 8
+      ticks: 300
+      chance: "%level%"
+    triggers:
+      - melee_attack
+
+conditions: [ ]
+
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0="
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0=
+
+spawn-egg:
+  enabled: true # If the pet should have a spawn egg
+  item: magma_cube_spawn_egg unbreaking:1 hide_enchants
+  name: "&6Mancubus&f Spawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &r&6Mancubus&8&o pet!"
+  craftable: false
+  recipe: [ ]
+  # recipe-permission: ecopets.craft.mancubus

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

@@ -0,0 +1,97 @@
+name: "<gradient:#1e3c72>Ravager</gradient:#2a5298>"
+description: "&8&oLevel up by successfully defending against village raids"
+
+level-xp-requirements:
+  - 50
+  - 150
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1300
+  - 1650
+  - 2050
+  - 2500
+  - 3000
+  - 3550
+  - 4150
+  - 4800
+  - 5500
+  - 6250
+  - 7050
+  - 7900
+  - 8800
+  - 9750
+  - 10750
+  - 11800
+  - 12900
+  - 14050
+  - 15250
+  - 16500
+  - 17800
+  - 19150
+  - 20550
+  - 22000
+  - 23500
+  - 25050
+  - 26650
+  - 28300
+  - 30000
+  - 31750
+  - 33550
+  - 35400
+  - 37300
+  - 39250
+  - 41250
+  - 43300
+  - 45400
+  - 47550
+  - 49700
+  - 51950
+  - 53250
+  - 55600
+  - 57000
+
+xp-gain-methods:
+  - id: win_raid
+    multiplier: 50
+
+level-placeholders:
+  - id: "health_boost"
+    value: "%level%"
+
+effects-description:
+  1:
+    - "&8» &8Gives a &a+%health_boost%%&8 bonus"
+
+rewards-description:
+  1:
+    - "&8» &8Gives a &a+%health_boost%%&8 bonus"
+
+level-up-messages:
+  1:
+    - "&8» &8Gives a &a+%health_boost%%&8 bonus"
+
+level-commands: [ ]
+
+effects:
+  - id: bonus_health
+    args:
+      health: "%level%"
+
+conditions: [ ]
+
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2QyMGJmNTJlYzM5MGEwNzk5Mjk5MTg0ZmM2NzhiZjg0Y2Y3MzJiYjFiZDc4ZmQxYzRiNDQxODU4ZjAyMzVhOCJ9fX0="
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2QyMGJmNTJlYzM5MGEwNzk5Mjk5MTg0ZmM2NzhiZjg0Y2Y3MzJiYjFiZDc4ZmQxYzRiNDQxODU4ZjAyMzVhOCJ9fX0=
+
+spawn-egg:
+  enabled: true
+  item: ravager_spawn_egg unbreaking:1 hide_enchants
+  name: "<gradient:#1e3c72>Ravager</gradient:#2a5298>&f Pet Spawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &r<gradient:#1e3c72>Ravager</gradient:#2a5298>&8&o pet!"
+  craftable: false
+  recipe: [ ]

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

@@ -0,0 +1,120 @@
+name: "&9Sea Serpent"
+description: "&8&oIncrease swimming speed and damage in water. Level up by swimming"
+
+level-xp-requirements:
+  - 50
+  - 125
+  - 200
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1500
+  - 2000
+  - 3500
+  - 5000
+  - 7500
+  - 10000
+  - 15000
+  - 20000
+  - 30000
+  - 50000
+  - 75000
+  - 100000
+  - 200000
+  - 300000
+  - 400000
+  - 500000
+  - 600000
+  - 700000
+  - 800000
+  - 900000
+  - 1000000
+  - 1100000
+  - 1200000
+  - 1300000
+  - 1400000
+  - 1500000
+  - 1600000
+  - 1700000
+  - 1800000
+  - 1900000
+  - 2000000
+  - 2100000
+  - 2200000
+  - 2300000
+  - 2400000
+  - 2500000
+  - 2600000
+  - 2750000
+  - 2900000
+  - 3100000
+  - 3400000
+  - 3700000
+  - 4000000
+  - 4500000
+
+xp-gain-methods:
+  - id: move
+    multiplier: 0.5
+    conditions:
+      - id: is_sprinting
+      - id: in_water
+
+level-placeholders:
+  - id: "multiplier"
+    value: "%level%"
+
+effects-description:
+  1:
+    - "&8» &8Gives a &a+%multiplier%%&8 bonus to"
+    - "   &8melee damage when in water"
+  2:
+    - "&8» &8Gives a &a+%multiply_velocity%%&8 bonus to"
+    - "   &8movement speed when in water"
+
+rewards-description:
+  1:
+    - "&8» &8Gives a &a+%multiplier%%&8 bonus to"
+    - "   &8melee damage when in water"
+  2:
+    - "&8» &8Gives a &a+%multiply_velocity%%&8 bonus to"
+    - "   &8movement speed when in water"
+
+level-up-messages:
+  1:
+    - "&8» &8Gives a &a+%multiplier%%&8 bonus to"
+    - "   &8melee damage when in water"
+  2:
+    - "&8» &8Gives a &a+%multiply_velocity%%&8 bonus to"
+    - "   &8movement speed when in water"
+
+level-commands: [ ]
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "%level% * 0.01 + 1"
+    triggers:
+      - melee_attack
+  - id: movement_speed_multiplier
+    args:
+      multiplier: "%level% * 1.3 + 1"
+
+conditions:
+  - id: in_water
+
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0="
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0=
+
+spawn-egg:
+  enabled: true # If the pet should have a spawn egg
+  item: drowned_spawn_egg unbreaking:1 hide_enchants
+  name: "&9Sea Serpent&f Spawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &r&9Sea Serpent&8&o pet!"
+  craftable: false
+  recipe: [ ]

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

@@ -0,0 +1,101 @@
+name: "<gradient:#F2F2F2>Skeleton</gradient:#DBDBDB>"
+description: "&8&oLevel up by dealing bow damage"
+
+level-xp-requirements:
+  - 50
+  - 125
+  - 200
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1500
+  - 2000
+  - 3500
+  - 5000
+  - 7500
+  - 10000
+  - 15000
+  - 20000
+  - 30000
+  - 50000
+  - 75000
+  - 100000
+  - 200000
+  - 300000
+  - 400000
+  - 500000
+  - 600000
+  - 700000
+  - 800000
+  - 900000
+  - 1000000
+  - 1100000
+  - 1200000
+  - 1300000
+  - 1400000
+  - 1500000
+  - 1600000
+  - 1700000
+  - 1800000
+  - 1900000
+  - 2000000
+  - 2100000
+  - 2200000
+  - 2300000
+  - 2400000
+  - 2500000
+  - 2600000
+  - 2750000
+  - 2900000
+  - 3100000
+  - 3400000
+  - 3700000
+
+xp-gain-methods:
+  - id: bow_attack
+    multiplier: 0.5
+
+level-placeholders:
+  - id: "damage_multiplier"
+    value: "%level%"
+
+effects-description:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8bow damage"
+
+rewards-description:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8bow damage"
+
+level-up-messages:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8bow damage"
+
+level-commands: [ ]
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "%level% * 0.01 + 1"
+    triggers:
+      - bow_attack
+conditions: [ ]
+
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ0NmViNjQyZGMzYTRkZmJiNWFkNTI5N2VkYWUyOTk2ZWE0Y2ZmZjkyYWMyZWI1NmRmYWU5ZWUxZDU4ZTQwOCJ9fX0="
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ0NmViNjQyZGMzYTRkZmJiNWFkNTI5N2VkYWUyOTk2ZWE0Y2ZmZjkyYWMyZWI1NmRmYWU5ZWUxZDU4ZTQwOCJ9fX0=
+
+spawn-egg:
+  enabled: true # If the pet should have a spawn egg
+  item: skeleton_spawn_egg unbreaking:1 hide_enchants
+  name: "<gradient:#F2F2F2>Skeleton</gradient:#DBDBDB>&f Pet Spawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &r<gradient:#F2F2F2>Skeleton</gradient:#DBDBDB>&8&o pet!"
+  craftable: false
+  recipe: [ ]

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

@@ -0,0 +1,103 @@
+name: "&6Tiger"
+description: "&8&oLevel up by dealing melee damage"
+
+level-xp-requirements:
+  - 50
+  - 125
+  - 200
+  - 300
+  - 500
+  - 750
+  - 1000
+  - 1500
+  - 2000
+  - 3500
+  - 5000
+  - 7500
+  - 10000
+  - 15000
+  - 20000
+  - 30000
+  - 50000
+  - 75000
+  - 100000
+  - 200000
+  - 300000
+  - 400000
+  - 500000
+  - 600000
+  - 700000
+  - 800000
+  - 900000
+  - 1000000
+  - 1100000
+  - 1200000
+  - 1300000
+  - 1400000
+  - 1500000
+  - 1600000
+  - 1700000
+  - 1800000
+  - 1900000
+  - 2000000
+  - 2100000
+  - 2200000
+  - 2300000
+  - 2400000
+  - 2500000
+  - 2600000
+  - 2750000
+  - 2900000
+  - 3100000
+  - 3400000
+  - 3700000
+
+xp-gain-methods:
+  - id: melee_attack
+    multiplier: 0.5
+    conditions: [ ]
+
+level-placeholders:
+  - id: "damage_multiplier"
+    value: "%level%"
+
+effects-description:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8melee damage"
+
+rewards-description:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8melee damage"
+
+level-up-messages:
+  1:
+    - "&8» &8Gives a &a+%damage_multiplier%%&8 bonus to"
+    - "   &8melee damage"
+
+level-commands: [ ]
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "%level% * 0.01 + 1"
+    triggers:
+      - melee_attack
+
+conditions: [ ]
+
+entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0="
+
+icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0=
+
+spawn-egg:
+  enabled: true
+  item: blaze_spawn_egg unbreaking:1 hide_enchants
+  name: "&6Tiger&f Pet Spawn Egg"
+  lore:
+    - ""
+    - "&8&oPlace on the ground to"
+    - "&8&ounlock the &r&6Tiger&8&o pet!"
+  craftable: false
+  recipe: [ ]

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

@@ -0,0 +1,160 @@
+  name: "<gradient:#A50000>Vampire</gradient:#FD2424>"
+  description: "&8&oLevel up by taking damage at night."
+
+  level-xp-requirements:
+    - 50
+    - 75
+    - 100
+    - 150
+    - 200
+    - 300
+    - 400
+    - 500
+    - 750
+    - 1000
+    - 1300
+    - 1500
+    - 1750
+    - 2000
+    - 2300
+    - 2500
+    - 3000
+    - 3500
+    - 4000
+    - 4500
+    - 5000
+    - 6000
+    - 8000
+    - 10000
+    - 12000
+    - 15000
+    - 20000
+    - 25000
+    - 30000
+    - 35000
+    - 40000
+    - 44500
+    - 50000
+    - 57000
+    - 64000
+    - 71000
+    - 78000
+    - 80000
+    - 85000
+    - 90000
+    - 95000
+    - 100000
+    - 110000
+    - 115000
+    - 120000
+    - 125000
+    - 150000
+    - 175000
+    - 200000
+
+  xp-gain-methods:
+    - id: take_damage
+      multiplier: 10.0
+      conditions:
+        - id: is_night
+
+
+  level-placeholders:
+    - id: "lifesteal_chance"
+      value: "%level%"
+    - id: "lifesteal_cooldown"
+      value: "1-(%level%/200)"
+    - id: "lifesteal_heal"
+      value: "%level%/20"
+    - id: "bleed_damage"
+      value: "(%level%-15)/10"
+    - id: "bleed_chance"
+      value: "%level%-10"
+
+  effects-description:
+    1:
+      - "&8» &#ff0000This pet can ONLY be levelled at night."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance%% &7to gain"
+      - "    &7health from your enemy. Has a &#ff0000%lifesteal_cooldown% &7second cooldown."
+    25:
+      - "&8» &#ff0000This pet can ONLY be levelled at night."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance%% &7to gain"
+      - "    &7health from your enemy. Has a &#ff0000%lifesteal_cooldown% &7second cooldown."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%bleed_chance%% &7to bleed"
+      - "    &7your enemies dealing &#ff0000%bleed_damage%&7 damage twice."
+
+  rewards-description:
+    1:
+      - "&8» &#ff0000This pet can ONLY be levelled at night."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance%% &7to gain &ff0000%lifesteal_heal%"
+      - "    &7health from your enemy. Has a &#ff0000%lifesteal_cooldown% &7second cooldown."
+    25:
+      - "&8» &#ff0000This pet can ONLY be levelled at night."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance%% &7to gain"
+      - "    &7health from your enemy. Has a &#ff0000%lifesteal_cooldown% &7second cooldown."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%bleed_chance%% &7to bleed"
+      - "    &7your enemies dealing &#ff0000%bleed_damage%&7 damage twice."
+
+  level-up-messages:
+    1:
+      - "&8» &#ff0000This pet can ONLY be levelled at night."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance%% &7to gain"
+      - "    &7health from your enemy. Has a &#ff0000%lifesteal_cooldown% &7second cooldown."
+    25:
+      - "&8» &#ff0000This pet can ONLY be levelled at night."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance%% &7to gain"
+      - "    &7health from your enemy. Has a &#ff0000%lifesteal_cooldown% &7second cooldown."
+      - ""
+      - "&8» &7When hitting enemies have a &#ff0000%bleed_chance%% &7to bleed"
+      - "    &7your enemies dealing &#ff0000%bleed_damage%&7 damage twice."
+
+  level-commands: [ ]
+
+  effects:
+    - id: give_health
+      args:
+        chance: "%level%"
+        cooldown: "1-(%level%/200)"
+        send_cooldown_message: false
+        amount: "%level%/20"
+      triggers:
+        - melee_attack
+
+    - id: bleed
+      args:
+        chance: "%level%-10"
+        damage: "(%level%-15)/10"
+        interval: 15
+        amount: 2
+      conditions:
+        - id: has_pet_level
+          args:
+            pet: vampire
+            level: 25
+      triggers:
+        - melee_attack
+
+  conditions: []
+
+  entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzgyMGExMGRiMjIyZjY5YWMyMjE1ZDdkMTBkY2E0N2VlYWZhMjE1NTUzNzY0YTJiODFiYWZkNDc5ZTc5MzNkMSJ9fX0="
+
+  icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzgyMGExMGRiMjIyZjY5YWMyMjE1ZDdkMTBkY2E0N2VlYWZhMjE1NTUzNzY0YTJiODFiYWZkNDc5ZTc5MzNkMSJ9fX0=
+
+  spawn-egg:
+    enabled: true
+    item: bat_spawn_egg unbreaking:2 hide_enchants
+    name: "<gradient:#A50000>Vampire</gradient:#FD2424>&f Pet Spawn Egg"
+    lore:
+      - ""
+      - "&8&oPlace on the ground to"
+      - "&8&ounlock the &r<gradient:#A50000>Vampire</gradient:#FD2424>&8&o pet!"
+    craftable: false
+    recipe: [ ]

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

@@ -32,7 +32,8 @@ commands:
     aliases:
       - pet
     description: Open the pets menu
-    permission: ecopets.command.skills
+    permission: ecopets.command.pets
+    default: true
 
 permissions:
   ecopets.*:
@@ -51,6 +52,10 @@ permissions:
       ecopets.command.giveegg: true
       ecopets.command.givexp: true
       ecopets.command.reset: true
+      ecopets.command.activate: true
+      ecopets.command.deactivate: true
+      ecopets.command.import: true
+      ecopets.command.export: true
 
   ecopets.command.reload:
     description: Allows reloading the config
@@ -73,6 +78,18 @@ permissions:
   ecopets.command.reset:
     description: Allows the use of /ecopets reset.
     default: op
+  ecopets.command.import:
+    description: Allows the use of /ecopets import.
+    default: op
+  ecopets.command.export:
+    description: Allows the use of /ecopets export.
+    default: op
+  ecopets.command.activate:
+    description: Allows the use of /pets activate.
+    default: true
+  ecopets.command.deactivate:
+    description: Allows the use of /pets deactivate.
+    default: true
 
   ecopets.xpmultiplier.50percent:
     description: Gives the player 50% more skill experience

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Sun Jun 19 12:18:45 BST 2022
-version=1.3.0
+#Tue Oct 18 14:15:28 BST 2022
+version=1.52.0
 plugin-name=EcoPets