libreforge-updater

Add total_pets placeholder, `has_pet` condition and fix `has_active_pet`

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @WillFP

eco-core/core-plugin/build.gradle.kts

@@ -3,7 +3,7 @@ version = rootProject.version
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
-    compileOnly("com.ticxo.modelengine:api:R3.1.5")
+    compileOnly("com.ticxo.modelengine:api:R3.1.8")
     compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.2")
 
     implementation("com.willfp:ecomponent:1.3.0")

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

@@ -6,6 +6,7 @@ import com.willfp.eco.core.placeholder.PlayerPlaceholder
 import com.willfp.ecopets.commands.CommandEcoPets
 import com.willfp.ecopets.commands.CommandPets
 import com.willfp.ecopets.libreforge.ConditionHasActivePet
+import com.willfp.ecopets.libreforge.ConditionHasPet
 import com.willfp.ecopets.libreforge.ConditionHasPetLevel
 import com.willfp.ecopets.libreforge.EffectGivePetXp
 import com.willfp.ecopets.libreforge.EffectPetXpMultiplier
@@ -19,6 +20,7 @@ import com.willfp.ecopets.pets.Pets
 import com.willfp.ecopets.pets.SpawnEggHandler
 import com.willfp.ecopets.pets.activePet
 import com.willfp.ecopets.pets.activePetLevel
+import com.willfp.ecopets.pets.hasPet
 import com.willfp.ecopets.pets.entity.ModelEnginePetEntity
 import com.willfp.ecopets.pets.entity.PetEntity
 import com.willfp.libreforge.SimpleProvidedHolder
