Typo fix

Page system fix

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Auxilor Community Discord
+  - name: Discord
     url: https://discord.gg/ZcwpSsE/
-    about: Join the Auxilor discord to get help from support staff and the general community!
+    about: Issues have moved to Discord, please join the server to get help!
-  - name: The most common issues people have
-    url: https://github.com/Auxilor/eco/issues/78
-    about: Check the list of known common issues to see if your issue has already been solved

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -4,28 +4,8 @@ about: Report an issue with the plugin
 title: ''
 labels: bug
 assignees: ''
-
 ---
 
-**Describe the bug**
+# Please report bugs on the discord!
-A clear and concise description of what the bug is.
 
-**To Reproduce**
+[Join by clicking here](https://discord.gg/ZcwpSsE/)
-Steps to reproduce the behavior: 
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Server Information (please complete the following information):**
-- Version: (output of `/ver` command)
-- Version of plugin and eco (`/ver eco`, `/ver <plugin>`)
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -1,20 +0,0 @@
----
-name: Request a Feature
-about: Suggest an idea for this plugin
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/publish-release.yml

@@ -0,0 +1,33 @@
+name: Publish Packages
+on:
+  workflow_dispatch:
+  release:
+    types: [ created ]
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout latest code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      - name: Publish package
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

build.gradle

@@ -1,122 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
-    }
-}
-
-plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'maven-publish'
-    id 'java'
-}
-
-dependencies {
-    implementation project(":eco-core").getSubprojects()
-}
-
-allprojects {
-    apply plugin: 'java'
-    apply plugin: 'kotlin'
-    apply plugin: 'maven-publish'
-    apply plugin: 'com.github.johnrengelman.shadow'
-
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven { url 'https://jitpack.io' }
-        maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-        maven { url 'https://repo.codemc.org/repository/nms/' }
-        maven { url 'https://repo.codemc.io/repository/maven-public/' }
-        maven { url 'https://repo.dmulloy2.net/repository/public/' }
-        maven { url 'https://repo.essentialsx.net/releases/' }
-        maven { url 'https://mvn.lumine.io/repository/maven-public/' }
-    }
-
-    jar {
-        onlyIf { !sourceSets.main.allSource.files.isEmpty() }
-    }
-
-    shadowJar {
-        relocate('com.willfp.libreforge', 'com.willfp.ecopets.libreforge')
-        relocate('org.joml', 'com.willfp.ecopets.libreforge.joml')
-    }
-
-    dependencies {
-        compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.97.0'
-        implementation 'org.joml:joml:1.10.4'
-
-        compileOnly 'org.jetbrains:annotations:23.0.0'
-
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
-    }
-
-    tasks.withType(JavaCompile) {
-        options.deprecation = true
-        options.encoding = 'UTF-8'
-    }
-
-    processResources {
-        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**lang.yml"]) {
-            expand projectVersion: project.version
-        }
-    }
-
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            jvmTarget = "17"
-            freeCompilerArgs = ['-Xjvm-default=all']
-        }
-    }
-
-    java.sourceCompatibility = JavaVersion.VERSION_17
-    java.targetCompatibility = JavaVersion.VERSION_17
-
-    compileJava.options.encoding = 'UTF-8'
-    compileJava.dependsOn clean
-
-    build.dependsOn shadowJar
-}
-
-tasks.withType(Jar) {
-    destinationDirectory = file("$rootDir/bin/")
-}
-
-clean.doLast {
-    file("${rootDir}/bin").deleteDir()
-}
-
-shadowJar {
-    archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
-}
-
-jar {
-    archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar"
-}
-
-group = 'com.willfp'
-archivesBaseName = project.name
-version = findProperty("version")
-
-compileJava.options.encoding = 'UTF-8'
-
-
-build.dependsOn shadowJar
-build.dependsOn publishToMavenLocal
-
-task buyThePlugins {
-    dependsOn subprojects.build
-
-    doLast {
-        println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
-        println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
-        println 'Polymart: https://polymart.org/user/auxilor.1107/'
-        println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
-    }
-}
-build.finalizedBy buyThePlugins

build.gradle.kts

@@ -0,0 +1,84 @@
+plugins {
+    java
+    `java-library`
+    `maven-publish`
+    kotlin("jvm") version "1.7.10"
+    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
+}
+
+group = "com.willfp"
+version = findProperty("version")!!
+val libreforgeVersion = findProperty("libreforge-version")
+
+base {
+    archivesName.set(project.name)
+}
+
+dependencies {
+    project(":eco-core").dependencyProject.subprojects {
+        implementation(this)
+    }
+}
+
+allprojects {
+    apply(plugin = "java")
+    apply(plugin = "kotlin")
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.github.johnrengelman.shadow")
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+
+        maven("https://repo.papermc.io/repository/maven-public/")
+        maven("https://repo.auxilor.io/repository/maven-public/")
+        maven("https://jitpack.io")
+        maven("https://mvn.lumine.io/repository/maven-public/")
+    }
+
+    dependencies {
+        compileOnly("com.willfp:eco:6.55.0")
+        compileOnly("org.jetbrains:annotations:23.0.0")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+    }
+
+    java {
+        withSourcesJar()
+        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    }
+
+    tasks {
+        shadowJar {
+            relocate("com.willfp.libreforge.loader", "com.willfp.ecopets.libreforge.loader")
+            relocate("com.willfp.ecomponent", "com.willfp.ecopets.ecomponent")
+        }
+
+        compileKotlin {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+
+        compileJava {
+            options.isDeprecation = true
+            options.encoding = "UTF-8"
+
+            dependsOn(clean)
+        }
+
+        processResources {
+            filesMatching(listOf("**plugin.yml", "**eco.yml")) {
+                expand(
+                    "version" to project.version,
+                    "libreforgeVersion" to libreforgeVersion,
+                    "pluginName" to rootProject.name
+                )
+            }
+        }
+
+        build {
+            dependsOn(shadowJar)
+        }
+    }
+}

