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.6")
     compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.2")
 
     implementation("com.willfp:ecomponent:1.3.0")
@@ -11,9 +11,12 @@ dependencies {
 
 publishing {
     publications {
-        register("maven", MavenPublication::class) {
+        register<MavenPublication>("maven") {
-            from(components["java"])
+            groupId = project.group.toString()
+            version = project.version.toString()
             artifactId = rootProject.name
+
+            artifact(rootProject.tasks.shadowJar.get().archiveFile)
         }
     }
 

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/CommandGive.kt

@@ -9,6 +9,7 @@ import com.willfp.ecopets.pets.hasPet
 import com.willfp.ecopets.pets.setPetLevel
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
 import org.bukkit.util.StringUtil
 
 class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.command.give", false) {
@@ -28,7 +29,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.comma
         @Suppress("DEPRECATION")
         val player = Bukkit.getOfflinePlayer(playerName)
 
-        if (!player.hasPlayedBefore()) {
+        if (!player.hasPlayedBefore() && player !is Player) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
             return
         }

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/PetDisplay.kt

@@ -36,6 +36,11 @@ class PetDisplay(
         val pet = player.activePet
 
         if (pet != null) {
+            if (player.isInvisible) {
+                remove(player)
+                return
+            }
+
             @Suppress("DEPRECATION")
             stand.customName = plugin.configYml.getString("pet-entity.name")
                 .replace("%player%", player.displayName)
@@ -77,6 +82,10 @@ class PetDisplay(
     }
 
     private fun getOrNew(player: Player): ArmorStand? {
+        if (player.isInvisible) {
+            return null
+        }
+
         val tracked = trackedEntities[player.uniqueId]
         val existing = tracked?.stand
 

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sat May 20 17:41:14 BST 2023
+#Thu Aug 10 19:59:38 BST 2023
 kotlin.code.style=official
-libreforge-version=4.14.2
+libreforge-version=4.28.0
-version=2.14.2
+version=2.27.0