From df4abe39ebfbfe8a6b6ae4a3f9c0ac68f942d29a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 28 Mar 2023 17:12:35 +0100 Subject: [PATCH 1/8] Fixed tab completion for dynamically registered commands --- .../eco/internal/command/DelegatedBukkitCommand.kt | 12 +++++++++++- .../willfp/eco/internal/command/HandledCommand.kt | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt index 8a2ca25d..ee4bc70b 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/DelegatedBukkitCommand.kt @@ -1,5 +1,6 @@ package com.willfp.eco.internal.command +import org.bukkit.Location import org.bukkit.command.Command import org.bukkit.command.CommandSender import org.bukkit.command.PluginIdentifiableCommand @@ -21,7 +22,16 @@ class DelegatedBukkitCommand( label: String, args: Array? ): List { - return delegate.onTabComplete(sender, this, label, args) ?: emptyList() + return delegate.onTabComplete(sender, this, label, args) + } + + override fun tabComplete( + sender: CommandSender, + alias: String, + args: Array?, + location: Location? + ): List { + return delegate.onTabComplete(sender, this, alias, args) } override fun getPlugin() = delegate.plugin diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt index 0136c77b..3ead12e1 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt @@ -50,7 +50,7 @@ abstract class HandledCommand( command: Command, label: String, args: Array? - ): List? { + ): List { return handleTabComplete(sender, args?.toList() ?: listOf()) } From 3de8d0fed98c77388bfc09e7b5c48feb19d84a6f Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 28 Mar 2023 17:13:04 +0100 Subject: [PATCH 2/8] Updated to 6.53.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6c9fa00d..b329f782 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version = 6.53.0 +version = 6.53.1 plugin-name = eco kotlin.code.style = official \ No newline at end of file From f67a5d3b3d011c43025815afea5bf35783c1d2e7 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 29 Mar 2023 13:21:40 +0100 Subject: [PATCH 3/8] Added repo.auxilor.io --- .github/workflows/publish-release.yml | 2 ++ eco-api/build.gradle.kts | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index da70728e..10e3edb5 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -28,6 +28,8 @@ jobs: - name: Publish artifact env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} # The GITHUB_REF tag comes in the format 'refs/tags/xxx'. # So if we split on '/' and take the 3rd value, we can get the release name. diff --git a/eco-api/build.gradle.kts b/eco-api/build.gradle.kts index 8f68532b..2469709d 100644 --- a/eco-api/build.gradle.kts +++ b/eco-api/build.gradle.kts @@ -39,4 +39,17 @@ publishing { } } } + + 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") + } + } + } + } } From ffe9219f451d0f725c5afa18d24159a32d225dda Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 29 Mar 2023 13:33:24 +0100 Subject: [PATCH 4/8] Changed README to show repo.auxilor.io --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9996666a..79f194d3 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ eco comes packed with all the tools you need in your plugins: # For developers ## Javadoc -The 6.49.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.49.0/javadoc/) +The 6.53.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.53.0/javadoc/) ## Plugin Information @@ -75,31 +75,31 @@ depend: - eco ``` -## Get from JitPack: +## Dependency Information: Gradle: -```groovy +```kts repositories { - maven { url 'https://jitpack.io' } + maven("https://repo.auxilor.io/repository/maven-public/") } ``` ```groovy dependencies { - compileOnly 'com.willfp:eco:Tag' + compileOnly("com.willfp:eco:Tag") } ``` -Replace `Tag` with a release tag for eco, eg `6.49.0`. +Replace `Tag` with a release tag for eco, eg `6.53.0`. Maven: ```xml - jitpack.io - https://jitpack.io + auxilor + https://repo.auxilor.io/repository/maven-public/ ``` @@ -112,7 +112,7 @@ Maven: ``` -Replace `Tag` with a release tag for eco, eg `6.49.0`. +Replace `Tag` with a release tag for eco, eg `6.53.0`. ## Build locally: From 1852ff86ec5309397f4f1860766a00da4621b5b4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 30 Mar 2023 12:08:26 +0100 Subject: [PATCH 5/8] Fixed ContinuallyAppliedPersistentDataContainer --- .../eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt index 576a6dde..dae5af99 100644 --- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt +++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt @@ -289,4 +289,8 @@ private class ContinuallyAppliedPersistentDataContainer( handle.remove(key) fis.apply() } + + override fun has(p0: NamespacedKey, p1: PersistentDataType): Boolean { + return handle.has(p0, p1) + } } From d11f355c44c7c8e65c1e67d0f8af509cb83cda52 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 30 Mar 2023 12:08:37 +0100 Subject: [PATCH 6/8] Updated to 6.53.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b329f782..d11a869b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version = 6.53.1 +version = 6.53.2 plugin-name = eco kotlin.code.style = official \ No newline at end of file From 1a72cf3ca9cd81c9a00180e56d6434e7f513289a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 30 Mar 2023 14:04:43 +0100 Subject: [PATCH 7/8] Revert "Updated to 6.53.2" This reverts commit d11f355c44c7c8e65c1e67d0f8af509cb83cda52. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d11a869b..b329f782 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version = 6.53.2 +version = 6.53.1 plugin-name = eco kotlin.code.style = official \ No newline at end of file From 17fa5195014931968cb7e063b45daf0bd0037e1f Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 30 Mar 2023 14:04:43 +0100 Subject: [PATCH 8/8] Revert "Fixed ContinuallyAppliedPersistentDataContainer" This reverts commit 1852ff86ec5309397f4f1860766a00da4621b5b4. --- .../eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt index dae5af99..576a6dde 100644 --- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt +++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt @@ -289,8 +289,4 @@ private class ContinuallyAppliedPersistentDataContainer( handle.remove(key) fis.apply() } - - override fun has(p0: NamespacedKey, p1: PersistentDataType): Boolean { - return handle.has(p0, p1) - } }