Repo-Mirror/HibiscusCommons
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HibiscusCommons.git synced 2025-12-19 15:09:26 +00:00
Code Issues Releases Activity

feat: use Paper methods for ItemSerializer display and lore when possible

Browse Source
This commit is contained in:
LoJoSho
2024-12-29 16:35:24 -06:00
parent fc4c38678f
commit 77e27cc63a
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/src/main/java/me/lojosho/hibiscuscommons/config/serializer/ItemSerializer.java
View File

@@ -1,10 +1,8 @@
package me.lojosho.hibiscuscommons.config.serializer; package me.lojosho.hibiscuscommons.config.serializer;
import me.lojosho.hibiscuscommons.HibiscusCommonsPlugin;
import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.hooks.Hooks;
import me.lojosho.hibiscuscommons.util.ColorBuilder; import me.lojosho.hibiscuscommons.util.*;
import me.lojosho.hibiscuscommons.util.InventoryUtils;
import me.lojosho.hibiscuscommons.util.ServerUtils;
import me.lojosho.hibiscuscommons.util.StringUtils;
import org.apache.commons.lang3.EnumUtils; import org.apache.commons.lang3.EnumUtils;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
@@ -71,9 +69,7 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
final ConfigurationNode blueNode = colorNode.node(BLUE); final ConfigurationNode blueNode = colorNode.node(BLUE);
if (materialNode.virtual()) return null; if (materialNode.virtual()) return null;
String material = materialNode.getString("");
String material = materialNode.getString();
ItemStack item = Hooks.getItem(material); ItemStack item = Hooks.getItem(material);
if (item == null) { if (item == null) {
//HMCCosmeticsPlugin.getInstance().getLogger().severe("Invalid Material -> " + material); //HMCCosmeticsPlugin.getInstance().getLogger().severe("Invalid Material -> " + material);
@@ -83,15 +79,28 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
ItemMeta itemMeta = item.getItemMeta(); ItemMeta itemMeta = item.getItemMeta();
if (itemMeta == null) return item; if (itemMeta == null) return item;
if (!nameNode.virtual())
itemMeta.setDisplayName(StringUtils.parseStringToString((nameNode.getString("")))); if (!nameNode.virtual()) {
if (HibiscusCommonsPlugin.isOnPaper()) {
itemMeta.displayName(AdventureUtils.MINI_MESSAGE.deserialize(nameNode.getString("")));
} else {
itemMeta.setDisplayName(StringUtils.parseStringToString(nameNode.getString("")));
}
}
if (!unbreakableNode.virtual()) itemMeta.setUnbreakable(unbreakableNode.getBoolean()); if (!unbreakableNode.virtual()) itemMeta.setUnbreakable(unbreakableNode.getBoolean());
if (!glowingNode.virtual()) { if (!glowingNode.virtual()) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
itemMeta.addEnchant(Enchantment.LUCK, 1, true); itemMeta.addEnchant(Enchantment.LUCK, 1, true);
} }
if (!loreNode.virtual()) itemMeta.setLore(loreNode.getList(String.class, new ArrayList<String>()). if (!loreNode.virtual()) {
stream().map(StringUtils::parseStringToString).collect(Collectors.toList())); if (HibiscusCommonsPlugin.isOnPaper()) {
itemMeta.lore(loreNode.getList(String.class, new ArrayList<>()).
stream().map(AdventureUtils.MINI_MESSAGE::deserialize).collect(Collectors.toList()));
} else {
itemMeta.setLore(loreNode.getList(String.class, new ArrayList<>()).
stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
}
}
if (!modelDataNode.virtual()) itemMeta.setCustomModelData(modelDataNode.getInt()); if (!modelDataNode.virtual()) itemMeta.setCustomModelData(modelDataNode.getInt());
if (!nbtNode.virtual()) { if (!nbtNode.virtual()) {