config/checkstyle/checkstyle.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      https://docs.oracle.com/javase/specs/jls/se11/html/index.html
-
-    - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
-
-    - the Javadoc guidelines at
-      https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
-
-    - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  https://checkstyle.org (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-  To suppress certain violations please review suppression filters.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-    <module name="SuppressionFilter">
-        <property name="file" value="config/checkstyle/suppression.xml"/>
-    </module>
-
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        https://checkstyle.org/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <property name="severity" value="error"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See https://checkstyle.org/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See https://checkstyle.org/config_sizes.html -->
-    <module name="FileLength"/>
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="200"/>
-    </module>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See https://checkstyle.org/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See https://checkstyle.org/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See https://checkstyle.org/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Javadoc comments. -->
-        <!-- See https://checkstyle.org/config_javadoc.html -->
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-        <module name="MissingJavadocMethod"/>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See https://checkstyle.org/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See https://checkstyle.org/config_imports.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-            <property name="processJavadoc" value="true"/>
-        </module>
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See https://checkstyle.org/config_sizes.html -->
-        <!-- <module name="MethodLength"/> -->
-        <module name="ParameterNumber"/>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See https://checkstyle.org/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See https://checkstyle.org/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See https://checkstyle.org/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See https://checkstyle.org/config_coding.html -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See https://checkstyle.org/config_design.html -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-        <!-- <module name="HideUtilityClassConstructor"/> -->
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-        <module name="RequireThis"/>
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See https://checkstyle.org/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-    </module>
-</module>

config/checkstyle/suppression.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <!-- Fields don't need javadoc -->
-    <suppress files="Effects.java" checks="JavadocVariable"/>
-    <suppress files="Skills.java" checks="JavadocVariable"/>
-    <suppress files="Stats.java" checks="JavadocVariable"/>
-</suppressions>

eco-core/build.gradle

@@ -1,2 +0,0 @@
-group 'com.willfp'
-version rootProject.version

eco-core/build.gradle.kts

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

eco-core/core-plugin/build.gradle

@@ -1,21 +0,0 @@
-group 'com.willfp'
-version rootProject.version
-
-dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.0'
-    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:R2.5.0'
-}
-
-build.dependsOn publishToMavenLocal
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from(components.java)
-        }
-    }
-}

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

