Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/maxgamer/quickshop/util/MsgUtil.java


Former-commit-id: 603af8669f5425d4e6933e936a552598e2f7a53d
This commit is contained in:
Ghost_chu committed 2020-12-06 21:31:44 +08:00
commit 9980007f06
1 file changed
+39 -23
@@ -23,9 +23,14 @@ import com.google.common.collect.Maps;
import lombok.Getter;
import lombok.SneakyThrows;
import me.clip.placeholderapi.PlaceholderAPI;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.nbt.api.BinaryTagHolder;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -147,15 +152,7 @@ public class MsgUtil {
@NotNull String left,
@NotNull ItemStack itemStack,
@NotNull String right) {
String json = ItemNMS.saveJsonfromNMS(itemStack);
if (json == null) {
return;
}
// Util.debugLog(left);
// Util.debugLog(json);
// Util.debugLog(right);
Audience audience = audiences.player(player);
audiences.player(player).sendMessage(getItemTextComponent(itemStack, player, left + Util.getItemStackName(itemStack) + right));
}
/**
@@ -1008,29 +1005,47 @@ public class MsgUtil {
@NotNull ItemStack itemStack,
@NotNull Player player,
@NotNull String normalText) {
audiences.player(player).sendMessage(getItemholochat(shop, itemStack, player, normalText));
}
private static TextComponent getItemTextComponent(@NotNull ItemStack itemStack,
@NotNull Player player,
@NotNull String normalText) {
if (errorComponent == null) {
errorComponent = Component.text(getMessage("menu.item-holochat-error", player));
}
String json;
try {
json = ItemNMS.saveJsonfromNMS(itemStack);
} catch (Throwable throwable) {
plugin.getLogger().log(Level.SEVERE, "Failed to saving item to json for holochat", throwable);
return errorComponent;
}
if (json == null) {
return errorComponent;
}
return Component.text(normalText + " " + MsgUtil.getMessage("menu.preview", player)).hoverEvent(HoverEvent.showItem(Key.key(itemStack.getType().getKey().toString()), itemStack.getAmount(), BinaryTagHolder.of(json)));
}
@NotNull
public static TextComponent getItemholochat(
@NotNull Shop shop,
@NotNull ItemStack itemStack,
@NotNull Player player,
@NotNull String normalText) {
try {
if (errorComponent == null) {
}
String json = ItemNMS.saveJsonfromNMS(itemStack);
if (json == null) {
return errorComponent;
}
return null;
} catch (Throwable t) {
t.printStackTrace();
return errorComponent;
TextComponent component = getItemTextComponent(itemStack, player, normalText);
if (QuickShop.getPermissionManager().hasPermission(player, "quickshop.preview")) {
component.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, MsgUtil.fillArgs(
"/qs silentpreview {0}",
shop.getRuntimeRandomUniqueId().toString())));
}
return component;
}
/**
@@ -1057,7 +1072,6 @@ public class MsgUtil {
@SneakyThrows
private static void updateMessages(int selectedVersion) {
String languageName = plugin.getConfig().getString("language", "en");
if (!messagei18n.getString("language-name").isPresent()) {
setAndUpdate("language-name", languageName);
@@ -1568,6 +1582,7 @@ public class MsgUtil {
if (msg == null || msg.isEmpty()) {
continue;
}
audiences.sender(sender).sendMessage(LegacyComponentSerializer.legacySection().deserialize(chatColor + msg));
} catch (Throwable throwable) {
Util.debugLog("Failed to send formatted text.");
sender.sendMessage(msg);
@@ -1592,6 +1607,7 @@ public class MsgUtil {
if (msg == null || msg.isEmpty()) {
continue;
}
audiences.sender(sender).sendMessage(LegacyComponentSerializer.legacySection().deserialize(msg));
} catch (Throwable throwable) {
Util.debugLog("Failed to send formatted text.");
sender.sendMessage(msg);