libreforge-updater

Fix bugs

build.gradle

@@ -43,12 +43,14 @@ allprojects {
 
     shadowJar {
         relocate('com.willfp.libreforge', 'com.willfp.ecopets.libreforge')
+        relocate('com.willfp.ecomponent', 'com.willfp.ecopets.ecomponent')
         relocate('org.joml', 'com.willfp.ecopets.libreforge.joml')
     }
 
     dependencies {
         compileOnly 'com.willfp:eco:6.44.0'
-        implementation 'com.willfp:libreforge:3.117.0'
+        implementation 'com.willfp:libreforge:3.127.0'
+        implementation 'com.willfp:ecomponent:1.0.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'

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:R3.0.0'
+    compileOnly 'com.ticxo.modelengine:api:R3.1.3'
 }
 
 build.dependsOn publishToMavenLocal

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

@@ -17,6 +17,10 @@ internal object EcoPetsAPIImpl : EcoPetsAPI {
 
     override fun getActivePet(player: OfflinePlayer): Pet? = player.activePet
 
+    override fun setActivePet(player: OfflinePlayer, pet: Pet?) {
+        player.activePet = pet
+    }
+
     override fun getPetLevel(player: OfflinePlayer, pet: Pet) = player.getPetLevel(pet)
 
     override fun givePetExperience(player: Player, pet: Pet, amount: Double) =

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

@@ -41,6 +41,10 @@ class EcoPetsPlugin : LibReforgePlugin() {
     }
 
     override fun handleReloadAdditional() {
+        if (!this.configYml.getBool("pet-entity.enabled")) {
+            return
+        }
+
         this.scheduler.runTimer(1, 1) {
             petDisplay.tickAll()
         }

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

@@ -28,6 +28,17 @@ interface EcoPetsAPI {
         player: OfflinePlayer
     ): Pet?
 
+    /**
+     * Set a player's active pet.
+     *
+     * @param player The player.
+     * @param pet The pet.
+     */
+    fun setActivePet(
+        player: OfflinePlayer,
+        pet: Pet?
+    )
+
     /**
      * Get a player's level of a certain pet.
      *
@@ -69,7 +80,8 @@ interface EcoPetsAPI {
     )
 
     /**
-     * Get progress to next level between 0 and 1, where 0 is none and 1 is complete.
+     * Get progress to next level between 0 and 1, where 0 is none and 1 is
+     * complete.
      *
      * @param player The player.
      * @param pet The pet.

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

@@ -53,7 +53,7 @@ class CommandActivate(plugin: EcoPlugin) : Subcommand(plugin, "activate", "ecope
 
         if (args.size == 1) {
             StringUtil.copyPartialMatches(
-                args[1],
+                args[0],
                 Pets.values().filter { sender.hasPet(it) }.map { it.id },
                 completions
             )

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

@@ -9,7 +9,9 @@ import org.bukkit.entity.ArmorStand
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerChangedWorldEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import org.bukkit.event.player.PlayerTeleportEvent
 import java.util.UUID
 import kotlin.math.PI
 import kotlin.math.abs
@@ -45,17 +47,7 @@ class PetDisplay(
             location.y += NumberUtils.fastSin(tick / (2 * PI) * 0.5) * 0.15
 
             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(":")) {
@@ -117,10 +109,24 @@ class PetDisplay(
         trackedEntities.clear()
     }
 
+    private fun remove(player: Player) {
+        trackedEntities[player.uniqueId]?.stand?.remove()
+        trackedEntities.remove(player.uniqueId)
+    }
+
     @EventHandler
     fun onLeave(event: PlayerQuitEvent) {
-        trackedEntities[event.player.uniqueId]?.stand?.remove()
-        trackedEntities.remove(event.player.uniqueId)
+        remove(event.player)
+    }
+
+    @EventHandler
+    fun onTeleport(event: PlayerTeleportEvent) {
+        remove(event.player)
+    }
+
+    @EventHandler
+    fun onWorldChange(event: PlayerChangedWorldEvent) {
+        remove(event.player)
     }
 
     private data class PetArmorStand(

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

@@ -3,6 +3,9 @@ package com.willfp.ecopets.pets
 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.menu.MenuLayer
+import com.willfp.eco.core.gui.onLeftClick
+import com.willfp.eco.core.gui.page.PageChanger
 import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
@@ -10,63 +13,62 @@ import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.util.NumberUtils
-import org.bukkit.Material
+import com.willfp.ecomponent.components.LevelComponent
+import com.willfp.ecomponent.components.LevelState
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.properties.Delegates
+
 
 class PetLevelGUI(
     plugin: EcoPlugin,
     private val pet: Pet
 ) {
     private val menu: Menu
-    private val pageKey = "page"
-    private var levelsPerPage by Delegates.notNull<Int>()
-    private var pages by Delegates.notNull<Int>()
-
-    private fun getPage(menu: Menu, player: Player): Int {
-        val page = menu.getState(player, pageKey) ?: 1
-
-        return min(pages, max(page, 1))
-    }
 
     init {
         val maskPattern = plugin.configYml.getStrings("level-gui.mask.pattern").toTypedArray()
         val maskItems = MaskItems.fromItemNames(plugin.configYml.getStrings("level-gui.mask.materials"))
 
-        val progressionOrder = "123456789abcdefghijklmnopqrstuvwxyz"
         val progressionPattern = plugin.configYml.getStrings("level-gui.progression-slots.pattern")
 
-        val progressionSlots = mutableMapOf<Int, Pair<Int, Int>>()
+        val component = object : LevelComponent(progressionPattern, pet.maxLevel) {
+            override fun getLevelItem(player: Player, menu: Menu, level: Int, levelState: LevelState): ItemStack {
+                val key = levelState.name.lowercase().replace("_", "-")
 
-        var x = 0
-        for (row in progressionPattern) {
-            x++
-            var y = 0
-            for (char in row) {
-                y++
-                if (char == '0') {
-                    continue
+                return ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$key.item")))
+                    .setDisplayName(
+                        plugin.configYml.getFormattedString("level-gui.progression-slots.$key.name")
+                            .replace("%pet%", pet.name)
+                            .replace("%level%", level.toString())
+                            .replace("%level_numeral%", NumberUtils.toNumeral(level))
+                    )
+                    .addLoreLines(
+                        pet.injectPlaceholdersInto(
+                            plugin.configYml.getFormattedStrings("level-gui.progression-slots.$key.lore"),
+                            player,
+                            forceLevel = level
+                        )
+                    )
+                    .setAmount(
+                        if (plugin.configYml.getBool("level-gui.progression-slots.level-as-amount")) level else 1
+                    )
+                    .build()
             }
 
-                val pos = progressionOrder.indexOf(char)
-
-                if (pos == -1) {
-                    continue
-                }
-
-                progressionSlots[pos + 1] = Pair(x, y)
+            override fun getLevelState(player: Player, level: Int): LevelState {
+                return when {
+                    level <= player.getPetLevel(pet) -> LevelState.UNLOCKED
+                    level == player.getPetLevel(pet) + 1 -> LevelState.IN_PROGRESS
+                    else -> LevelState.LOCKED
+                }
             }
         }
-
-        levelsPerPage = progressionSlots.size
-        pages = ceil(pet.maxLevel.toDouble() / levelsPerPage).toInt()
 
         menu = menu(plugin.configYml.getInt("level-gui.rows")) {
-            setTitle(pet.name)
+            title = pet.name
+
+            maxPages(component.pages)
+
             setMask(
                 FillerMask(
                     maskItems,
@@ -74,58 +76,11 @@ class PetLevelGUI(
                 )
             )
 
-            for ((level, value) in progressionSlots) {
-                setSlot(
-                    value.first,
-                    value.second,
-                    slot(ItemStack(Material.BLACK_STAINED_GLASS_PANE)) {
-                        setUpdater { player, menu, _ ->
-                            val page = getPage(menu, player)
+            addComponent(1, 1, component)
 
-                            val slotLevel = ((page - 1) * levelsPerPage) + level
-
-                            fun getItem(section: String) =
-                                ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$section.item")))
-                                    .setDisplayName(
-                                        plugin.configYml.getFormattedString("level-gui.progression-slots.$section.name")
-                                            .replace("%pet%", pet.name)
-                                            .replace("%level%", slotLevel.toString())
-                                            .replace("%level_numeral%", NumberUtils.toNumeral(slotLevel))
-                                    )
-                                    .addLoreLines(
-                                        pet.injectPlaceholdersInto(
-                                            plugin.configYml.getFormattedStrings("level-gui.progression-slots.$section.lore"),
-                                            player,
-                                            forceLevel = slotLevel
-                                        )
-                                    )
-                                    .build()
-
-                            if (slotLevel > pet.maxLevel) {
-                                maskItems.items[0].item
-                            } else {
-                                val item = when {
-                                    slotLevel <= player.getPetLevel(pet) -> {
-                                        getItem("unlocked")
-                                    }
-                                    slotLevel == player.getPetLevel(pet) + 1 -> {
-                                        getItem("in-progress")
-                                    }
-                                    else -> {
-                                        getItem("locked")
-                                    }
-                                }
-
-                                if (plugin.configYml.getBool("level-gui.progression-slots.level-as-amount")) {
-                                    item.amount = slotLevel
-                                }
-                                item
-                            }
-                        }
-                    }
-                )
-            }
-            setSlot(
+            // Instead of the page changer, this will show up when on the first page
+            addComponent(
+                MenuLayer.LOWER,
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
                 slot(
@@ -133,39 +88,32 @@ class PetLevelGUI(
                         .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
                         .build()
                 ) {
-                    onLeftClick { event, _, menu ->
-                        val player = event.whoClicked as Player
-                        val page = getPage(menu, player)
-
-                        val newPage = max(0, page - 1)
-
-                        if (newPage == 0) {
-                            PetsGUI.open(player)
-                        } else {
-                            menu.setState(player, pageKey, newPage)
-                        }
-                    }
+                    onLeftClick { player, _, _, _ -> PetsGUI.open(player) }
                 }
             )
-            setSlot(
+
+            addComponent(
+                plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
+                plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
+                PageChanger(
+                    ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.prev-page.material")))
+                        .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
+                        .build(),
+                    PageChanger.Direction.BACKWARDS
+                )
+            )
+
+            addComponent(
                 plugin.configYml.getInt("level-gui.progression-slots.next-page.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.next-page.location.column"),
-                slot(
+                PageChanger(
                     ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.next-page.material")))
                         .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.next-page.name"))
-                        .build()
-                ) {
-                    onLeftClick { event, _, menu ->
-                        val player = event.whoClicked as Player
-
-                        val page = getPage(menu, player)
-
-                        val newPage = min(pages, page + 1)
-
-                        menu.setState(player, pageKey, newPage)
-                    }
-                }
+                        .build(),
+                    PageChanger.Direction.FORWARDS
                 )
+            )
+
             setSlot(
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.column"),
@@ -190,5 +138,7 @@ class PetLevelGUI(
         }
     }
 
-    fun open(player: Player) = menu.open(player)
+    fun open(player: Player) {
+        menu.open(player)
+    }
 }

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

@@ -217,6 +217,7 @@ level-gui:
   custom-slots: [ ]
 
 pet-entity:
+  enabled: true # If you disable this, there will be no floating pets
   name: "%player%&f's %pet%&f (Lvl. %level%)"
 
 level-up:

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Tue Nov 01 16:24:09 GMT 2022
-version=1.56.0
+#Mon Jan 02 15:59:15 GMT 2023
+version=1.67.0
 plugin-name=EcoPets