From 90b63e53f384fb81d0fa6e06f6504c9c3c065716 Mon Sep 17 00:00:00 2001
From: Pablo Herrera <pabloherrerapalacio@gmail.com>
Date: Sat, 9 Sep 2023 08:42:27 +0200
Subject: [PATCH 01/10] Fix flags not tab-completing unless string is empty
 (#460)

---
 .../cloud/commandframework/CommandTree.java   |  7 +---
 .../CommandSuggestionsTest.java               | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
index 615c6d3c..41b789a1 100644
--- a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
+++ b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java
@@ -41,7 +41,6 @@ import cloud.commandframework.keys.SimpleCloudKey;
 import cloud.commandframework.permission.CommandPermission;
 import cloud.commandframework.permission.OrPermission;
 import cloud.commandframework.types.tuples.Pair;
-import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.TypeToken;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -613,10 +612,6 @@ public final class CommandTree<C> {
             if (!lastFlag.isPresent()) {
                 commandContext.remove(FlagArgument.FLAG_META_KEY);
             }
-        } else if (GenericTypeReflector.erase(child.getValue().getValueType().getType()).isArray()) {
-            while (commandQueue.size() > 1) {
-                commandQueue.remove();
-            }
         } else if (commandQueue.size() <= child.getValue().getParser().getRequestedArgumentCount()) {
             for (int i = 0; i < child.getValue().getParser().getRequestedArgumentCount() - 1
                     && commandQueue.size() > 1; i++) {
@@ -636,7 +631,7 @@ public final class CommandTree<C> {
             } else if (child.getValue() instanceof CompoundArgument) {
                 return this.directSuggestions(commandContext, child, ((LinkedList<String>) commandQueue).getLast());
             }
-        } else if (commandQueue.size() == 1 && commandQueue.peek().isEmpty()) {
+        } else if (commandQueue.size() == 1) {
             return this.directSuggestions(commandContext, child, commandQueue.peek());
         }
 
diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java
index dd51bd30..8a988066 100644
--- a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java
+++ b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework;
 
+import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.compound.ArgumentTriplet;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.standard.BooleanArgument;
@@ -37,8 +38,10 @@ import cloud.commandframework.types.tuples.Triplet;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.junit.Ignore;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static cloud.commandframework.util.TestUtils.createManager;
@@ -635,6 +638,41 @@ public class CommandSuggestionsTest {
         assertThat(suggestions6).isEmpty();
     }
 
+    @Test
+    void testTextFlagCompletion() {
+        // Arrange
+        final CommandManager<TestCommandSender> manager = createManager();
+        manager.setSetting(CommandManager.ManagerSettings.LIBERAL_FLAG_PARSING, true);
+        manager.command(
+                manager.commandBuilder("command")
+                        .flag(manager.flagBuilder("flag").withAliases("f")
+                                .withArgument(EnumArgument.of(TestEnum.class, "test")).build())
+                        .flag(manager.flagBuilder("flog").build())
+        );
+
+        // Act
+        final List<String> suggestions1 = suggest(manager, "command ");
+        final List<String> suggestions2 = suggest(manager, "command --");
+        final List<String> suggestions3 = suggest(manager, "command --f");
+        final List<String> suggestions4 = suggest(manager, "command --fla");
+        final List<String> suggestions5 = suggest(manager, "command -f");
+        final List<String> suggestions6 = suggest(manager, "command -");
+
+        final List<String> suggestions7 = suggest(manager, "command -f ");
+        final List<String> suggestions8 = suggest(manager, "command -f b");
+
+        // Assert
+        assertThat(suggestions1).containsExactly("--flag", "--flog", "-f");
+        assertThat(suggestions2).containsExactly("--flag", "--flog");
+        assertThat(suggestions3).containsExactly("--flag", "--flog");
+        assertThat(suggestions4).containsExactly("--flag");
+        assertThat(suggestions5).containsExactly("-f");
+        assertThat(suggestions6).containsExactly("--flag", "--flog", "-f");
+        assertThat(suggestions7).containsExactly("foo", "bar");
+        assertThat(suggestions8).containsExactly("bar");
+    }
+
+
     private List<String> suggest(CommandManager<TestCommandSender> manager, String command) {
         return manager.suggest(new TestCommandSender(), command);
     }

From 19bbfb1e24735eef2998ae91e815956424245cf0 Mon Sep 17 00:00:00 2001
From: Konicai <71294714+Konicai@users.noreply.github.com>
Date: Sat, 9 Sep 2023 02:48:42 -0400
Subject: [PATCH 02/10] Log cause of CommandExecutionException in fabric's
 default exception handler (#466)

---
 .../main/java/cloud/commandframework/fabric/FabricExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java
index bb3da343..5bf3df95 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java
@@ -158,7 +158,7 @@ final class FabricExecutor<C, S extends SharedSuggestionProvider> implements Com
                         LOGGER.warn(
                                 "Error occurred while executing command for user {}:",
                                 this.getName.apply(source),
-                                throwable
+                                throwable.getCause()
                         );
                     }
             );

From fda52448c20f5537c8f03aaf6a3b844119c20463 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sat, 9 Sep 2023 00:05:27 -0700
Subject: [PATCH 03/10] release: Version 1.8.4

---
 CHANGELOG.md              | 12 ++++++++++++
 README.md                 |  6 +++---
 cloud-minecraft/README.md | 22 +++++++++++-----------
 gradle.properties         |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74ec775d..419fcc1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.4]
