Typo fix

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @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.8")
+    compileOnly("com.ticxo.modelengine:api:R3.1.5")
     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,7 +6,6 @@ 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
@@ -20,7 +19,6 @@ 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
@@ -49,7 +47,6 @@ class EcoPetsPlugin : LibreforgePlugin() {
     override fun handleEnable() {
         Conditions.register(ConditionHasPetLevel)
         Conditions.register(ConditionHasActivePet)
-        Conditions.register(ConditionHasPet)
         Effects.register(EffectPetXpMultiplier)
         Effects.register(EffectGivePetXp)
         Triggers.register(TriggerGainPetXp)
@@ -71,18 +68,6 @@ 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/libreforge/ConditionHasActivePet.kt

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

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

@@ -1,17 +0,0 @@
-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/resources/config.yml

@@ -3,11 +3,6 @@
 # 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:

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

@@ -68,14 +68,14 @@ permissions:
     default: true
 
   ecopets.xpmultiplier.50percent:
-    description: Gives the player 50% more skill experience
+    description: Gives the player 50% more pet experience
     default: false
   ecopets.xpmultiplier.double:
-    description: Gives the player 2x skill experience
+    description: Gives the player 2x pet experience
     default: false
   ecopets.xpmultiplier.triple:
-    description: Gives the player 3x skill experience
+    description: Gives the player 3x pet experience
     default: false
   ecopets.xpmultiplier.quadruple:
-    description: Gives the player 4x skill experience
+    description: Gives the player 4x pet experience
     default: false

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Wed Sep 20 15:34:00 BST 2023
+#Sat Jun 10 13:32:44 BST 2023
 kotlin.code.style=official
-libreforge-version=4.34.1
-version=2.33.1
+libreforge-version=4.19.0
+version=2.18.0