From 09e549268169dddf7d72267f546afc7bca62c89f Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Sun, 8 Aug 2021 18:15:22 +0200 Subject: [PATCH] Improved fromLegacyText method --- .../de/studiocode/invui/item/ItemBuilder.java | 10 ++++++---- .../studiocode/invui/util/ComponentUtils.java | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 InvUI/src/main/java/de/studiocode/invui/util/ComponentUtils.java diff --git a/InvUI/src/main/java/de/studiocode/invui/item/ItemBuilder.java b/InvUI/src/main/java/de/studiocode/invui/item/ItemBuilder.java index 9b5ed3f..c0d06d0 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/ItemBuilder.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/ItemBuilder.java @@ -8,11 +8,11 @@ import com.mojang.authlib.properties.PropertyMap; import de.studiocode.inventoryaccess.util.ReflectionRegistry; import de.studiocode.inventoryaccess.util.ReflectionUtils; import de.studiocode.inventoryaccess.version.InventoryAccess; +import de.studiocode.invui.util.ComponentUtils; import de.studiocode.invui.util.MojangApiUtils; import de.studiocode.invui.util.Pair; import de.studiocode.invui.window.impl.BaseWindow; import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -91,6 +91,7 @@ public class ItemBuilder implements ItemProvider { * * @return The {@link ItemStack} */ + @Override public ItemStack get() { ItemStack itemStack; if (base != null) { @@ -155,6 +156,7 @@ public class ItemBuilder implements ItemProvider { * for whom this {@link ItemStack} should be built. * @return The {@link ItemStack} */ + @Override public ItemStack getFor(@NotNull UUID playerUUID) { return get(); } @@ -180,7 +182,7 @@ public class ItemBuilder implements ItemProvider { } public ItemBuilder setDisplayName(String displayName) { - this.displayName = TextComponent.fromLegacyText(displayName); + this.displayName = ComponentUtils.fromLegacyText(displayName); return this; } @@ -191,7 +193,7 @@ public class ItemBuilder implements ItemProvider { public ItemBuilder setLegacyLore(@NotNull List lore) { this.lore = lore.stream() - .map(TextComponent::fromLegacyText) + .map(ComponentUtils::fromLegacyText) .collect(Collectors.toList()); return this; } @@ -205,7 +207,7 @@ public class ItemBuilder implements ItemProvider { if (lore == null) lore = new ArrayList<>(); for (String line : lines) - lore.add(TextComponent.fromLegacyText(line)); + lore.add(ComponentUtils.fromLegacyText(line)); return this; } diff --git a/InvUI/src/main/java/de/studiocode/invui/util/ComponentUtils.java b/InvUI/src/main/java/de/studiocode/invui/util/ComponentUtils.java new file mode 100644 index 0000000..7c2280d --- /dev/null +++ b/InvUI/src/main/java/de/studiocode/invui/util/ComponentUtils.java @@ -0,0 +1,20 @@ +package de.studiocode.invui.util; + +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.TextComponent; + +public class ComponentUtils { + + public static BaseComponent[] fromLegacyText(String text) { + return new ComponentBuilder("") + .italic(false) + .bold(false) + .strikethrough(false) + .underlined(false) + .obfuscated(false) + .append(TextComponent.fromLegacyText(text)) + .create(); + } + +}