+
+### Fixed
+- Core: Flags not tab-completing unless string is empty ([#460](https://github.com/Incendo/cloud/pull/460))
+- Core: Parser registry not properly resolving `TypeToken`s ([#454](https://github.com/Incendo/cloud/pull/454))
+- Fabric: Pottery pattern registry overriding default string parser for annotations
+- Fabric: Log cause of CommandExecutionException in fabric's default exception handler ([#466](https://github.com/Incendo/cloud/pull/466))
+
+### Changed
+- Core: Improved string parser supplier argument checking
+- Bukkit/Paper: Improve docs around Brigadier support
+
 ## [1.8.3]
 
 ### Changed
diff --git a/README.md b/README.md
index 3e422f85..d140fe9e 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Snapshot builds of Cloud are available through the [Sonatype OSS Snapshot reposi
 <dependency>  
  <groupId>cloud.commandframework</groupId>
  <artifactId>cloud-PLATFORM</artifactId>
- <version>1.8.3</version>
+ <version>1.8.4</version>
 </dependency>
 <!-- 
 ~    Optional: Allows you to use annotated methods
@@ -124,7 +124,7 @@ Snapshot builds of Cloud are available through the [Sonatype OSS Snapshot reposi
 <dependency>  
  <groupId>cloud.commandframework</groupId>
  <artifactId>cloud-annotations</artifactId>
- <version>1.8.3</version>
+ <version>1.8.4</version>
 </dependency>
 ``` 
 
@@ -185,7 +185,7 @@ repositories {
 
 ```kotlin
 dependencies {
-    implementation("cloud.commandframework", "cloud-PLATFORM", "1.8.3")
+    implementation("cloud.commandframework", "cloud-PLATFORM", "1.8.4")
 }
 ```
 
diff --git a/cloud-minecraft/README.md b/cloud-minecraft/README.md
index 2336d522..8edd0433 100644
--- a/cloud-minecraft/README.md
+++ b/cloud-minecraft/README.md
@@ -24,14 +24,14 @@ mappings will be available.
 <dependency>
     <groupId>cloud.commandframework</groupId>
     <artifactId>cloud-bukkit</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
 </dependency>
 ```
 
 **gradle**:
 ```groovy
 dependencies {
-    implementation 'cloud.commandframework:cloud-bukkit:1.8.3'
+    implementation 'cloud.commandframework:cloud-bukkit:1.8.4'
 }
 ```
 
@@ -93,14 +93,14 @@ mappings are available even without commodore present.
 <dependency>
     <groupId>cloud.commandframework</groupId>
     <artifactId>cloud-paper</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
 </dependency>
 ```
 
 **gradle**:
 ```groovy
 dependencies {
-    implementation 'cloud.commandframework:cloud-paper:1.8.3'
+    implementation 'cloud.commandframework:cloud-paper:1.8.4'
 }
 ```
 
@@ -118,14 +118,14 @@ BungeeCord mappings for cloud.
 <dependency>
     <groupId>cloud.commandframework</groupId>
     <artifactId>cloud-bungee</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
 </dependency>
 ```
 
 **gradle**:
 ```groovy
 dependencies {
-    implementation 'cloud.commandframework:cloud-bungee:1.8.3'
+    implementation 'cloud.commandframework:cloud-bungee:1.8.4'
 }
 ```
 
@@ -150,14 +150,14 @@ cloud mappings for Velocity 1.1.0.
 <dependency>
     <groupId>cloud.commandframework</groupId>
     <artifactId>cloud-velocity</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
 </dependency>
 ```
 
 **gradle**:
 ```groovy
 dependencies {
-    implementation 'cloud.commandframework:cloud-velocity:1.8.3'
+    implementation 'cloud.commandframework:cloud-velocity:1.8.4'
 }
 ```
 
@@ -181,14 +181,14 @@ cloud mappings for CloudBurst 1.0.0-SNAPSHOT.
 <dependency>
     <groupId>cloud.commandframework</groupId>
     <artifactId>cloud-cloudburst</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4</version>
 </dependency>
 ```
 
 **gradle**:
 ```groovy
 dependencies {
-    implementation 'cloud.commandframework:cloud-velocity:1.8.3'
+    implementation 'cloud.commandframework:cloud-velocity:1.8.4'
 }
 ```
 
@@ -217,7 +217,7 @@ the latest release of cloud.
 **gradle**:
 ```groovy
 dependencies {
-    modImplementation 'cloud.commandframework:cloud-fabric:1.8.3'
+    modImplementation 'cloud.commandframework:cloud-fabric:1.8.4'
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
index f80346d0..72e1e5d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=cloud.commandframework
-version=1.8.4-SNAPSHOT
+version=1.8.4
 description=Command framework and dispatcher for the JVM
 
 org.gradle.caching=true

From 0d617f26bbb39fe53130ffebddd7b3537b3a24e1 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 9 Nov 2023 13:36:27 -0700
Subject: [PATCH 04/10] Configure renovate

---
 .github/dependabot.yml |  7 -------
 renovate.json          | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)
 delete mode 100644 .github/dependabot.yml
 create mode 100644 renovate.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 158f38df..00000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "daily"
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000..a5e5677d
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "baseBranches" : [
+    "/^[0-9].[0-9].[0-9]\\-dev$/"
+  ],
+  "ignoreDeps": [
+    "com.mojang:minecraft",
+    "quiet-fabric-loom"
+  ],
+  "labels": [
+    "dependencies"
+  ],
+  "packageRules": [
+    {
+      "description": "Correct version handling for dependencies with format major.minor.patch+mcver",
+      "matchPackageNames": ["net.fabricmc.fabric-api:fabric-api", "net.fabricmc.fabric-api:fabric-api-deprecated"],
+      "versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?:\\+(?<compatibility>.*))?$"
+    },
+    {
+      "matchManagers": ["github-actions", "gradle-wrapper"],
+      "groupName": "gradle and github actions"
+    },
+    {
+      "matchDepTypes": ["plugin"],
+      "groupName": "gradle and github actions"
+    },
+    {
+      "matchPaths": ["build-logic/*", "buildSrc/*"],
+      "groupName": "gradle and github actions"
+    }
+  ],
+  "semanticCommitType": "build",
+  "commitMessagePrefix": "chore(deps): "
+}

From 30c3094d8a4309e7ef57cd6abd852c1c9d6adc07 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 9 Nov 2023 13:52:57 -0700
Subject: [PATCH 05/10] renovate: only target 1.x.x-dev for now

---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index a5e5677d..bec80d4e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,7 +4,7 @@
     "config:base"
   ],
   "baseBranches" : [
-    "/^[0-9].[0-9].[0-9]\\-dev$/"
+    "/^1.[0-9].[0-9]\\-dev$/"
   ],
   "ignoreDeps": [
     "com.mojang:minecraft",

From 980ba0dfb376496fe58e37da2acb7a59ddfd010f Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 9 Nov 2023 14:09:16 -0700
Subject: [PATCH 06/10] renovate: ignore guava and brigadier

- we want to keep using old guava to avoid breaking compat
- can't run renovate for brig since mojangs maven has invalid meta
---
 renovate.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index bec80d4e..a2c8eb19 100644
--- a/renovate.json
+++ b/renovate.json
@@ -8,7 +8,9 @@
   ],
   "ignoreDeps": [
     "com.mojang:minecraft",
-    "quiet-fabric-loom"
+    "quiet-fabric-loom",
+    "com.google.guava:guava",
+    "com.mojang:brigadier"
   ],
   "labels": [
     "dependencies"

From 4ffda18a4837c6cd8bda529525297a01f457bbc1 Mon Sep 17 00:00:00 2001
From: Roman Zhuravlev <rozhur@zhdev.org>
Date: Wed, 3 Sep 2025 19:41:55 +0500
Subject: [PATCH 07/10] Improve version detection

---
 .../bukkit/internal/CraftBukkitReflection.java    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java
index 3f23c7fb..95f480b1 100644
--- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java
+++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java
@@ -55,20 +55,25 @@ public final class CraftBukkitReflection {
         final String pkg = serverClass.getPackage().getName();
         final String nmsVersion = pkg.substring(pkg.lastIndexOf(".") + 1);
         if (!nmsVersion.contains("_")) {
-            int fallbackVersion = -1;
+            int fallbackVersion;
             try {
                 final Method getMinecraftVersion = serverClass.getDeclaredMethod("getMinecraftVersion");
                 fallbackVersion = Integer.parseInt(getMinecraftVersion.invoke(Bukkit.getServer()).toString().split("\\.")[1]);
             } catch (final Exception ignored) {
+                String version = Bukkit.getVersion();
+                version = version.substring(version.indexOf("(MC: ") + 5, version.length() - 1);
+                String[] versionParts = version.split("\\.");
+                fallbackVersion = Integer.parseInt(versionParts[1]);
             }
+            String name = serverClass.getName();
+            name = name.substring(PREFIX_CRAFTBUKKIT.length());
+            name = name.substring(0, name.length() - CRAFT_SERVER.length());
+            CB_PKG_VERSION = name;
             MAJOR_REVISION = fallbackVersion;
         } else {
             MAJOR_REVISION = Integer.parseInt(nmsVersion.split("_")[1]);
+            CB_PKG_VERSION = "";
         }
-        String name = serverClass.getName();
-        name = name.substring(PREFIX_CRAFTBUKKIT.length());
-        name = name.substring(0, name.length() - CRAFT_SERVER.length());
-        CB_PKG_VERSION = name;
     }
 
     @SafeVarargs

From 70a56e345c4ca79d692e57b45a4be8af172b39ef Mon Sep 17 00:00:00 2001
From: Roman Zhuravlev <rozhur@zhdev.org>
Date: Wed, 3 Sep 2025 19:42:03 +0500
Subject: [PATCH 08/10] Bump version

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 72e1e5d1..5f864f32 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-group=cloud.commandframework
-version=1.8.4
+group=org.zhdev.oblak
+version=1.8.5-SNAPSHOT
 description=Command framework and dispatcher for the JVM
 
 org.gradle.caching=true

From c94a032beadae192867e9b3f1506180e2f2001b1 Mon Sep 17 00:00:00 2001
From: Roman Zhuravlev <rozhur@zhdev.org>
Date: Wed, 3 Sep 2025 19:42:50 +0500
Subject: [PATCH 09/10] Update reflection for >=1.20.1 NMS

---
 .../bukkit/internal/RegistryReflection.java              | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java
index 1bfd3053..917d8154 100644
--- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java
+++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java
@@ -53,6 +53,7 @@ public final class RegistryReflection {
     );
     private static final Constructor<?> RESOURCE_LOCATION_CTR = CraftBukkitReflection.needConstructor(
             RESOURCE_LOCATION_CLASS,
+            String.class,
             String.class
     );
 
@@ -60,6 +61,8 @@ public final class RegistryReflection {
     }
 
     static {
+        RESOURCE_LOCATION_CTR.setAccessible(true);
+
         Class<?> registryClass;
         if (CraftBukkitReflection.MAJOR_REVISION < 17) {
             REGISTRY_REGISTRY = null;
@@ -122,7 +125,11 @@ public final class RegistryReflection {
 
     public static Object createResourceLocation(final String str) {
         try {
-            return RESOURCE_LOCATION_CTR.newInstance(str);
+            String[] parts = str.split(":", 2);
+            if (parts.length > 1) {
+                return RESOURCE_LOCATION_CTR.newInstance(parts[0], parts[1]);
+            }
+            return RESOURCE_LOCATION_CTR.newInstance("minecraft", parts[0]);
         } catch (final ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }

From 2ea3b6c8612ab15cf66c0071e008d15bf12e1fbe Mon Sep 17 00:00:00 2001
From: Roman Zhuravlev <rozhur@zhdev.org>
Date: Wed, 3 Sep 2025 19:42:59 +0500
Subject: [PATCH 10/10] Refactor project name

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index ef8800d0..fe420e75 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -74,7 +74,7 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "cloud"
+rootProject.name = "oblak"
 
 include(":cloud-bom")