mirror of
https://github.com/EarthMC/QuickShop-Reremake.git
synced 2026-11-15 21:26:04 -05:00
Push to @sandtechnology
Former-commit-id: 31188810814f7c6808f3b62d880b4d7d8af0995a
This commit is contained in:
1 parent
4309c42236
commit
90dfb79e32
3 files changed
+51
-11
No files matched your search
@@ -1,6 +1,5 @@
|
||||
/*
|
||||
* This file is a part of project QuickShop, the name is ItemNMS.java
|
||||
* Copyright (C) Ghost_chu <https://github.com/Ghost-chu>
|
||||
* Copyright (C) PotatoCraft Studio and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
@@ -86,4 +85,26 @@ public abstract class ItemNMS {
|
||||
return nbtTagCompound.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Save ItemStack to Json through the NMS.
|
||||
*
|
||||
* @param bStack ItemStack
|
||||
* @return The json for ItemStack.
|
||||
* @throws InvocationTargetException throws
|
||||
* @throws IllegalAccessException throws
|
||||
* @throws NoSuchMethodException throws
|
||||
* @throws InstantiationException throws
|
||||
*/
|
||||
@Nullable
|
||||
public static Object saveItemStackToMojang(@NotNull ItemStack bStack) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException, InstantiationException {
|
||||
if (bStack.getType() == Material.AIR) {
|
||||
return null;
|
||||
}
|
||||
Object mcStack = craftItemStack_asNMSCopyMethod.invoke(null, bStack);
|
||||
Object nbtTagCompound = nbtTagCompoundClass.getDeclaredConstructor().newInstance();
|
||||
|
||||
itemStack_saveMethod.invoke(mcStack, nbtTagCompound);
|
||||
return nbtTagCompound.toString();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -23,10 +23,13 @@ import com.google.common.collect.Maps;
|
||||
import lombok.Getter;
|
||||
import lombok.SneakyThrows;
|
||||
import me.clip.placeholderapi.PlaceholderAPI;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
import net.md_5.bungee.api.chat.HoverEvent;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.key.Key;
|
||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentBuilder;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.event.HoverEvent;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
@@ -89,6 +92,7 @@ public class MsgUtil {
|
||||
@Getter
|
||||
private static YamlConfiguration potioni18n;
|
||||
private static IFile builtInLang;
|
||||
private static final BukkitAudiences audiences = BukkitAudiences.create(QuickShop.getInstance());
|
||||
|
||||
/**
|
||||
* Deletes any messages that are older than a week in the database, to save on space.
|
||||
@@ -152,10 +156,13 @@ public class MsgUtil {
|
||||
return;
|
||||
}
|
||||
|
||||
Util.debugLog(left);
|
||||
Util.debugLog(json);
|
||||
Util.debugLog(right);
|
||||
TextComponent centerItem = new TextComponent(left + Util.getItemStackName(itemStack) + right);
|
||||
// Util.debugLog(left);
|
||||
// Util.debugLog(json);
|
||||
// Util.debugLog(right);
|
||||
Audience audience = audiences.player(player);
|
||||
Component.text(left + Util.getItemStackName(itemStack) + right)
|
||||
Component.text(json).hoverEvent(HoverEvent.showItem(Key.of(itemStack.getData().getItemType().getKey())))
|
||||
TextComponent centerItem = Component.se;
|
||||
ComponentBuilder cBuilder = new ComponentBuilder(json);
|
||||
centerItem.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ITEM, cBuilder.create())); //FIXME: Update this when drop 1.15 supports
|
||||
player.spigot().sendMessage(centerItem);
|
||||
@@ -1011,9 +1018,11 @@ public class MsgUtil {
|
||||
@NotNull ItemStack itemStack,
|
||||
@NotNull Player player,
|
||||
@NotNull String normalText) {
|
||||
player.spigot().sendMessage(getItemholochat(shop, itemStack, player, normalText));
|
||||
getItemholochat(shop, itemStack, player, normalText).
|
||||
player.spigot().sendMessage(getItemholochat(shop, itemStack, player, normalText));
|
||||
}
|
||||
|
||||
|
||||
@NotNull
|
||||
public static TextComponent getItemholochat(
|
||||
@NotNull Shop shop,
|
||||
@@ -1022,7 +1031,8 @@ public class MsgUtil {
|
||||
@NotNull String normalText) {
|
||||
try {
|
||||
if (errorComponent == null) {
|
||||
errorComponent = new TextComponent(getMessage("menu.item-holochat-error", player));
|
||||
Component.text(getMessage("menu.item-holochat-error", player)).
|
||||
errorComponent = new TextComponent();
|
||||
}
|
||||
String json = ItemNMS.saveJsonfromNMS(itemStack);
|
||||
if (json == null) {
|
||||
|
||||
Reference in new issue
Block a user