libreforge-updater

Fixed default pets yml

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"
     }
 }
 
@@ -48,12 +48,12 @@ allprojects {
 
     dependencies {
         compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.74.1'
+        implementation 'com.willfp:libreforge:3.87.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/src/main/kotlin/com/willfp/ecopets/pets/PetDisplay.kt

@@ -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,11 @@ class PetDisplay(
 
             location.y += NumberUtils.fastSin(tick / (2 * PI) * 0.5) * 0.15
 
-            stand.teleport(location)
+            try {
+                stand.teleport(location)
+            } catch (_: Exception) {
+
+            }
 
             if (!pet.entityTexture.contains(":")) {
                 stand.setRotation((20 * tick / (2 * PI)).toFloat(), 0f)
@@ -55,15 +59,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 +95,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 +111,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/entity/ModelEnginePetEntity.kt

@@ -16,6 +16,9 @@ class ModelEnginePetEntity(
         val modelled = ModelEngineAPI.createModeledEntity(stand)
         modelled.addActiveModel(model)
 
+        // ModelEngine removed addActiveModel in new API release... for no reason. 
+        //modelled.addModel(model,true)
+
         return stand
     }
 }

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

@@ -721,45 +721,45 @@ pets:
       1:
         - "&8» &#ff0000This pet can ONLY be levelled at night."
         - ""
-        - "&8» &7When hitting enemies have a &#ff0000%lifesteal_chance% &7to gain"
+        - "&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"
+        - "&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"
+        - "&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%"
+        - "&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"
+        - "&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"
+        - "&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"
+        - "&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"
+        - "&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"
+        - "&8» &7When hitting enemies have a &#ff0000%bleed_chance%% &7to bleed"
         - "    &7your enemies dealing &#ff0000%bleed_damage%&7 damage twice."
 
     level-commands: [ ]

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Tue Jul 12 14:59:32 BST 2022
-version=1.10.1
+#Tue Aug 23 11:08:06 CEST 2022
+version=1.23.0
 plugin-name=EcoPets