@@ -47,6 +49,7 @@ class EcoPetsPlugin : LibreforgePlugin() {
     override fun handleEnable() {
         Conditions.register(ConditionHasPetLevel)
         Conditions.register(ConditionHasActivePet)
+        Conditions.register(ConditionHasPet)
         Effects.register(EffectPetXpMultiplier)
         Effects.register(EffectGivePetXp)
         Triggers.register(TriggerGainPetXp)
@@ -68,6 +71,18 @@ class EcoPetsPlugin : LibreforgePlugin() {
             this,
             "pet_id"
         ) { it.activePet?.id ?: "" }.register()
+
+        PlayerPlaceholder(
+            this,
+            "total_pets"
+        ) {
+            var pets = 0
+            for (pet in Pets.values()) {
+                if (it.hasPet(pet))
+                    pets++
+            }
+            pets.toString()
+        }.register()
     }
 
     override fun handleReload() {

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

@@ -11,6 +11,7 @@ class CommandEcoPets(plugin: EcoPlugin) : PluginCommand(plugin, "ecopets", "ecop
             .addSubcommand(CommandGiveEgg(plugin))
             .addSubcommand(CommandGiveXP(plugin))
             .addSubcommand(CommandReset(plugin))
+            .addSubcommand(CommandGiveCurrentXP(plugin))
     }
 
     override fun onExecute(sender: CommandSender, args: List<String>) {

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

@@ -0,0 +1,80 @@
+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.eco.util.savedDisplayName
+import com.willfp.eco.util.toNiceString
+import com.willfp.ecopets.pets.Pets
+import com.willfp.ecopets.pets.activePet
+import com.willfp.ecopets.pets.givePetExperience
+import com.willfp.ecopets.pets.hasPet
+import org.bukkit.Bukkit
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
+
+class CommandGiveCurrentXP(plugin: EcoPlugin) : Subcommand(plugin, "givecurrentxp", "ecopets.command.givecurrentxp", false) {
+    override fun onExecute(sender: CommandSender, args: List<String>) {
+        if (args.isEmpty()) {
+            sender.sendMessage(plugin.langYml.getMessage("needs-player"))
+            return
+        }
+
+        if (args.size == 1) {
+            sender.sendMessage(plugin.langYml.getMessage("needs-amount"))
+            return
+        }
+
+        val playerName = args[0]
+
+        val player = Bukkit.getPlayer(playerName)
+
+        if (player == null) {
+            sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
+            return
+        }
+
+        val pet = player.activePet
+
+        if (pet == null) {
+            sender.sendMessage(plugin.langYml.getMessage("no-pet"))
+            return
+        }
+
+        if (!player.hasPet(pet)) {
+            sender.sendMessage(plugin.langYml.getMessage("doesnt-have-pet"))
+            return
+        }
+
+        val amount = args[1].toDoubleOrNull()
+
+        if (amount == null) {
+            sender.sendMessage(plugin.langYml.getMessage("invalid-amount"))
+            return
+        }
+
+        player.givePetExperience(
+            pet,
+            amount
+        )
+
+        sender.sendMessage(
+            plugin.langYml.getMessage("gave-current-xp", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%player%", player.savedDisplayName)
+                .replace("%xp%", amount.toNiceString())
+        )
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        if (args.size == 1) {
+            return Bukkit.getOnlinePlayers().map { it.name }
+        }
+
+        if (args.size == 2) {
+            return listOf("10", "100", "1000", "10000")
+        }
+
+        return emptyList()
+    }
+}

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

@@ -14,9 +14,10 @@ object ConditionHasActivePet : Condition<NoCompileData>("has_active_pet") {
     }
 
     override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
-        return EcoPetsAPI.instance.hasPet(
+        return EcoPetsAPI.instance.getActivePet(player) == Pets.getByID(config.getString("pet").lowercase())
-            player,
+//        return EcoPetsAPI.instance.hasPet(
-            Pets.getByID(config.getString("pet").lowercase()) ?: return false
+//            player,
-        )
+//            Pets.getByID(config.getString("pet").lowercase()) ?: return false
+//        )
     }
 }

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

@@ -0,0 +1,17 @@
+package com.willfp.ecopets.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecopets.api.EcoPetsAPI
+import com.willfp.ecopets.pets.Pets
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.conditions.Condition
+import org.bukkit.entity.Player
+
+object ConditionHasPet : Condition<NoCompileData>("has_pet") {
+    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+        return EcoPetsAPI.instance.hasPet(
+            player,
+            Pets.getByID(config.getString("pet").lowercase()) ?: return false
+        )
+    }
+}

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

@@ -363,6 +363,8 @@ class Pet(
         val level = player.getPetLevel(this)
         val isActive = player.activePet == this
 
+        val baseLoreLocation = if (level == this.maxLevel) "max-level-lore" else "lore"
+
         return ItemStackBuilder(base)
             .setDisplayName(
                 plugin.configYml.getFormattedString("gui.pet-icon.name")
@@ -370,7 +372,7 @@ class Pet(
                     .replace("%pet%", this.name)
             )
             .addLoreLines {
-                injectPlaceholdersInto(plugin.configYml.getStrings("gui.pet-icon.lore"), player) +
+                injectPlaceholdersInto(plugin.configYml.getStrings("gui.pet-icon.$baseLoreLocation"), player) +
                         if (isActive) plugin.configYml.getStrings("gui.pet-icon.active-lore") else
                             plugin.configYml.getStrings("gui.pet-icon.not-active-lore")
             }
@@ -379,6 +381,9 @@ class Pet(
 
     fun getPetInfoIcon(player: Player): ItemStack {
         val base = baseItem.clone()
+
+        val prefix = if (player.getPetLevel(this) == this.maxLevel) "max-level-" else ""
+
         return ItemStackBuilder(base)
             .setDisplayName(
                 plugin.configYml.getFormattedString("gui.pet-info.active.name")
@@ -386,7 +391,7 @@ class Pet(
                     .replace("%pet%", this.name)
             )
             .addLoreLines {
-                injectPlaceholdersInto(plugin.configYml.getStrings("gui.pet-info.active.lore"), player)
+                injectPlaceholdersInto(plugin.configYml.getStrings("gui.pet-info.active.${prefix}lore"), player)
             }
             .build()
     }

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

@@ -35,6 +35,8 @@ class PetLevelGUI(
             override fun getLevelItem(player: Player, menu: Menu, level: Int, levelState: LevelState): ItemStack {
                 val key = levelState.name.lowercase().replace("_", "-")
 
+                val prefix = if (player.getPetLevel(pet) == pet.maxLevel) "max-level-" else ""
+
                 return ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$key.item")))
                     .setDisplayName(
                         plugin.configYml.getFormattedString("level-gui.progression-slots.$key.name")
@@ -44,7 +46,7 @@ class PetLevelGUI(
                     )
                     .addLoreLines(
                         pet.injectPlaceholdersInto(
-                            plugin.configYml.getFormattedStrings("level-gui.progression-slots.$key.lore"),
+                            plugin.configYml.getFormattedStrings("level-gui.progression-slots.$key.${prefix}lore"),
                             player,
                             forceLevel = level
                         )

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

@@ -3,6 +3,11 @@
 # by Auxilor
 #
 
+# Even if eco is set up to use a database, you can
+# force EcoPets to save to local storage to disable
+# cross-server sync.
+use-local-storage: false
+
 discover-recipes: true
 
 gui:
@@ -64,6 +69,20 @@ gui:
         - ""
         - "&eClick to view Level Progression!"
 
+      # By default, the lore for the max level is the same,
+      # but you can change this if you want.
+      max-level-lore:
+        - "%description%"
+        - "&f"
+        - "&fEffects:"
+        - "%effects%"
+        - ""
+        - "&fProgress:"
+        - "&8» &e%percentage_progress%%"
+        - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
+        - ""
+        - "&eClick to view Level Progression!"
+
   pet-icon:
     name: "%pet% &fLvl. &a%level%"
     lore:
@@ -76,6 +95,18 @@ gui:
       - "&8» &e%percentage_progress%%"
       - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
 
+    # By default, the lore for the max level is the same,
+    # but you can change this if you want.
+    max-level-lore:
+      - "%description%"
+      - "&f"
+      - "&fEffects:"
+      - "%effects%"
+      - ""
+      - "&fProgress:"
+      - "&8» &e%percentage_progress%%"
+      - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
+
     active-lore:
       - ""
       - "&cThis pet is already active!"
@@ -198,6 +229,17 @@ level-gui:
         - "&fProgress:"
         - "&8» &e%percentage_progress%%"
         - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
+
+      # By default, the lore for the max level is the same,
+      # but you can change this if you want.
+      max-level-lore:
+        - "&f"
+        - "&fRewards:"
+        - "%rewards%"
+        - "&f"
+        - "&fProgress:"
+        - "&8» &e%percentage_progress%%"
+        - "&8» &e%current_xp%&8/&7%required_xp% &fXP"
     locked:
       item: red_stained_glass_pane
       name: "%pet% &fLvl. &a%level%"

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

@@ -7,6 +7,8 @@ messages:
 
   needs-player: "&cYou must specify a player!"
   gave-xp: "&fYou have given &a%xp% &fXP to %player%&f's %pet%&f!"
+  gave-current-xp: "&fYou have given &a%xp% &fXP to %player%&f's currently active pet!"
+  no-pet: "&cThe player doesn't have a pet active!"
   reset-xp: "&fYou have reset %player%&f's %pet%&f XP!"
   needs-pet: "&cYou must specify a pet!"
   need-amount: "&cYou must specify a amount!"

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

@@ -33,6 +33,7 @@ permissions:
       ecopets.command.give: true
       ecopets.command.giveegg: true
       ecopets.command.givexp: true
+      ecopets.command.givecurrentxp: true
       ecopets.command.reset: true
       ecopets.command.activate: true
       ecopets.command.deactivate: true
@@ -55,6 +56,9 @@ permissions:
   ecopets.command.givexp:
     description: Allows the use of /ecopets givexp.
     default: op
+  ecopets.command.givecurrentxp:
+    description: Allows the use of /ecopets givecurrentxp.
+    default: op
   ecopets.command.reset:
     description: Allows the use of /ecopets reset.
     default: op

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

@@ -35,6 +35,7 @@ permissions:
       ecopets.command.give: true
       ecopets.command.giveegg: true
       ecopets.command.givexp: true
+      ecopets.command.givecurrentxp: true
       ecopets.command.reset: true
       ecopets.command.activate: true
       ecopets.command.deactivate: true
@@ -57,6 +58,9 @@ permissions:
   ecopets.command.givexp:
     description: Allows the use of /ecopets givexp.
     default: op
+  ecopets.command.givecurrentxp:
+    description: Allows the use of /ecopets givecurrentxp.
+    default: op
   ecopets.command.reset:
     description: Allows the use of /ecopets reset.
     default: op

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sat Jun 10 13:32:44 BST 2023
+#Sat Nov 11 17:59:04 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.19.0
+libreforge-version=4.42.0
-version=2.18.0
+version=2.42.0