502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

版本更新至 5.12

Browse Source 
调整：指令 “/tlib iteminfo” 提示信息
调整：JSON 工具的物品显示功能算法优化
修复：JSON 工具的物品显示功能在 1.7.10 版本失效的问题
This commit is contained in:
坏黑 2018-02-12 23:36:20 +08:00
parent 6742a915c0
commit 819e3e4cf4
2 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/src/me/skymc/taboolib/commands/sub/InfoCommand.java
View File

@ -11,6 +11,7 @@ import me.skymc.taboolib.inventory.ItemUtils;
import me.skymc.taboolib.itemnbtapi.NBTItem; import me.skymc.taboolib.itemnbtapi.NBTItem;
import me.skymc.taboolib.jsonformatter.JSONFormatter; import me.skymc.taboolib.jsonformatter.JSONFormatter;
import me.skymc.taboolib.jsonformatter.click.SuggestCommandEvent; import me.skymc.taboolib.jsonformatter.click.SuggestCommandEvent;
import me.skymc.taboolib.jsonformatter.hover.ShowItemEvent;
import me.skymc.taboolib.jsonformatter.hover.ShowTextEvent; import me.skymc.taboolib.jsonformatter.hover.ShowTextEvent;
import me.skymc.taboolib.message.MsgUtils; import me.skymc.taboolib.message.MsgUtils;
@ -36,6 +37,8 @@ public class InfoCommand extends SubCommand {
json.append("§7 - 物品名称: §f"); json.appendHoverClick("§f" + ItemUtils.getCustomName(player.getItemInHand()), new ShowTextEvent("§f点击复制"), new SuggestCommandEvent(ItemUtils.getCustomName(player.getItemInHand()).replace("§", "&"))); json.append("§7 - 物品名称: §f"); json.appendHoverClick("§f" + ItemUtils.getCustomName(player.getItemInHand()), new ShowTextEvent("§f点击复制"), new SuggestCommandEvent(ItemUtils.getCustomName(player.getItemInHand()).replace("§", "&")));
json.newLine(); json.newLine();
json.append("§7 - 物品序号: §f" + player.getItemInHand().getTypeId() + ":" + player.getItemInHand().getDurability()); json.append("§7 - 物品序号: §f" + player.getItemInHand().getTypeId() + ":" + player.getItemInHand().getDurability());
json.newLine();
json.append("¡ì7 - ÎïƷչʾ: ¡ìf"); json.appendHover(ItemUtils.getCustomName(player.getItemInHand()), new ShowItemEvent(player.getItemInHand()));
json.send(player); json.send(player);
NBTItem nbt = new NBTItem(((Player) sender).getItemInHand()); NBTItem nbt = new NBTItem(((Player) sender).getItemInHand());

64
src/main/src/me/skymc/taboolib/jsonformatter/hover/ShowItemEvent.java
View File

@ -5,12 +5,14 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import me.skymc.taboolib.TabooLib;
import me.skymc.taboolib.inventory.ItemUtils;
import me.skymc.taboolib.json.JSONObject; import me.skymc.taboolib.json.JSONObject;
import me.skymc.taboolib.nms.NMSUtil19;
import me.skymc.taboolib.nms.item.DabItemUtils; import me.skymc.taboolib.nms.item.DabItemUtils;
public class ShowItemEvent extends HoverEvent{ public class ShowItemEvent extends HoverEvent{
@ -21,52 +23,34 @@ public class ShowItemEvent extends HoverEvent{
public ShowItemEvent(ItemStack is){ public ShowItemEvent(ItemStack is){
try{ try{
object.put("action", "show_item"); object.put("action", "show_item");
String display = DabItemUtils.getName(is);
String raw = DabItemUtils.getRawName(is);
ItemMeta im = is.getItemMeta(); ItemMeta im = is.getItemMeta();
List<String> lore = im.hasLore() ? im.getLore() : new ArrayList<String>(); List<String> lore = im.hasLore() ? im.getLore() : new ArrayList<>();
Map<Enchantment, Integer> enchants = is.getItemMeta().getEnchants(); Map<Enchantment, Integer> enchants = is.getItemMeta().getEnchants();
boolean utag = !display.equals(raw) || lore.size() > 0 || enchants.size() > 0; StringBuilder tag = new StringBuilder();
String tag = ""; tag.append(",tag:{display:{Name:" + (enchants.size() > 0 ? "¡ìb¡ìo" : "¡ìf") + ItemUtils.getCustomName(is));
if(utag){ if (lore.size() > 0) {
tag = ",tag:{"; tag.append(",Lore:[");
if(!display.equals(raw)){ for (String s : lore){
tag = tag + "display:{Name:" + display; tag.append("\"" + s + "\",");
if(lore.size() > 0){
tag = tag + ",Lore:[";
for(String s : lore){
tag = tag + "\"" + s + "\",";
} }
tag = tag.substring(0, tag.length() - 1); tag.delete(tag.length() - 1, tag.length());
tag = tag + "]"; tag.append("]");
} }
tag = tag + "}"; tag.append("}");
}else{ if (enchants.size() > 0) {
if(lore.size() > 0){ if(tag.length() > 6) {
tag = tag + "display:{Lore:["; tag.append(",");
for(String s : lore){
tag = tag + "\"" + s + "\",";
} }
tag = tag.substring(0, tag.length() - 1); tag.append("ench:[");
tag = tag + "]}"; for (Entry<Enchantment, Integer> e : enchants.entrySet()) {
tag.append("{id:" + e.getKey().getId() + ",lvl:" + e.getValue() + "},");
} }
tag.delete(tag.length() - 1, tag.length());
tag.append("]");
} }
if(enchants.size() > 0){ tag.append("}");
if(tag.length() > 6){ object.put("value", "{id:" + (TabooLib.getVerint() > 10700 ? DabItemUtils.getMinecraftName(is) : is.getTypeId()) + ",Count:" + is.getAmount() + tag.toString() + "}");
tag = tag + ","; } catch(Exception e) {
}
tag = tag + "ench:[";
for(Entry<Enchantment, Integer> e : enchants.entrySet()){
tag = tag + "{id:" + e.getKey().getId() + ",lvl:" + e.getValue() + "},";
}
tag = tag.substring(0, tag.length() - 1);
tag = tag + "]";
}
tag = tag + "}";
}
String name = DabItemUtils.getMinecraftName(is);
object.put("value", "{id:" + name + ",Count:" + is.getAmount() + tag + "}");
}catch(Exception e){
e.printStackTrace(); e.printStackTrace();
} }
} }