Bump dream-utilities to 1.4.2, kyori adventure to 4.17.0 and okaeri-c…

…onfig to 5.0.2
DreamPoland · Jun 30, 2024 · 8c55156 · 8c55156
1 parent 6670476
commit 8c55156
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 103 deletions.
diff --git a/bukkit-adventure/build.gradle.kts b/bukkit-adventure/build.gradle.kts
@@ -13,10 +13,10 @@ dependencies {
     implementation("eu.okaeri:okaeri-placeholders-core:5.0.1")
 
     // -- kyori-adventure --
-    implementation("net.kyori:adventure-text-minimessage:4.16.0")
-    implementation("net.kyori:adventure-text-serializer-legacy:4.16.0")
+    implementation("net.kyori:adventure-text-minimessage:4.17.0")
+    implementation("net.kyori:adventure-text-serializer-legacy:4.17.0")
 
     // -- dream-utilities --
-    implementation("cc.dreamcode:utilities:1.4.1")
-    implementation("cc.dreamcode:utilities-bukkit:1.4.1")
+    implementation("cc.dreamcode:utilities:1.4.2")
+    implementation("cc.dreamcode:utilities-bukkit-adventure:1.4.2")
 }
diff --git a/bukkit-adventure/src/main/java/cc/dreamcode/menu/adventure/adventure/AdventureLegacy.java b/bukkit-adventure/src/main/java/cc/dreamcode/menu/adventure/adventure/AdventureLegacy.java
diff --git a/...t-adventure/src/main/java/cc/dreamcode/menu/adventure/adventure/AdventureLegacyColor.java b/...t-adventure/src/main/java/cc/dreamcode/menu/adventure/adventure/AdventureLegacyColor.java
diff --git a/bukkit-adventure/src/main/java/cc/dreamcode/menu/adventure/base/BukkitMenu.java b/bukkit-adventure/src/main/java/cc/dreamcode/menu/adventure/base/BukkitMenu.java
@@ -1,10 +1,10 @@
 package cc.dreamcode.menu.adventure.base;
 
-import cc.dreamcode.menu.base.DreamMenu;
 import cc.dreamcode.menu.adventure.BukkitMenuProvider;
-import cc.dreamcode.menu.adventure.adventure.AdventureLegacy;
 import cc.dreamcode.menu.adventure.holder.DefaultMenuHolder;
+import cc.dreamcode.menu.base.DreamMenu;
 import cc.dreamcode.menu.utilities.MenuUtil;
+import cc.dreamcode.utilities.bukkit.StringColorUtil;
 import eu.okaeri.placeholders.context.PlaceholderContext;
 import eu.okaeri.placeholders.message.CompiledMessage;
 import lombok.Getter;
@@ -59,7 +59,7 @@ public BukkitMenu(@NonNull InventoryType inventoryType, @NonNull String title, i
         this.inventory = Bukkit.createInventory(
                 this.defaultMenuHolder,
                 this.inventoryType,
-                AdventureLegacy.serialize(AdventureLegacy.deserialize(title, AdventureLegacy.getPlaceholderConfig(placeholderContext)))
+                StringColorUtil.fixColor(placeholderContext.apply())
         );
     }
 
@@ -81,7 +81,7 @@ public BukkitMenu(@NonNull InventoryType inventoryType, @NonNull String title, @
         this.inventory = Bukkit.createInventory(
                 this.defaultMenuHolder,
                 this.inventoryType,
-                AdventureLegacy.serialize(AdventureLegacy.deserialize(title, AdventureLegacy.getPlaceholderConfig(placeholderContext)))
+                StringColorUtil.fixColor(placeholderContext.apply())
         );
     }
 
@@ -105,7 +105,7 @@ public BukkitMenu(@NonNull String title, int rows, int page) {
         this.inventory = Bukkit.createInventory(
                 this.defaultMenuHolder,
                 this.size,
-                AdventureLegacy.serialize(AdventureLegacy.deserialize(title, AdventureLegacy.getPlaceholderConfig(placeholderContext)))
+                StringColorUtil.fixColor(placeholderContext.apply())
         );
     }
 
@@ -130,7 +130,7 @@ public BukkitMenu(@NonNull String title, @NonNull Map<String, Object> placeholde
         this.inventory = Bukkit.createInventory(
                 this.defaultMenuHolder,
                 this.size,
-                AdventureLegacy.serialize(AdventureLegacy.deserialize(title, AdventureLegacy.getPlaceholderConfig(placeholderContext)))
+                StringColorUtil.fixColor(placeholderContext.apply())
         );
     }
 

diff --git a/bukkit-adventure/src/main/java/cc/dreamcode/menu/adventure/base/BukkitMenuPaginated.java b/bukkit-adventure/src/main/java/cc/dreamcode/menu/adventure/base/BukkitMenuPaginated.java
@@ -307,7 +307,7 @@ public BukkitMenuPaginated openFirstPage(@NonNull HumanEntity humanEntity) {
                 .stream()
                 .min(Comparator.comparingInt(Map.Entry::getKey))
                 .map(Map.Entry::getKey))
-                .acceptOrElse(page -> this.open(page, humanEntity), () -> {
+                .ifPresentOrElse(page -> this.open(page, humanEntity), () -> {
                     this.bukkitMenuMap.put(0, this.getMenuPlatform().cloneMenu(1));
                     this.openFirstPage(humanEntity);
                 });

diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -13,6 +13,6 @@ dependencies {
     implementation("eu.okaeri:okaeri-placeholders-core:5.0.1")
 
     // -- dream-utilities --
-    implementation("cc.dreamcode:utilities:1.4.1")
-    implementation("cc.dreamcode:utilities-bukkit:1.4.1")
+    implementation("cc.dreamcode:utilities:1.4.2")
+    implementation("cc.dreamcode:utilities-bukkit:1.4.2")
 }
diff --git a/bukkit/src/main/java/cc/dreamcode/menu/bukkit/base/BukkitMenuPaginated.java b/bukkit/src/main/java/cc/dreamcode/menu/bukkit/base/BukkitMenuPaginated.java
@@ -307,7 +307,7 @@ public BukkitMenuPaginated openFirstPage(@NonNull HumanEntity humanEntity) {
                 .stream()
                 .min(Comparator.comparingInt(Map.Entry::getKey))
                 .map(Map.Entry::getKey))
-                .acceptOrElse(page -> this.open(page, humanEntity), () -> {
+                .ifPresentOrElse(page -> this.open(page, humanEntity), () -> {
                     this.bukkitMenuMap.put(0, this.getMenuPlatform().cloneMenu(1));
                     this.openFirstPage(humanEntity);
                 });

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,3 +1,3 @@
 dependencies {
-    implementation("cc.dreamcode:utilities:1.4.1")
+    implementation("cc.dreamcode:utilities:1.4.2")
 }
diff --git a/serializer/bukkit-adventure-serializer/build.gradle.kts b/serializer/bukkit-adventure-serializer/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
 
     // -- okaeri-config --
-    implementation("eu.okaeri:okaeri-configs-core:5.0.1")
+    implementation("eu.okaeri:okaeri-configs-core:5.0.2")
 }
diff --git a/serializer/bukkit-serializer/build.gradle.kts b/serializer/bukkit-serializer/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
 
     // -- okaeri-config --
-    implementation("eu.okaeri:okaeri-configs-core:5.0.1")
+    implementation("eu.okaeri:okaeri-configs-core:5.0.2")
 }