Typo fix

Page system fix

build.gradle.kts

@@ -38,7 +38,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly("com.willfp:eco:6.53.0")
+        compileOnly("com.willfp:eco:6.55.0")
         compileOnly("org.jetbrains:annotations:23.0.0")
         compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
     }

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.6")
+    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")
@@ -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/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/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
 

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

@@ -3,6 +3,8 @@ package com.willfp.ecopets.pets
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.page.Page
+import com.willfp.eco.core.gui.page.PageChangeEvent
 import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.ConfigSlot
 import com.willfp.eco.core.gui.slot.FillerMask
@@ -21,17 +23,6 @@ import kotlin.math.min
 object PetsGUI {
     private lateinit var menu: Menu
     private val petAreaSlots = mutableListOf<Pair<Int, Int>>()
-    private const val pageKey = "page"
-
-    private fun getPage(menu: Menu, player: Player): Int {
-        val pages = ceil(Pets.values()
-            .filter { player.getPetLevel(it) > 0 }
-            .size.toDouble() / petAreaSlots.size).toInt()
-
-        val page = menu.getState(player, pageKey) ?: 1
-
-        return max(min(pages, page + 1), 1)
-    }
 
     @JvmStatic
     @ConfigUpdater
@@ -42,8 +33,8 @@ object PetsGUI {
         val bottomRightColumn = plugin.configYml.getInt("gui.pet-area.bottom-right.column")
 
         petAreaSlots.clear()
-        for (row in topLeftRow..bottomRightRow) {
+        for (row in topLeftRow .. bottomRightRow) {
-            for (column in topLeftColumn..bottomRightColumn) {
+            for (column in topLeftColumn .. bottomRightColumn) {
                 petAreaSlots.add(Pair(row, column))
             }
         }
@@ -55,31 +46,28 @@ object PetsGUI {
         val petInfoItemBuilder = { player: Player, _: Menu ->
             val pet = player.activePet
 
-            if (pet == null) {
+            pet?.getPetInfoIcon(player)
-                ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.pet-info.no-active.item")))
+                ?: ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.pet-info.no-active.item")))
                     .setDisplayName(plugin.configYml.getFormattedString("gui.pet-info.no-active.name"))
                     .addLoreLines(plugin.configYml.getFormattedStrings("gui.pet-info.no-active.lore"))
                     .build()
-            } else {
-                pet.getPetInfoIcon(player)
-            }
         }
 
         val petIconBuilder = { player: Player, menu: Menu, index: Int ->
-            val page = getPage(menu, player)
+            val page = menu.getPage(player)
 
             val unlockedPets = Pets.values()
                 .sortedByDescending { player.getPetLevel(it) }
                 .filter { player.getPetLevel(it) > 0 }
 
-            val pagedIndex = ((page - 1) * petAreaSlots.size) + index
+            val pagedIndex = page * petAreaSlots.size - petAreaSlots.size + index
 
             val pet = unlockedPets.getOrNull(pagedIndex)
             pet?.getIcon(player) ?: ItemStack(Material.AIR)
         }
 
         return menu(plugin.configYml.getInt("gui.rows")) {
-            setTitle(plugin.langYml.getString("menu.title"))
+            title = plugin.langYml.getString("menu.title")
 
             setMask(
                 FillerMask(
@@ -88,35 +76,30 @@ object PetsGUI {
                 )
             )
 
-            setSlot(
+            onRender { player, menu ->
-                plugin.configYml.getInt("gui.pet-info.row"),
+                menu.setState(player, "ecopets", true)
-                plugin.configYml.getInt("gui.pet-info.column"),
+
-                slot(petInfoItemBuilder) {
+                if (menu.getPage(player) > menu.getMaxPage(player)) {
-                    onLeftClick { event, _, _ ->
+                    menu.setState(player, Page.PAGE_KEY, 1)
-                        val player = event.whoClicked as Player
-                        player.activePet?.levelGUI?.open(player)
                 }
             }
-            )
 
             for ((index, pair) in petAreaSlots.withIndex()) {
                 val (row, column) = pair
-
+                setSlot(row, column, slot({ player, menu -> petIconBuilder(player, menu, index) }) {
-                setSlot(row, column, slot({ p, m -> petIconBuilder(p, m, index) }) {
+                    setUpdater { player, menu, _ ->
-                    setUpdater { p, m, _ ->
+                        petIconBuilder(player, menu, index)
-                        petIconBuilder(p, m, index)
                     }
 
                     onLeftClick { event, _, _ ->
                         val player = event.whoClicked as Player
-
+                        val page = menu.getPage(player)
-                        val page = getPage(menu, player)
 
                         val unlockedPets = Pets.values()
                             .sortedByDescending { player.getPetLevel(it) }
                             .filter { player.getPetLevel(it) > 0 }
 
-                        val pagedIndex = ((page - 1) * petAreaSlots.size) + index
+                        val pagedIndex = page * petAreaSlots.size - petAreaSlots.size + index
 
                         val pet = unlockedPets.getOrNull(pagedIndex) ?: return@onLeftClick
 
@@ -134,6 +117,8 @@ object PetsGUI {
                 })
             }
 
+            // I do this for backwards compatibility because with PageChanger if you don't have any more pages, the item will disappear and this would require an update of the config for all users
+            // This is terrible imo, but everything for compatibility!
             setSlot(
                 plugin.configYml.getInt("gui.prev-page.location.row"),
                 plugin.configYml.getInt("gui.prev-page.location.column"),
@@ -141,14 +126,19 @@ object PetsGUI {
                     ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.prev-page.item")))
                         .setDisplayName(plugin.configYml.getString("gui.prev-page.name"))
                         .build()
-                ) {
+                )
-                    onLeftClick { event, _, menu ->
+                {
+                    onLeftClick { event, _, _ ->
                         val player = event.whoClicked as Player
-                        val page = getPage(menu, player)
+                        val page = menu.getPage(player)
+                        val newPage = max(1, min(page + -1, menu.getMaxPage(player)))
 
-                        val newPage = max(1, page - 1)
+                        if (newPage == page) {
+                            return@onLeftClick
+                        }
 
-                        menu.setState(player, pageKey, newPage)
+                        menu.setState(player, Page.PAGE_KEY, newPage)
+                        menu.callEvent(player, PageChangeEvent(newPage, page))
                     }
                 }
             )
@@ -160,19 +150,30 @@ object PetsGUI {
                     ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.next-page.item")))
                         .setDisplayName(plugin.configYml.getString("gui.next-page.name"))
                         .build()
-                ) {
+                )
-                    onLeftClick { event, _, menu ->
+                {
+                    onLeftClick { event, _, _ ->
                         val player = event.whoClicked as Player
+                        val page = menu.getPage(player)
+                        val newPage = max(1, min(page + 1, menu.getMaxPage(player)))
 
-                        val pages = ceil(Pets.values()
+                        if (newPage == page) {
-                            .filter { player.getPetLevel(it) > 0 }
+                            return@onLeftClick
-                            .size.toDouble() / petAreaSlots.size).toInt()
+                        }
 
-                        val page = getPage(menu, player)
+                        menu.setState(player, Page.PAGE_KEY, newPage)
+                        menu.callEvent(player, PageChangeEvent(newPage, page))
+                    }
+                }
+            )
 
-                        val newPage = min(pages, page + 1)
+            setSlot(
-
+                plugin.configYml.getInt("gui.pet-info.row"),
-                        menu.setState(player, pageKey, newPage)
+                plugin.configYml.getInt("gui.pet-info.column"),
+                slot(petInfoItemBuilder) {
+                    onLeftClick { event, _, _ ->
+                        val player = event.whoClicked as Player
+                        player.activePet?.levelGUI?.open(player)
                     }
                 }
             )
@@ -209,6 +210,21 @@ object PetsGUI {
                     ConfigSlot(config)
                 )
             }
+
+            maxPages { player ->
+                val unlockedPets = Pets.values()
+                    .sortedByDescending { player.getPetLevel(it) }
+                    .filter { player.getPetLevel(it) > 0 }
+
+                val perPage = petAreaSlots.size
+
+                val pages = if (unlockedPets.isEmpty()) {
+                    0
+                } else {
+                    ceil((unlockedPets.size.toDouble() / perPage)).toInt()
+                }
+                pages
+            }
         }
     }
 

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
-#Thu Apr 06 20:09:51 CEST 2023
+#Sat Jun 10 13:32:44 BST 2023
 kotlin.code.style=official
-libreforge-version=4.2.5
+libreforge-version=4.19.0
-version=2.2.5
+version=2.18.0