From 016f35a6f02d23634b7d720f1fc9eff40dba2694 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 12 Jun 2022 20:54:33 +0100
Subject: [PATCH] Update Bukkit dependencies for full 1.19 support

---
 bukkit/build.gradle                                |  2 +-
 .../bukkit/brigadier/LuckPermsBrigadier.java       |  4 ++--
 .../luckperms/common/dependencies/Dependency.java  | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index cabcea382..2e1a143e9 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -16,7 +16,7 @@ dependencies {
         exclude(module: 'adventure-api')
         exclude(module: 'adventure-nbt')
     }
-    compileOnly 'me.lucko:commodore:1.13'
+    compileOnly 'me.lucko:commodore:2.0'
     compileOnly('net.milkbowl.vault:VaultAPI:1.7') {
         exclude(module: 'bukkit')
     }
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java
index 8c8eaf348..cd9bda179 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java
@@ -29,7 +29,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
 
 import me.lucko.commodore.Commodore;
 import me.lucko.commodore.CommodoreProvider;
-import me.lucko.commodore.file.CommodoreFileFormat;
+import me.lucko.commodore.file.CommodoreFileReader;
 import me.lucko.luckperms.bukkit.LPBukkitPlugin;
 import me.lucko.luckperms.common.sender.Sender;
 
@@ -50,7 +50,7 @@ public final class LuckPermsBrigadier {
                 throw new Exception("Brigadier command data missing from jar");
             }
 
-            LiteralCommandNode<?> commandNode = CommodoreFileFormat.parse(is);
+            LiteralCommandNode<?> commandNode = CommodoreFileReader.INSTANCE.parse(is);
             commodore.register(pluginCommand, commandNode, player -> {
                 Sender playerAsSender = plugin.getSenderFactory().wrap(player);
                 return plugin.getCommandManager().hasPermissionForAny(playerAsSender);
diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java
index 85c24ca16..91ce28132 100644
--- a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java
+++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java
@@ -71,21 +71,21 @@ public enum Dependency {
     ADVENTURE_PLATFORM(
             "me{}lucko",
             "adventure-platform-api",
-            "4.11.0",
-            "rFUSnKY6xEGCjgxqSl6/oJw2deCA/x834HlcCQEI1K4=",
+            "4.11.1",
+            "zCnxNgosme++TsheFaL+YHdtRIrp+oJhUiI8awsKgfQ=",
             Relocation.of("adventure", "net{}kyori{}adventure")
     ),
     ADVENTURE_PLATFORM_BUKKIT(
             "me{}lucko",
             "adventure-platform-bukkit",
-            "4.11.0",
-            "usbxLJmMp+fb9cnnRNlHnOVSgd5NZfColiVlsjmMulo=",
+            "4.11.1",
+            "+xpPjOz1YkhB2Dq8JDNPcKOm4IUijolg10a2x+ISpBc=",
             Relocation.of("adventure", "net{}kyori{}adventure")
     ),
     ADVENTURE_PLATFORM_BUNGEECORD(
             "me{}lucko",
             "adventure-platform-bungeecord",
-            "4.11.0",
+            "4.11.1",
             "+WUdRdZ6qkacw3ha/R3ayLx46soMywGe70Zmnw4yha8=",
             Relocation.of("adventure", "net{}kyori{}adventure")
     ),
@@ -128,8 +128,8 @@ public enum Dependency {
     COMMODORE(
             "me{}lucko",
             "commodore",
-            "1.13",
-            "A4M1Im54vrYbcdSpteQvI6ppNPYWL+VpfBVjsdteY+M=",
+            "2.0",
+            "5pPvU2MFRK4doXDOG8UKTp1y7D7uuTfiPglTosUh4zk=",
             Relocation.of("commodore", "me{}lucko{}commodore")
     ),
     COMMODORE_FILE(