Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
import com.loohp.interactivechat.objectholders.ICPlayer;
import com.loohp.interactivechat.objectholders.OfflineICPlayer;
import com.loohp.interactivechat.utils.ChatColorUtils;
import com.loohp.interactivechat.utils.ColorUtils;
import com.loohp.interactivechat.utils.CompassUtils;
import com.loohp.interactivechat.utils.ComponentCompacting;
import com.loohp.interactivechat.utils.ComponentFlattening;
import com.loohp.interactivechat.utils.ComponentReplacing;
import com.loohp.interactivechat.utils.ComponentStyling;
import com.loohp.interactivechat.utils.ComponentUtils;
import com.loohp.interactivechat.utils.FilledMapUtils;
import com.loohp.interactivechat.utils.HashUtils;
Expand All @@ -48,11 +50,14 @@
import net.kyori.adventure.key.Key;
import net.kyori.adventure.nbt.api.BinaryTagHolder;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.TextReplacementConfig;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.DataComponentValue;
import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.event.HoverEvent.ShowItem;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand All @@ -66,6 +71,8 @@
import org.bukkit.inventory.meta.ItemMeta;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;

Expand Down Expand Up @@ -185,7 +192,7 @@ public static Component createItemDisplay(OfflineICPlayer player, ItemStack item

String itemJson = ItemNBTUtils.getNMSItemStackJson(item);
ItemStack trimmedItem = null;
if (InteractiveChat.sendOriginalIfTooLong && itemJson.length() > InteractiveChat.itemTagMaxLength) {
if (useInventoryView(item) || (InteractiveChat.sendOriginalIfTooLong && itemJson.length() > InteractiveChat.itemTagMaxLength)) {
trimmedItem = new ItemStack(item.getType());
trimmedItem.addUnsafeEnchantments(item.getEnchantments());
if (itemMeta != null && itemMeta.hasDisplayName()) {
Expand All @@ -211,7 +218,28 @@ public static Component createItemDisplay(OfflineICPlayer player, ItemStack item
}

String amountString = "";
Component itemDisplayNameComponent = ItemStackUtils.getDisplayName(item);
Component itemDisplayNameComponent = ItemStackUtils.getDisplayName(item, false);
List<Component> flattened = ComponentFlattening.flatten(itemDisplayNameComponent).children();
List<Component> cleaned = new ArrayList<>(flattened.size());
for (Component child : flattened) {
if (child instanceof TextComponent) {
TextComponent text = (TextComponent) child;
cleaned.add(text.content(ChatColorUtils.escapeMiniMessageTags(ChatColorUtils.stripColor(text.content()))));
} else {
cleaned.add(child);
}
}
itemDisplayNameComponent = ComponentCompacting.optimize(Component.empty().children(cleaned));

ChatColor rarity = NMS.getInstance().getRarityColor(item);
if (rarity != null) {
itemDisplayNameComponent = itemDisplayNameComponent.colorIfAbsent(ColorUtils.toTextColor(rarity));
}

ItemStack hoverItem = (trimmedItem == null ? item : trimmedItem).clone();
if (itemMeta != null && itemMeta.hasDisplayName()) {
NMS.getInstance().setItemStackDisplayName(hoverItem, ComponentStyling.stripColor(itemDisplayNameComponent));
}

amountString = String.valueOf(itemAmount);
Key key = ItemNBTUtils.getNMSItemStackNamespacedKey(item);
Expand All @@ -221,10 +249,12 @@ public static Component createItemDisplay(OfflineICPlayer player, ItemStack item
if (item.getType().equals(Material.AIR)) {
showHover = false;
}
Map<Key, DataComponentValue> dataComponents = ItemNBTUtils.getNMSItemStackDataComponents(trimmedItem == null ? item : trimmedItem);
Map<Key, DataComponentValue> dataComponents = ItemNBTUtils.getNMSItemStackDataComponents(hoverItem);
dataComponents.remove(Key.key("minecraft", "container"));
dataComponents.remove(Key.key("minecraft", "bundle_contents"));
showItem = dataComponents.isEmpty() ? ShowItem.showItem(key, itemAmount) : ShowItem.showItem(key, itemAmount, dataComponents);
} else {
String tag = ItemNBTUtils.getNMSItemStackTag(trimmedItem == null ? item : trimmedItem);
String tag = ItemNBTUtils.getNMSItemStackTag(hoverItem);
showItem = tag == null ? ShowItem.showItem(key, itemAmount) : ShowItem.showItem(key, itemAmount, BinaryTagHolder.binaryTagHolder(tag));
}

Expand Down Expand Up @@ -309,7 +339,15 @@ public static Component createItemDisplay(OfflineICPlayer player, ItemStack item
}

Component itemDisplayComponent = PlaceholderParser.parse(player, itemAmount == 1 ? InteractiveChat.itemSingularReplaceText : InteractiveChat.itemReplaceText.replaceText(TextReplacementConfig.builder().matchLiteral("{Amount}").replacement(Component.text(amountString)).build()));
itemDisplayComponent = itemDisplayComponent.replaceText(TextReplacementConfig.builder().matchLiteral("{Item}").replacement(itemDisplayNameComponent).build());
TextColor templateColor = NamedTextColor.WHITE;
for (Component child : ComponentFlattening.flatten(itemDisplayComponent).children()) {
TextColor color = child.color();
if (color != null) {
templateColor = color;
break;
}
}
itemDisplayComponent = itemDisplayComponent.replaceText(TextReplacementConfig.builder().matchLiteral("{Item}").replacement(itemDisplayNameComponent.colorIfAbsent(templateColor)).build());
if (showHover) {
itemDisplayComponent = itemDisplayComponent.hoverEvent(hoverEvent);
} else if (alternativeHover != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package com.loohp.interactivechat.utils;

import com.loohp.interactivechat.InteractiveChat;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.md_5.bungee.api.ChatColor;

import java.util.Arrays;
Expand All @@ -46,6 +47,10 @@ public static String stripColor(String string) {
return string.replaceAll("\u00a7[0-9A-Fa-fk-orx]", "");
}

public static String escapeMiniMessageTags(String string) {
return MiniMessage.miniMessage().escapeTags(string);
}

public static String filterIllegalColorCodes(String string) {
return filterIllegalColorCodes(string, com.loohp.interactivechat.InteractiveChat.version.isLegacyRGB());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.loohp.interactivechat.objectholders.LegacyIdKey;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.nbt.CompoundBinaryTag;
Expand Down Expand Up @@ -51,6 +53,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.function.UnaryOperator;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -164,6 +167,51 @@ private InteractiveChatComponentSerializer() {

}

private static String stripIncompatibleClickEvents(String json) {
try {
JsonElement element = JsonParser.parseString(json);
if (stripClickEvents(element)) {
return element.toString();
}
return json;
} catch (Throwable e) {
return json;
}
}

private static boolean stripClickEvents(JsonElement element) {
boolean changed = false;
if (element.isJsonObject()) {
JsonObject object = element.getAsJsonObject();
List<String> toRemove = new ArrayList<>();
for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
String key = entry.getKey();
JsonElement value = entry.getValue();
if ((key.equals("clickEvent") || key.equals("click_event")) && value != null && value.isJsonObject()) {
JsonElement payload = value.getAsJsonObject().get("payload");
if (payload != null && (payload.isJsonObject() || payload.isJsonArray())) {
toRemove.add(key);
continue;
}
}
if (stripClickEvents(value)) {
changed = true;
}
}
for (String key : toRemove) {
object.remove(key);
changed = true;
}
} else if (element.isJsonArray()) {
for (JsonElement child : element.getAsJsonArray()) {
if (stripClickEvents(child)) {
changed = true;
}
}
}
return changed;
}

public static class InteractiveChatBungeecordAPILegacyComponentSerializer implements ComponentSerializer<Component, Component, String> {

private InteractiveChatBungeecordAPILegacyComponentSerializer() {
Expand Down Expand Up @@ -372,6 +420,9 @@ private InteractiveChatGsonComponentSerializer(GsonComponentSerializer instance)

@Override
public @NotNull Component deserialize(@NotNull String input) {
if (input.contains("payload")) {
input = stripIncompatibleClickEvents(input);
}
return instance.deserialize(input);
}

Expand Down