add more events for developers

build.gradle.kts

@@ -82,4 +82,4 @@ allprojects {
             dependsOn(shadowJar)
         }
     }
-}
+}

eco-core/build.gradle.kts

@@ -1,2 +1,2 @@
 group = "com.willfp"
-version = rootProject.version
+version = rootProject.version

eco-core/core-plugin/build.gradle.kts

@@ -38,4 +38,4 @@ tasks {
     build {
         dependsOn(publishToMavenLocal)
     }
-}
+}

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

@@ -1,6 +1,7 @@
 package com.willfp.ecopets
 
 import com.willfp.ecopets.api.EcoPetsAPI
+import com.willfp.ecopets.api.event.PlayerPetSwapEvent
 import com.willfp.ecopets.pets.Pet
 import com.willfp.ecopets.pets.activePet
 import com.willfp.ecopets.pets.getPetLevel
@@ -9,6 +10,7 @@ import com.willfp.ecopets.pets.getPetXP
 import com.willfp.ecopets.pets.getPetXPRequired
 import com.willfp.ecopets.pets.givePetExperience
 import com.willfp.ecopets.pets.hasPet
+import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 
@@ -18,6 +20,7 @@ internal object EcoPetsAPIImpl : EcoPetsAPI {
     override fun getActivePet(player: OfflinePlayer): Pet? = player.activePet
 
     override fun setActivePet(player: OfflinePlayer, pet: Pet?) {
+        Bukkit.getServer().pluginManager.callEvent(PlayerPetSwapEvent(player, player.activePet, pet))
         player.activePet = pet
     }
 

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

@@ -0,0 +1,27 @@
+package com.willfp.ecopets.api.event
+
+import com.willfp.ecopets.pets.Pet
+import org.bukkit.OfflinePlayer
+import org.bukkit.entity.Player
+import org.bukkit.event.HandlerList
+import org.bukkit.event.player.PlayerEvent
+
+class PlayerAdoptPetEvent(
+    override val player: OfflinePlayer,
+    private val pet: Pet?,
+) : PlayerEvent(player as Player), com.willfp.ecopets.api.event.PlayerEvemt {
+
+    fun getPet(): Pet? {
+        return pet;
+    }
+
+    override fun getHandlers(): HandlerList {
+        return handlerList
+    }
+
+    companion object {
+        @JvmStatic
+        val handlerList = HandlerList()
+    }
+
+}

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

@@ -0,0 +1,8 @@
+package com.willfp.ecopets.api.event
+
+import org.bukkit.OfflinePlayer
+
+
+interface PlayerEvemt {
+    val player: OfflinePlayer
+}

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

@@ -0,0 +1,37 @@
+package com.willfp.ecopets.api.event
+
+import com.willfp.ecopets.pets.Pet
+import org.bukkit.OfflinePlayer
+import org.bukkit.entity.Player
+import org.bukkit.event.Cancellable
+import org.bukkit.event.HandlerList
+import org.bukkit.event.player.PlayerEvent
+import javax.annotation.Nullable
+
+class PlayerPetSwapEvent(
+    override val player: OfflinePlayer,
+    private val pet: Pet?,
+    private val newPet: Pet?,
+) : PlayerEvent(player as Player), com.willfp.ecopets.api.event.PlayerEvemt {
+
+    fun getOldPet(): Pet? {
+        if(pet == null)
+            return null
+        return pet
+    }
+    fun getNewPet(): Pet? {
+        if(newPet == null)
+            return null
+        return newPet
+    }
+
+
+    override fun getHandlers(): HandlerList {
+        return handlerList
+    }
+
+    companion object {
+        @JvmStatic
+        val handlerList = HandlerList()
+    }
+}

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

@@ -3,9 +3,11 @@ package com.willfp.ecopets.commands
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.eco.util.StringUtils
+import com.willfp.ecopets.api.event.PlayerPetSwapEvent
 import com.willfp.ecopets.pets.Pets
 import com.willfp.ecopets.pets.activePet
 import com.willfp.ecopets.pets.hasPet
+import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 import org.bukkit.util.StringUtil
@@ -37,6 +39,7 @@ class CommandActivate(plugin: EcoPlugin) : Subcommand(plugin, "activate", "ecope
             plugin.langYml.getMessage("activated-pet", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
                 .replace("%pet%", pet.name)
         )
+        Bukkit.getServer().pluginManager.callEvent(PlayerPetSwapEvent(player, player.activePet, pet))
         player.activePet = pet
     }
 

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

@@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.eco.util.StringUtils
 import com.willfp.eco.util.savedDisplayName
+import com.willfp.ecopets.api.event.PlayerAdoptPetEvent
 import com.willfp.ecopets.pets.Pets
 import com.willfp.ecopets.pets.hasPet
 import com.willfp.ecopets.pets.setPetLevel
@@ -26,7 +27,6 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.comma
 
         val playerName = args[0]
 
-        @Suppress("DEPRECATION")
         val player = Bukkit.getOfflinePlayer(playerName)
 
         if (!player.hasPlayedBefore() && player !is Player) {
@@ -52,6 +52,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.comma
                 .replace("%player%", player.savedDisplayName)
                 .replace("%pet%", pet.name)
         )
+        Bukkit.getServer().pluginManager.callEvent(PlayerAdoptPetEvent(player, pet))
     }
 
     override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {

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

@@ -12,6 +12,8 @@ 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.ecopets.EcoPetsPlugin
+import com.willfp.ecopets.api.event.PlayerPetSwapEvent
+import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.Sound
 import org.bukkit.entity.Player
@@ -104,6 +106,7 @@ object PetsGUI {
                         val pet = unlockedPets.getOrNull(pagedIndex) ?: return@onLeftClick
 
                         if (player.activePet != pet) {
+                            Bukkit.getServer().pluginManager.callEvent(PlayerPetSwapEvent(player, player.activePet, pet))
                             player.activePet = pet
                         }
 
@@ -198,6 +201,7 @@ object PetsGUI {
                 ) {
                     onLeftClick { event, _ ->
                         val player = event.whoClicked as Player
+                        Bukkit.getServer().pluginManager.callEvent(PlayerPetSwapEvent(player, player.activePet, null))
                         player.activePet = null
                     }
                 }

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

@@ -1,6 +1,8 @@
 package com.willfp.ecopets.pets
 
 import com.willfp.eco.core.EcoPlugin
+import com.willfp.ecopets.api.event.PlayerAdoptPetEvent
+import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 import org.bukkit.event.Event
 import org.bukkit.event.EventHandler
@@ -42,5 +44,6 @@ class SpawnEggHandler(
         }
 
         player.setPetLevel(pet, 1)
+        Bukkit.getServer().pluginManager.callEvent(PlayerAdoptPetEvent(player, pet))
     }
 }

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -7,6 +7,14 @@ pluginManagement {
     }
 }
 
+// In settings.gradle.kts
+buildCache {
+    local {
+        isEnabled = true
+    }
+}
+
+
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }