From 6b7e15b3bc3c6730b89b77ea8e76799f5b91db63 Mon Sep 17 00:00:00 2001
From: Thijs Alders <t.alders@wearetriple.com>
Date: Wed, 3 Mar 2021 19:34:46 +0100
Subject: [PATCH] Allow hex colors in inventories.

---
 .../bukkit/inventory/InventoryBuilder.java    | 26 ++++++++++---------
 pom.xml                                       |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bukkit/src/main/java/net/craftingstore/bukkit/inventory/InventoryBuilder.java b/bukkit/src/main/java/net/craftingstore/bukkit/inventory/InventoryBuilder.java
index 7c10e29..d6bfd1d 100644
--- a/bukkit/src/main/java/net/craftingstore/bukkit/inventory/InventoryBuilder.java
+++ b/bukkit/src/main/java/net/craftingstore/bukkit/inventory/InventoryBuilder.java
@@ -1,12 +1,12 @@
 package net.craftingstore.bukkit.inventory;
 
 import net.craftingstore.bukkit.CraftingStoreBukkit;
+import net.craftingstore.bukkit.util.ChatColorUtil;
 import net.craftingstore.bukkit.util.VersionUtil;
 import net.craftingstore.bukkit.util.XMaterial;
 import net.craftingstore.core.models.api.inventory.CraftingStoreInventory;
 import net.craftingstore.core.models.api.inventory.InventoryItem;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -31,7 +31,7 @@ public class InventoryBuilder {
         if (title == null || title.isEmpty()) {
             title = "CraftingStore";
         }
-        title = ChatColor.translateAlternateColorCodes('&', title);
+        title = ChatColorUtil.translate(title);
         Inventory inventory = Bukkit.createInventory(new CraftingStoreInventoryHolder(csInventory, parent), csInventory.getSize(), title);
 
         for (InventoryItem inventoryItem : csInventory.getContent()) {
@@ -47,17 +47,19 @@ public class InventoryBuilder {
             }
             ItemStack itemStack = xMaterial.parseItem(inventoryItem.getIcon().getAmount());
             ItemMeta meta = itemStack.getItemMeta();
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', inventoryItem.getName()));
-            if (inventoryItem.getDescription() != null && inventoryItem.getDescription().length != 0) {
-                meta.setLore(Arrays.stream(inventoryItem.getDescription())
-                        .map(d -> ChatColor.translateAlternateColorCodes('&', d))
-                        .collect(Collectors.toList())
-                );
+            if (meta != null) {
+                meta.setDisplayName(ChatColorUtil.translate(inventoryItem.getName()));
+                if (inventoryItem.getDescription() != null && inventoryItem.getDescription().length != 0) {
+                    meta.setLore(Arrays.stream(inventoryItem.getDescription())
+                            .map(ChatColorUtil::translate)
+                            .collect(Collectors.toList())
+                    );
+                }
+                if (VersionUtil.isCustomModalDataAvailable() && inventoryItem.getIcon().getCustomModelData() != null) {
+                    meta.setCustomModelData(inventoryItem.getIcon().getCustomModelData());
+                }
+                itemStack.setItemMeta(meta);
             }
-            if (VersionUtil.isCustomModalDataAvailable() && inventoryItem.getIcon().getCustomModelData() != null) {
-                meta.setCustomModelData(inventoryItem.getIcon().getCustomModelData());
-            }
-            itemStack.setItemMeta(meta);
             inventory.setItem(inventoryItem.getIndex(), itemStack);
         }
 
diff --git a/pom.xml b/pom.xml
index 73003d7..9885a1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <revision>${craftingstore-version}-RELEASE</revision>
-        <craftingstore-version>2.6.3</craftingstore-version>
+        <craftingstore-version>2.6.4</craftingstore-version>
     </properties>
 
     <build>