@@ -0,0 +1,41 @@
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
+    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")
+}
+
+publishing {
+    publications {
+        register<MavenPublication>("maven") {
+            groupId = project.group.toString()
+            version = project.version.toString()
+            artifactId = rootProject.name
+
+            artifact(rootProject.tasks.shadowJar.get().archiveFile)
+        }
+    }
+
+    publishing {
+        repositories {
+            maven {
+                name = "auxilor"
+                url = uri("https://repo.auxilor.io/repository/maven-releases/")
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
+}
+
+tasks {
+    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

@@ -3,31 +3,61 @@ package com.willfp.ecopets
 import com.willfp.eco.core.command.impl.PluginCommand
 import com.willfp.eco.core.integrations.IntegrationLoader
 import com.willfp.eco.core.placeholder.PlayerPlaceholder
-import com.willfp.eco.util.toSingletonList
+import com.willfp.ecopets.commands.CommandEcoPets
-import com.willfp.ecopets.commands.CommandEcopets
 import com.willfp.ecopets.commands.CommandPets
+import com.willfp.ecopets.libreforge.ConditionHasActivePet
+import com.willfp.ecopets.libreforge.ConditionHasPetLevel
+import com.willfp.ecopets.libreforge.EffectGivePetXp
+import com.willfp.ecopets.libreforge.EffectPetXpMultiplier
+import com.willfp.ecopets.libreforge.FilterPet
+import com.willfp.ecopets.libreforge.TriggerGainPetXp
+import com.willfp.ecopets.libreforge.TriggerLevelUpPet
 import com.willfp.ecopets.pets.DiscoverRecipeListener
 import com.willfp.ecopets.pets.PetDisplay
 import com.willfp.ecopets.pets.PetLevelListener
-import com.willfp.ecopets.pets.PetTriggerXPGainListener
+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.entity.ModelEnginePetEntity
 import com.willfp.ecopets.pets.entity.PetEntity
-import com.willfp.libreforge.LibReforgePlugin
+import com.willfp.libreforge.SimpleProvidedHolder
+import com.willfp.libreforge.conditions.Conditions
+import com.willfp.libreforge.effects.Effects
+import com.willfp.libreforge.filters.Filters
+import com.willfp.libreforge.loader.LibreforgePlugin
+import com.willfp.libreforge.loader.configs.ConfigCategory
+import com.willfp.libreforge.registerHolderProvider
+import com.willfp.libreforge.triggers.Triggers
 import org.bukkit.event.Listener
 
-class EcoPetsPlugin : LibReforgePlugin() {
+class EcoPetsPlugin : LibreforgePlugin() {
     private val petDisplay = PetDisplay(this)
 
     init {
         instance = this
-        registerHolderProvider { it.activePetLevel?.toSingletonList() ?: emptyList() }
     }
 
-    override fun handleEnableAdditional() {
+    override fun loadConfigCategories(): List<ConfigCategory> {
-        this.copyConfigs("pets")
+        return listOf(
+            Pets
+        )
+    }
+
+    override fun handleEnable() {
+        Conditions.register(ConditionHasPetLevel)
+        Conditions.register(ConditionHasActivePet)
+        Effects.register(EffectPetXpMultiplier)
+        Effects.register(EffectGivePetXp)
+        Triggers.register(TriggerGainPetXp)
+        Triggers.register(TriggerLevelUpPet)
+        Filters.register(FilterPet)
+        
+        registerHolderProvider {
+            it.activePetLevel?.let { l ->
+                listOf(SimpleProvidedHolder(l))
+            } ?: emptyList()
+        }
 
         PlayerPlaceholder(
             this,
@@ -40,21 +70,25 @@ class EcoPetsPlugin : LibReforgePlugin() {
         ) { it.activePet?.id ?: "" }.register()
     }
 
-    override fun handleReloadAdditional() {
+    override fun handleReload() {
+        if (!this.configYml.getBool("pet-entity.enabled")) {
+            return
+        }
+
         this.scheduler.runTimer(1, 1) {
             petDisplay.tickAll()
         }
     }
 
-    override fun handleDisableAdditional() {
+    override fun handleDisable() {
         petDisplay.shutdown()
     }
 
-    override fun loadAdditionalIntegrations(): List<IntegrationLoader> {
+    override fun loadIntegrationLoaders(): List<IntegrationLoader> {
         return listOf(
             IntegrationLoader("ModelEngine") {
                 PetEntity.registerPetEntity("modelengine") { pet, id ->
-                    ModelEnginePetEntity(pet, id)
+                    ModelEnginePetEntity(pet, id, this)
                 }
             }
         )
@@ -62,7 +96,7 @@ class EcoPetsPlugin : LibReforgePlugin() {
 
     override fun loadPluginCommands(): List<PluginCommand> {
         return listOf(
-            CommandEcopets(this),
+            CommandEcoPets(this),
             CommandPets(this)
         )
     }
@@ -70,20 +104,14 @@ class EcoPetsPlugin : LibReforgePlugin() {
     override fun loadListeners(): List<Listener> {
         return listOf(
             PetLevelListener(this),
-            PetTriggerXPGainListener,
             SpawnEggHandler(this),
             petDisplay,
             DiscoverRecipeListener(this)
         )
     }
 
-    override fun getMinimumEcoVersion(): String {
-        return "6.37.0"
-    }
-
     companion object {
         @JvmStatic
         lateinit var instance: EcoPetsPlugin
     }
 }
-

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/api/event/PetEvent.kt

@@ -0,0 +1,7 @@
+package com.willfp.ecopets.api.event
+
+import com.willfp.ecopets.pets.Pet
+
+interface PetEvent {
+    val pet: Pet
+}

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

@@ -1,18 +1,17 @@
 package com.willfp.ecopets.api.event
 
-import org.bukkit.entity.Player
 import com.willfp.ecopets.pets.Pet
-import org.bukkit.event.player.PlayerEvent
+import org.bukkit.entity.Player
-import org.bukkit.event.HandlerList
-import com.willfp.ecopets.api.event.PlayerPetExpGainEvent
 import org.bukkit.event.Cancellable
+import org.bukkit.event.HandlerList
+import org.bukkit.event.player.PlayerEvent
 
 class PlayerPetExpGainEvent(
     who: Player,
-    val pet: Pet,
+    override val pet: Pet,
     var amount: Double,
     val isMultiply: Boolean
-) : PlayerEvent(who), Cancellable {
+) : PlayerEvent(who), Cancellable, PetEvent {
     private var cancelled = false
 
     override fun setCancelled(cancel: Boolean) {

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

@@ -1,16 +1,15 @@
 package com.willfp.ecopets.api.event
 
-import org.bukkit.entity.Player
 import com.willfp.ecopets.pets.Pet
-import org.bukkit.event.player.PlayerEvent
+import org.bukkit.entity.Player
 import org.bukkit.event.HandlerList
-import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent
+import org.bukkit.event.player.PlayerEvent
 
 class PlayerPetLevelUpEvent(
     who: Player,
-    val pet: Pet,
+    override val pet: Pet,
     val level: Int
-) : PlayerEvent(who) {
+) : PlayerEvent(who), PetEvent {
     override fun getHandlers(): HandlerList {
         return handlerList
     }

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

@@ -0,0 +1,65 @@
+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.pets.Pets
+import com.willfp.ecopets.pets.activePet
+import com.willfp.ecopets.pets.hasPet
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
+
+class CommandActivate(plugin: EcoPlugin) : Subcommand(plugin, "activate", "ecopets.command.activate", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (args.isEmpty()) {
+            player.sendMessage(plugin.langYml.getMessage("needs-pet"))
+            return
+        }
+
+        val id = args[0]
+
+        val pet = Pets.getByID(id)
+
+        if (pet == null || !player.hasPet(pet)) {
+            player.sendMessage(plugin.langYml.getMessage("invalid-pet"))
+            return
+        }
+
+        if (player.activePet == pet) {
+            player.sendMessage(plugin.langYml.getMessage("pet-already-active"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("activated-pet", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%pet%", pet.name)
+        )
+        player.activePet = pet
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        if (sender !is Player) {
+            return emptyList()
+        }
+
+        val completions = mutableListOf<String>()
+        if (args.isEmpty()) {
+            // Currently, this case is not ever reached
+            return Pets.values().filter { sender.hasPet(it) }.map { it.id }
+        }
+
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[0],
+                Pets.values().filter { sender.hasPet(it) }.map { it.id },
+                completions
+            )
+            return completions
+        }
+
+        return emptyList()
+    }
+}

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

@@ -0,0 +1,26 @@
+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.pets.activePet
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class CommandDeactivate(plugin: EcoPlugin) : Subcommand(plugin, "deactivate", "ecopets.command.deactivate", true) {
+    override fun onExecute(player: CommandSender, args: List<String>) {
+        player as Player
+
+        if (player.activePet == null) {
+            player.sendMessage(plugin.langYml.getMessage("no-pet-active"))
+            return
+        }
+
+        player.sendMessage(
+            plugin.langYml.getMessage("deactivated-pet", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
+                .replace("%pet%", player.activePet?.name ?: "")
+        )
+
+        player.activePet = null
+    }
+}

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

@@ -4,7 +4,7 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
 import org.bukkit.command.CommandSender
 
-class CommandEcopets(plugin: EcoPlugin) : PluginCommand(plugin, "ecopets", "ecopets.command.ecopets", false) {
+class CommandEcoPets(plugin: EcoPlugin) : PluginCommand(plugin, "ecopets", "ecopets.command.ecopets", false) {
     init {
         this.addSubcommand(CommandReload(plugin))
             .addSubcommand(CommandGive(plugin))

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/commands/CommandPets.kt

@@ -7,6 +7,11 @@ import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class CommandPets(plugin: EcoPlugin) : PluginCommand(plugin, "pets", "ecopets.command.pets", true) {
+    init {
+        this.addSubcommand(CommandActivate(plugin))
+            .addSubcommand(CommandDeactivate(plugin))
+    }
+
     override fun onExecute(player: CommandSender, args: List<String>) {
         player as Player
         PetsGUI.open(player)

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

@@ -0,0 +1,22 @@
+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.arguments
+import com.willfp.libreforge.conditions.Condition
+import org.bukkit.entity.Player
+
+object ConditionHasActivePet : Condition<NoCompileData>("has_active_pet") {
+    override val arguments = arguments {
+        require("pet", "You must specify the 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/kotlin/com/willfp/ecopets/libreforge/ConditionHasPetLevel.kt

@@ -0,0 +1,32 @@
+package com.willfp.ecopets.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecopets.api.EcoPetsAPI
+import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent
+import com.willfp.ecopets.pets.Pets
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.arguments
+import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.updateEffects
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
+
+object ConditionHasPetLevel : Condition<NoCompileData>("has_pet_level") {
+    override val arguments = arguments {
+        require("pet", "You must specify the pet!")
+        require("level", "You must specify the level!")
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    fun handle(event: PlayerPetLevelUpEvent) {
+        event.player.updateEffects()
+    }
+
+    override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean {
+        return EcoPetsAPI.instance.getPetLevel(
+            player,
+            Pets.getByID(config.getString("pet").lowercase()) ?: return false
+        ) >= config.getIntFromExpression("level", player)
+    }
+}

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

@@ -0,0 +1,33 @@
+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.arguments
+import com.willfp.libreforge.effects.Effect
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+
+object EffectGivePetXp : Effect<NoCompileData>("give_pet_xp") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER
+    )
+
+    override val arguments = arguments {
+        require("amount", "You must specify the amount of xp to give!")
+        require("pet", "You must specify the pet to give xp for!")
+    }
+
+    override fun onTrigger(config: Config, data: TriggerData, compileData: NoCompileData): Boolean {
+        val player = data.player ?: return false
+
+        EcoPetsAPI.instance.givePetExperience(
+            player,
+            Pets.getByID(config.getString("pet")) ?: return false,
+            config.getDoubleFromExpression("amount", player)
+        )
+
+        return true
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.willfp.ecopets.libreforge
+
+import com.willfp.ecopets.api.event.PlayerPetExpGainEvent
+import com.willfp.ecopets.pets.Pet
+import com.willfp.ecopets.pets.Pets
+import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
+import org.bukkit.event.EventHandler
+
+object EffectPetXpMultiplier : MultiMultiplierEffect<Pet>("pet_xp_multiplier") {
+    override val key = "pets"
+
+    override fun getElement(key: String): Pet? {
+        return Pets.getByID(key.lowercase())
+    }
+
+    override fun getAllElements(): Collection<Pet> {
+        return Pets.values()
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerPetExpGainEvent) {
+        val player = event.player
+
+        event.amount *= getMultiplier(player, event.pet)
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.willfp.ecopets.libreforge
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.ecopets.api.event.PetEvent
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.filters.Filter
+import com.willfp.libreforge.triggers.TriggerData
+
+object FilterPet : Filter<NoCompileData, Collection<String>>("pet") {
+    override fun getValue(config: Config, data: TriggerData?, key: String): Collection<String> {
+        return config.getStrings(key)
+    }
+
+    override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
+        val event = data.event as? PetEvent ?: return false
+
+        return value.any { petName ->
+            petName.equals(event.pet.id, ignoreCase = true)
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.willfp.ecopets.libreforge
+
+import com.willfp.ecopets.api.event.PlayerPetExpGainEvent
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import org.bukkit.event.EventHandler
+
+object TriggerGainPetXp : Trigger("gain_pet_xp") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.LOCATION,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerPetExpGainEvent) {
+        val player = event.player
+
+        this.dispatch(
+            player,
+            TriggerData(
+                player = player,
+                location = player.location,
+                event = event,
+                value = event.amount
+            )
+        )
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.willfp.ecopets.libreforge
+
+import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import org.bukkit.event.EventHandler
+
+object TriggerLevelUpPet : Trigger("level_up_pet") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.LOCATION,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: PlayerPetLevelUpEvent) {
+        val player = event.player
+
+        this.dispatch(
+            player,
+            TriggerData(
+                player = player,
+                location = player.location,
+                event = event,
+                value = event.level.toDouble()
+            )
+        )
+    }
+}

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

@@ -14,6 +14,7 @@ import com.willfp.eco.core.placeholder.PlayerStaticPlaceholder
 import com.willfp.eco.core.placeholder.PlayerlessPlaceholder
 import com.willfp.eco.core.recipe.Recipes
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import com.willfp.eco.core.registry.Registrable
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.formatEco
 import com.willfp.eco.util.toNiceString
@@ -21,18 +22,18 @@ import com.willfp.ecopets.EcoPetsPlugin
 import com.willfp.ecopets.api.event.PlayerPetExpGainEvent
 import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent
 import com.willfp.ecopets.pets.entity.PetEntity
+import com.willfp.libreforge.ViolationContext
+import com.willfp.libreforge.conditions.ConditionList
 import com.willfp.libreforge.conditions.Conditions
-import com.willfp.libreforge.conditions.ConfiguredCondition
+import com.willfp.libreforge.counters.Counters
-import com.willfp.libreforge.effects.ConfiguredEffect
+import com.willfp.libreforge.effects.EffectList
 import com.willfp.libreforge.effects.Effects
-import com.willfp.libreforge.triggers.Trigger
-import com.willfp.libreforge.triggers.Triggers
 import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import org.bukkit.persistence.PersistentDataType
-import java.util.*
+import java.util.Objects
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 
@@ -40,7 +41,7 @@ class Pet(
     val id: String,
     val config: Config,
     private val plugin: EcoPetsPlugin
-) {
+) : Registrable {
     val name = config.getFormattedString("name")
     val description = config.getFormattedString("description")
 
@@ -113,6 +114,7 @@ class Pet(
     }
 
     val entityTexture = config.getString("entity-texture")
+    val modelEngineAnimation = config.getStringOrNull("modelengine-animation")
 
     private val levelXpRequirements = listOf(0) + config.getInts("level-xp-requirements")
 
@@ -122,8 +124,8 @@ class Pet(
 
     private val baseItem: ItemStack = Items.lookup(config.getString("icon")).item
 
-    private val effects: Set<ConfiguredEffect>
+    private val effects: EffectList
-    private val conditions: Set<ConfiguredCondition>
+    private val conditions: ConditionList
 
     private val levels = Caffeine.newBuilder()
         .build<Int, PetLevel>()
@@ -149,18 +151,11 @@ class Pet(
         }
 
     private val petXpGains = config.getSubsections("xp-gain-methods").mapNotNull {
-        val trigger = Triggers.getById(it.getString("id")) ?: return@mapNotNull null
+        Counters.compile(
-        val multiplier = it.getDouble("multiplier")
+            it,
-        val conditions = it.getSubsections("conditions")
+            ViolationContext(plugin, "Pet $id XP Gain methods")
-            .mapNotNull { cfg -> Conditions.compile(cfg, "Pet $id XP Gain methods") }
-
-        trigger to PetXPGain(
-            trigger,
-            multiplier,
-            conditions,
-            it.getSubsection("filters")
         )
-    }.toMap()
+    }
 
     init {
         config.injectPlaceholders(
@@ -171,13 +166,15 @@ class Pet(
             }
         )
 
-        effects = config.getSubsections("effects").mapNotNull {
+        effects = Effects.compile(
-            Effects.compile(it, "Pet $id")
+            config.getSubsections("effects"),
-        }.toSet()
+            ViolationContext(plugin, "Pet $id")
+        )
 
-        conditions = config.getSubsections("conditions").mapNotNull {
+        conditions = Conditions.compile(
-            Conditions.compile(it, "Pet $id")
+            config.getSubsections("conditions"),
-        }.toSet()
+            ViolationContext(plugin, "Pet $id")
+        )
 
         for (string in config.getStrings("level-commands")) {
             val split = string.split(":")
@@ -246,7 +243,7 @@ class Pet(
     }
 
     fun getLevel(level: Int): PetLevel = levels.get(level) {
-        PetLevel(this, it, effects, conditions)
+        PetLevel(plugin, this, it, effects, conditions)
     }
 
     private fun getLevelUpMessages(level: Int, whitespace: Int = 0): List<String> = levelUpMessages.get(level) {
@@ -352,6 +349,14 @@ class Pet(
         return processed.flatten().formatEco(player)
     }
 
+    override fun onRegister() {
+        petXpGains.forEach { it.bind(PetXPAccumulator(this)) }
+    }
+
+    override fun onRemove() {
+        petXpGains.forEach { it.unbind() }
+    }
+
     fun getIcon(player: Player): ItemStack {
         val base = baseItem.clone()
 
@@ -402,8 +407,8 @@ class Pet(
         }
     }
 
-    fun getPetXPGain(trigger: Trigger): PetXPGain? {
+    override fun getID(): String {
-        return petXpGains[trigger]
+        return this.id
     }
 
     override fun equals(other: Any?): Boolean {
@@ -493,7 +498,7 @@ private val expMultiplierCache = Caffeine.newBuilder()
     }
 
 val Player.petExperienceMultiplier: Double
-    get() = expMultiplierCache.get(this)
+    get() = expMultiplierCache.get(this)!!
 
 private fun Player.cacheSkillExperienceMultiplier(): Double {
     if (this.hasPermission("ecopets.xpmultiplier.quadruple")) {

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

@@ -9,8 +9,10 @@ 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 java.util.*
+import org.bukkit.event.player.PlayerTeleportEvent
+import java.util.UUID
 import kotlin.math.PI
 import kotlin.math.abs
 
@@ -34,6 +36,12 @@ 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)
                 .replace("%pet%", pet.name)
@@ -44,10 +52,8 @@ class PetDisplay(
 
             location.y += NumberUtils.fastSin(tick / (2 * PI) * 0.5) * 0.15
 
-            try {
+            if (location.world != null) {
                 stand.teleport(location)
-            } catch (_: Exception) {
-
             }
 
             if (!pet.entityTexture.contains(":")) {
@@ -76,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
 
@@ -109,10 +119,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()
+        remove(event.player)
-        trackedEntities.remove(event.player.uniqueId)
+    }
+
+    @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/PetLevel.kt

@@ -1,14 +1,16 @@
 package com.willfp.ecopets.pets
 
+import com.willfp.eco.core.EcoPlugin
 import com.willfp.libreforge.Holder
-import com.willfp.libreforge.conditions.ConfiguredCondition
+import com.willfp.libreforge.conditions.ConditionList
-import com.willfp.libreforge.effects.ConfiguredEffect
+import com.willfp.libreforge.effects.EffectList
 
 class PetLevel(
+    plugin: EcoPlugin,
     val pet: Pet,
     val level: Int,
-    override val effects: Set<ConfiguredEffect>,
+    override val effects: EffectList,
-    override val conditions: Set<ConfiguredCondition>
+    override val conditions: ConditionList
 ) : Holder {
-    override val id = "${pet.id}_$level"
+    override val id = plugin.createNamespacedKey("${pet.id}_$level")
 }

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

@@ -3,69 +3,72 @@ 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
 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
+                return ItemStackBuilder(Items.lookup(plugin.configYml.getString("level-gui.progression-slots.$key.item")))
-        for (row in progressionPattern) {
+                    .setDisplayName(
-            x++
+                        plugin.configYml.getFormattedString("level-gui.progression-slots.$key.name")
-            var y = 0
+                            .replace("%pet%", pet.name)
-            for (char in row) {
+                            .replace("%level%", level.toString())
-                y++
+                            .replace("%level_numeral%", NumberUtils.toNumeral(level))
-                if (char == '0') {
+                    )
-                    continue
+                    .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)
+            override fun getLevelState(player: Player, level: Int): LevelState {
-
+                return when {
-                if (pos == -1) {
+                    level <= player.getPetLevel(pet) -> LevelState.UNLOCKED
-                    continue
+                    level == player.getPetLevel(pet) + 1 -> LevelState.IN_PROGRESS
-                }
+                    else -> LevelState.LOCKED
-
+                }
-                progressionSlots[pos + 1] = Pair(x, y)
             }
         }
-
-        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,
@@ -73,58 +76,11 @@ class PetLevelGUI(
                 )
             )
 
-            for ((level, value) in progressionSlots) {
+            addComponent(1, 1, component)
-                setSlot(
-                    value.first,
-                    value.second,
-                    slot(ItemStack(Material.BLACK_STAINED_GLASS_PANE)) {
-                        setUpdater { player, menu, _ ->
-                            val page = getPage(menu, player)
 
-                            val slotLevel = ((page - 1) * levelsPerPage) + level
+            // Instead of the page changer, this will show up when on the first page
-
+            addComponent(
-                            fun getItem(section: String) =
+                MenuLayer.LOWER,
-                                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(
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.prev-page.location.column"),
                 slot(
@@ -132,39 +88,32 @@ class PetLevelGUI(
                         .setDisplayName(plugin.configYml.getString("level-gui.progression-slots.prev-page.name"))
                         .build()
                 ) {
-                    onLeftClick { event, _, menu ->
+                    onLeftClick { player, _, _, _ -> PetsGUI.open(player) }
-                        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.addState(player, pageKey, newPage)
-                        }
-                    }
                 }
             )
-            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()
+                        .build(),
-                ) {
+                    PageChanger.Direction.FORWARDS
-                    onLeftClick { event, _, menu ->
-                        val player = event.whoClicked as Player
-
-                        val page = getPage(menu, player)
-
-                        val newPage = min(pages, page + 1)
-
-                        menu.addState(player, pageKey, newPage)
-                    }
-                }
                 )
+            )
+
             setSlot(
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.row"),
                 plugin.configYml.getInt("level-gui.progression-slots.close.location.column"),
@@ -178,8 +127,18 @@ class PetLevelGUI(
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("level-gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    ConfigSlot(config)
+                )
+            }
         }
     }
 
-    fun open(player: Player) = menu.open(player)
+    fun open(player: Player) {
+        menu.open(player)
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.willfp.ecopets.pets
+
+import com.willfp.libreforge.counters.Accumulator
+import org.bukkit.entity.Player
+
+class PetXPAccumulator(
+    private val pet: Pet
+) : Accumulator {
+    override fun accept(player: Player, count: Double) {
+        if (player.activePet != pet) {
+            return
+        }
+
+        player.givePetExperience(pet, count)
+    }
+}

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

@@ -1,43 +0,0 @@
-package com.willfp.ecopets.pets
-
-import com.willfp.eco.core.config.interfaces.Config
-import com.willfp.libreforge.conditions.ConfiguredCondition
-import com.willfp.libreforge.events.TriggerPreProcessEvent
-import com.willfp.libreforge.filters.Filter
-import com.willfp.libreforge.triggers.Trigger
-import org.bukkit.event.EventHandler
-import org.bukkit.event.Listener
-
-data class PetXPGain(
-    val trigger: Trigger,
-    val multiplier: Double,
-    val conditions: Iterable<ConfiguredCondition>,
-    val filters: Config
-)
-
-object PetTriggerXPGainListener : Listener {
-    @EventHandler(ignoreCancelled = true)
-    fun handle(event: TriggerPreProcessEvent) {
-        val player = event.player
-        val trigger = event.trigger
-        val value = event.value
-        val data = event.data
-
-        val pet = event.player.activePet ?: return
-
-        val xpGain = pet.getPetXPGain(trigger) ?: return
-
-        if (xpGain.conditions.any { !it.isMet(player) }) {
-            return
-        }
-
-        if (!Filter.matches(data, xpGain.filters)) {
-            return
-        }
-
-        player.givePetExperience(
-            pet,
-            value * xpGain.multiplier
-        )
-    }
-}

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

@@ -1,16 +1,20 @@
 package com.willfp.ecopets.pets
 
-import com.google.common.collect.BiMap
-import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableList
-import com.willfp.eco.core.config.ConfigType
+import com.willfp.eco.core.config.interfaces.Config
-import com.willfp.eco.core.config.TransientConfig
+import com.willfp.eco.core.registry.Registry
-import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.ecopets.EcoPetsPlugin
-import java.io.File
+import com.willfp.libreforge.loader.LibreforgePlugin
+import com.willfp.libreforge.loader.configs.ConfigCategory
+import com.willfp.libreforge.loader.configs.LegacyLocation
 
-object Pets {
+object Pets : ConfigCategory("pet", "pets") {
-    private val BY_ID: BiMap<String, Pet> = HashBiMap.create()
+    private val registry = Registry<Pet>()
+
+    override val legacyLocation = LegacyLocation(
+        "pets.yml",
+        "pets"
+    )
 
     /**
      * Get all registered [Pet]s.
@@ -19,7 +23,7 @@ object Pets {
      */
     @JvmStatic
     fun values(): List<Pet> {
-        return ImmutableList.copyOf(BY_ID.values)
+        return ImmutableList.copyOf(registry.values())
     }
 
     /**
@@ -30,50 +34,14 @@ object Pets {
      */
     @JvmStatic
     fun getByID(name: String): Pet? {
-        return BY_ID[name]
+        return registry[name]
     }
 
-    /**
+    override fun clear(plugin: LibreforgePlugin) {
-     * Update all [Pet]s.
+        registry.clear()
-     *
-     * @param plugin Instance of EcoPets.
-     */
-    @ConfigUpdater
-    @JvmStatic
-    fun update(plugin: EcoPetsPlugin) {
-        for (set in values()) {
-            removePet(set)
     }
 
-        val petsYml = TransientConfig(File(plugin.dataFolder, "pets.yml"), ConfigType.YAML)
+    override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
-
+        registry.register(Pet(id, config, plugin as EcoPetsPlugin))
-        for ((id, petConfig) in plugin.fetchConfigs("pets")) {
-            addNewPet(Pet(id, petConfig, plugin))
-        }
-
-        for (petConfig in petsYml.getSubsections("pets")) {
-            addNewPet(Pet(petConfig.getString("id"), petConfig, plugin))
-        }
-    }
-
-    /**
-     * Add new [Pet] to EcoPets.
-     *
-     * @param pet The [Pet] to add.
-     */
-    @JvmStatic
-    fun addNewPet(pet: Pet) {
-        BY_ID.remove(pet.id)
-        BY_ID[pet.id] = pet
-    }
-
-    /**
-     * Remove [Pet] from EcoPets.
-     *
-     * @param pet The [Pet] to remove.
-     */
-    @JvmStatic
-    fun removePet(pet: Pet) {
-        BY_ID.remove(pet.id)
     }
 }

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

@@ -3,7 +3,10 @@ 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
 import com.willfp.eco.core.gui.slot.MaskItems
 import com.willfp.eco.core.items.Items
@@ -20,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
@@ -54,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(
@@ -87,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
 
@@ -133,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"),
@@ -140,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.addState(player, pageKey, newPage)
+                        menu.setState(player, Page.PAGE_KEY, newPage)
+                        menu.callEvent(player, PageChangeEvent(newPage, page))
                     }
                 }
             )
@@ -159,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.addState(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)
                     }
                 }
             )
@@ -200,6 +202,29 @@ object PetsGUI {
                     }
                 }
             )
+
+            for (config in plugin.configYml.getSubsections("gui.custom-slots")) {
+                setSlot(
+                    config.getInt("row"),
+                    config.getInt("column"),
+                    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/kotlin/com/willfp/ecopets/pets/entity/ModelEnginePetEntity.kt

@@ -1,23 +1,41 @@
 package com.willfp.ecopets.pets.entity
 
 import com.ticxo.modelengine.api.ModelEngineAPI
+import com.willfp.ecopets.EcoPetsPlugin
 import com.willfp.ecopets.pets.Pet
 import org.bukkit.Location
 import org.bukkit.entity.ArmorStand
 
 class ModelEnginePetEntity(
     pet: Pet,
-    private val modelID: String
+    private val modelID: String,
+    private val plugin: EcoPetsPlugin
 ) : PetEntity(pet) {
     override fun spawn(location: Location): ArmorStand {
         val stand = emptyArmorStandAt(location, pet)
+        val meAnimation = pet.modelEngineAnimation
 
         val model = ModelEngineAPI.createActiveModel(modelID)
-        val modelled = ModelEngineAPI.createModeledEntity(stand)
-        modelled.addActiveModel(model)
 
-        // ModelEngine removed addActiveModel in new API release... for no reason. 
+        if (meAnimation != null) {
-        //modelled.addModel(model,true)
+            val animationHandler = model.animationHandler
+            val animationProperty = animationHandler.getAnimation(meAnimation)
+
+            if (animationProperty != null) {
+                animationHandler.playAnimation(animationProperty, true)
+            } else {
+                plugin.logger.warning("Animation $meAnimation not found in model $modelID, defaulting to walk!")
+                val animationPropertyWalk = animationHandler.getAnimation("walk")
+                if (animationPropertyWalk != null) {
+                    animationHandler.playAnimation(animationPropertyWalk, true)
+                } else {
+                    plugin.logger.warning("Walk animation not found in $modelID!")
+                }
+            }
+        }
+
+        val modelled = ModelEngineAPI.createModeledEntity(stand)
+        modelled.addModel(model, true)
 
         return stand
     }

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

@@ -49,6 +49,7 @@ internal fun emptyArmorStandAt(location: Location, pet: Pet): ArmorStand {
     }
 
     stand.isCustomNameVisible = true
+    @Suppress("DEPRECATION")
     stand.customName = pet.name
 
     return stand

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

@@ -14,6 +14,7 @@ class SkullPetEntity(pet: Pet) : PetEntity(pet) {
             .setSkullTexture(pet.entityTexture)
             .build()
 
+        @Suppress("UNNECESSARY_SAFE_CALL") // Can be null.
         stand.equipment?.helmet = skull
 
         return stand

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

@@ -1,21 +0,0 @@
-# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains
-
-chains:
-  - id: example_chain
-    effects:
-      - id: teleport
-      - id: potion_effect
-        args:
-          effect: blindness
-          level: 3
-          duration: 30
-          apply_to_player: true
-      - id: send_message
-        args:
-          message: "&fYou have been teleported!"
-          action_bar: true
-      - id: play_sound
-        args:
-          sound: entity_dragon_fireball_explode
-          pitch: 1.5
-          volume: 4

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

@@ -116,6 +116,9 @@ gui:
       row: 6
       column: 2
 
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  custom-slots: [ ]
+
 level-gui:
   rows: 6
 
@@ -210,7 +213,11 @@ level-gui:
       row: 6
       column: 5
 
+  # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots
+  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:
@@ -230,42 +237,3 @@ level-up:
     id: entity_player_levelup
     # Pitch between 0.5 and 2
     pitch: 1.3
-
-cannot-afford:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cooldown:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-cannot-afford-type:
-  in-actionbar: true
-  sound:
-    enabled: true
-    sound: "BLOCK_NOTE_BLOCK_PLING"
-    pitch: 0.5
-
-point-names: # If you have point names that look ugly (eg g_souls) then you can map them to nice names to be shown to players.
-  example_point: "Nicely Formatted Point"
-
-use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
-raytrace-distance: 80 # The distance that alt_click should check for a location
-block-item-drop-place-check: true # If the block_item_drop trigger should only fire on naturally placed blocks (prevents dupes)
-
-potions:
-  icon:
-    permanent: true
-    triggered: true
-  ambient:
-    permanent: false
-    triggered: true
-  particles:
-    permanent: false
-    triggered: true

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

@@ -1,3 +1,8 @@
+environment:
+  - name: libreforge version
+    value: ${libreforgeVersion}
+
+options:
   resource-id: 2534
   bstats-id: 15502
   color: "&#d977c2"

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

@@ -4,10 +4,7 @@ messages:
   not-player: "&cThis command must be run by a player"
   invalid-command: "&cUnknown subcommand!"
   reloaded: "Reloaded!"
-  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
+
-  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
-  on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
-  cannot-transmit: "&cYou can't transmit here!"
   needs-player: "&cYou must specify a player!"
   gave-xp: "&fYou have given &a%xp% &fXP to %player%&f's %pet%&f!"
   reset-xp: "&fYou have reset %player%&f's %pet%&f XP!"
@@ -21,6 +18,10 @@ messages:
   gave-pet-egg: "&fSuccessfully gave %player%&f the %pet%&f pet egg!"
   cannot-spawn-pet: "&cYou already have this pet unlocked!"
   invalid-amount: "&cInvalid amount!"
+  pet-already-active: "&cYou already have this pet active!"
+  no-pet-active: "&cYou don't have a pet active!"
+  activated-pet: "&fYou have activated the %pet%&f pet!"
+  deactivated-pet: "&fYou have deactivated the %pet%&f pet!"
 
 menu:
   title: "Pets"

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

@@ -0,0 +1,79 @@
+name: ${pluginName}
+version: ${version}
+main: com.willfp.ecopets.EcoPetsPlugin
+api-version: 1.19
+
+dependencies:
+  - name: eco
+    required: true
+    bootstrap: false
+
+  - name: libreforge
+    required: false
+    bootstrap: false
+
+load-after:
+  - name: eco
+    bootstrap: false
+
+
+permissions:
+  ecopets.*:
+    description: All ecopets permissions
+    default: op
+    children:
+      ecopets.command.*: true
+  ecopets.command.*:
+    description: All commands
+    default: op
+    children:
+      ecopets.command.ecopets: true
+      ecopets.command.reload: true
+      ecopets.command.pets: true
+      ecopets.command.give: true
+      ecopets.command.giveegg: true
+      ecopets.command.givexp: true
+      ecopets.command.reset: true
+      ecopets.command.activate: true
+      ecopets.command.deactivate: true
+
+  ecopets.command.reload:
+    description: Allows reloading the config
+    default: op
+  ecopets.command.ecopets:
+    description: Allows the use of /ecopets.
+    default: true
+  ecopets.command.pets:
+    description: Allows the use of /pets.
+    default: true
+  ecopets.command.give:
+    description: Allows the use of /ecopets give.
+    default: op
+  ecopets.command.giveegg:
+    description: Allows the use of /ecopets giveegg.
+    default: op
+  ecopets.command.givexp:
+    description: Allows the use of /ecopets givexp.
+    default: op
+  ecopets.command.reset:
+    description: Allows the use of /ecopets reset.
+    default: op
+  ecopets.command.activate:
+    description: Allows the use of /pets activate.
+    default: true
+  ecopets.command.deactivate:
+    description: Allows the use of /pets deactivate.
+    default: true
+
+  ecopets.xpmultiplier.50percent:
+    description: Gives the player 50% more skill experience
+    default: false
+  ecopets.xpmultiplier.double:
+    description: Gives the player 2x skill experience
+    default: false
+  ecopets.xpmultiplier.triple:
+    description: Gives the player 3x skill experience
+    default: false
+  ecopets.xpmultiplier.quadruple:
+    description: Gives the player 4x skill experience
+    default: false

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

@@ -116,6 +116,7 @@ conditions: [ ]
 # The texture of the pet entity in game
 # If you're using modelengine, use modelengine:id as the texture
 entity-texture: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0="
+modelengine-animation: "fly" # If you're using ModelEngine, you can specify an animation here
 
 # The icon in GUIs
 icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTA5NWZjYzFlM2Q3Y2JkMzUwZjE5YjM4OTQ5OGFiOGJiOTZjNjVhZDE4NWQzNDU5MjA2N2E3ZDAzM2FjNDhkZSJ9fX0=

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

@@ -1,29 +1,13 @@
-name: EcoPets
+name: ${pluginName}
-version: ${projectVersion}
+version: ${version}
 main: com.willfp.ecopets.EcoPetsPlugin
 api-version: 1.17
 authors: [ Auxilor ]
 website: willfp.com
-load: STARTUP
 depend:
   - eco
-  - ProtocolLib
-  - PlaceholderAPI
 softdepend:
-  - AureliumSkills
+  - libreforge
-  - Vault
-  - mcMMO
-  - Jobs
-  - TMMobcoins
-  - EcoEnchants
-  - EcoBosses
-  - Talismans
-  - EcoArmor
-  - EcoItems
-  - Boosters
-  - EcoSkills
-  - Reforges
-  - ModelEngine
 commands:
   ecopets:
     description: Base Command
@@ -52,6 +36,8 @@ permissions:
       ecopets.command.giveegg: true
       ecopets.command.givexp: true
       ecopets.command.reset: true
+      ecopets.command.activate: true
+      ecopets.command.deactivate: true
 
   ecopets.command.reload:
     description: Allows reloading the config
@@ -74,16 +60,22 @@ permissions:
   ecopets.command.reset:
     description: Allows the use of /ecopets reset.
     default: op
+  ecopets.command.activate:
+    description: Allows the use of /pets activate.
+    default: true
+  ecopets.command.deactivate:
+    description: Allows the use of /pets deactivate.
+    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,4 +1,5 @@
 #libreforge-updater
-#Sun Sep 11 19:28:00 BST 2022
+#Sat Jun 10 13:32:44 BST 2023
-version=1.33.0
+kotlin.code.style=official
-plugin-name=EcoPets
+libreforge-version=4.19.0
+version=2.18.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       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
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+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"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    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.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

settings.gradle

@@ -1,5 +0,0 @@
-rootProject.name = 'EcoPets'
-
-// Core
-include ':eco-core'
-include ':eco-core:core-plugin'

settings.gradle.kts

@@ -0,0 +1,14 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenLocal()
+        maven("https://repo.jpenilla.xyz/snapshots/")
+        maven("https://repo.auxilor.io/repository/maven-public/")
+    }
+}
+
+rootProject.name = "EcoPets"
+
+// Core
+include(":eco-core")
+include(":eco-core:core-plugin")