502647092
/
YumCore
mirror of https://e.coding.net/circlecloud/YumCore.git
1
0
Fork 0
Code Issues Releases Activity

feat: 优化TellRaw处理 

Signed-off-by: 502647092 <admin@yumc.pw>
merge/1/MERGE
502647092 2016-12-16 15:41:23 +08:00
parent 82f150fd9d
commit 77b65a77da
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/main/java/pw/yumc/YumCore/tellraw/ItemSerialize.java
View File

@ -1,17 +1,18 @@
package pw.yumc.YumCore.tellraw;
import org.bukkit.Bukkit;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import pw.yumc.YumCore.bukkit.Log;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import pw.yumc.YumCore.bukkit.Log;
/**
* 物品序列化类
*
@ -23,7 +24,7 @@ public abstract class ItemSerialize {
static {
try {
itemSerialize = new Automatic();
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
} catch (IllegalStateException e) {
itemSerialize = new Manual();
Log.d("初始化自动物品序列化失败!", e);
}
@ -31,7 +32,7 @@ public abstract class ItemSerialize {
public static String $(ItemStack item) {
String result = itemSerialize.parse(item);
Log.d("%s物品序列化结果: %s", itemSerialize.getName(), result);
Log.d("%s 物品序列化结果: %s", itemSerialize.getName(), result);
return result;
}
@ -40,36 +41,46 @@ public abstract class ItemSerialize {
public abstract String parse(ItemStack item);
static class Automatic extends ItemSerialize {
Method asNMSCopyMethod;
Method nmsSaveNBTMethod;
Class<?> nmsNBTTagCompound;
String ver = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
private static boolean inited = false;
private static Method asNMSCopyMethod;
private static Method nmsSaveNBTMethod;
private static Class<?> nmsNBTTagCompound;
private static String ver = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
public Automatic() throws ClassNotFoundException, NoSuchMethodException, SecurityException {
Class<?> cis = getOBCClass("inventory.CraftItemStack");
asNMSCopyMethod = cis.getMethod("asNMSCopy", ItemStack.class);
Class<?> nmsItemStack = asNMSCopyMethod.getReturnType();
for (Method method : nmsItemStack.getMethods()) {
Class<?> rt = method.getReturnType();
if (method.getParameterTypes().length == 0 && "NBTTagCompound".equals(rt.getSimpleName())) {
nmsNBTTagCompound = rt;
static {
try {
Class<?> cis = getOBCClass("inventory.CraftItemStack");
asNMSCopyMethod = cis.getMethod("asNMSCopy", ItemStack.class);
Class<?> nmsItemStack = asNMSCopyMethod.getReturnType();
for (Method method : nmsItemStack.getMethods()) {
Class<?> rt = method.getReturnType();
if (method.getParameterTypes().length == 0 && "NBTTagCompound".equals(rt.getSimpleName())) {
nmsNBTTagCompound = rt;
}
}
}
for (Method method : nmsItemStack.getMethods()) {
Class<?>[] paras = method.getParameterTypes();
Class<?> rt = method.getReturnType();
if (paras.length == 1 && "NBTTagCompound".equals(paras[0].getSimpleName()) && "NBTTagCompound".equals(rt.getSimpleName())) {
nmsSaveNBTMethod = method;
for (Method method : nmsItemStack.getMethods()) {
Class<?>[] paras = method.getParameterTypes();
Class<?> rt = method.getReturnType();
if (paras.length == 1 && "NBTTagCompound".equals(paras[0].getSimpleName()) && "NBTTagCompound".equals(rt.getSimpleName())) {
nmsSaveNBTMethod = method;
}
}
inited = true;
} catch (ClassNotFoundException | NoSuchMethodException e) {
e.printStackTrace();
}
}
public Automatic() {
if (!inited) { throw new IllegalStateException("无法初始化自动处理类!"); }
}
@Override
public String getName() {
return "Automatic";
}
public Class getOBCClass(String cname) throws ClassNotFoundException {
private static Class getOBCClass(String cname) throws ClassNotFoundException {
return Class.forName("org.bukkit.craftbukkit." + ver + "." + cname);
}

13
src/main/java/pw/yumc/YumCore/tellraw/Tellraw.java
View File

@ -11,7 +11,6 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import pw.yumc.YumCore.bukkit.Log;
import pw.yumc.YumCore.bukkit.P;
import pw.yumc.YumCore.bukkit.compatible.C;
/**
@ -21,7 +20,6 @@ import pw.yumc.YumCore.bukkit.compatible.C;
* @author 喵♂呜
*/
public class Tellraw implements Cloneable {
static boolean isPaper = Bukkit.getVersion().contains("Paper") || Bukkit.getVersion().contains("Torch");
private List<MessagePart> messageParts = new ArrayList<>();
public Tellraw(String text) {
@ -163,16 +161,7 @@ public class Tellraw implements Cloneable {
public void send(final CommandSender sender) {
final String json = toJsonString();
if (sender instanceof Player && json.getBytes().length < 32000) {
if (isPaper && !Bukkit.isPrimaryThread()) {
Bukkit.getScheduler().runTask(P.instance, new Runnable() {
@Override
public void run() {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + sender.getName() + " " + json);
}
});
} else {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + sender.getName() + " " + json);
}
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "tellraw " + sender.getName() + " " + json);
} else {
sender.sendMessage(toOldMessageFormat());
}