trueog/CraftingStore-OG
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Allow hex colors in inventories.

Browse Source
This commit is contained in:
Thijs Alders committed 2021-03-03 19:34:46 +01:00
1 parent e22dd9fe31
commit 6b7e15b3bc
2 files changed
+15 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bukkit/src/main/java/net/craftingstore/bukkit/inventory/InventoryBuilder.java
+14 -12
View File
@@ -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);
}
pom.xml
+1 -1
View File
@@ -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>