TabooLib v4.25

+ 新增 TConfiguration 工具，与 TConfigWatcher 联动创建能够自动重载的配置文件。（尚未测试） + 新增 TFunction 注解，自动执行载入与卸载方法。（变懒第一步，放弃注册步骤） + 调整 TLogger 工具，允许以自定义名称创建，并支持在 BungeeCord 下使用。 + 调整 TListener 与 Instantiable 注解，不会再重复读取插件类了。 + 调整 ReflectionUtils 工具，对部分语法进行了修改。 + 调整 TabooLib 类下的 isSpigot 与 getVersion 算法。 + 重做 AnvilContainerAPI 工具，现在可以正常使用了。（丢人玩意儿终于重写了） + InstanceHandler 类更名为 InstantiableLoader + MsgUtils 类被赋予尊贵的 @Deprecated
2018-09-08 18:06:43 +08:00
parent 6bb361d781
commit 4d59c7c3d6
19 changed files with 1098 additions and 797 deletions
--- a/src/main/java/com/ilummc/tlib/logger/TLogger.java
+++ b/src/main/java/com/ilummc/tlib/logger/TLogger.java
@@ -1,9 +1,12 @@
 package com.ilummc.tlib.logger;

+import com.ilummc.tlib.resources.TLocale;
 import com.ilummc.tlib.util.Strings;
 import me.skymc.taboolib.Main;
+import me.skymc.taboolib.TabooLib;
+import net.md_5.bungee.BungeeCord;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.plugin.Plugin;

 public class TLogger {
@@ -12,7 +15,7 @@ public class TLogger {

    private static TLogger globalLogger = new TLogger("§8[§3§lTabooLib§8][§r{1}§8] §f{2}", Main.getInst(), TLogger.FINE);
    private final String pattern;
-    private Plugin plugin;
+    private String name;
    private int level;

    public static TLogger getGlobalLogger() {
@@ -23,8 +26,8 @@ public class TLogger {
        return pattern;
    }

-    public Plugin getPlugin() {
-        return plugin;
+    public String getName() {
+        return name;
    }

    public int getLevel() {
@@ -37,49 +40,83 @@ public class TLogger {

    public TLogger(String pattern, Plugin plugin, int level) {
        this.pattern = pattern;
-        this.plugin = plugin;
+        this.name = plugin.getName();
+        this.level = level;
+    }
+
+    public TLogger(String pattern, String name, int level) {
+        this.pattern = pattern;
+        this.name = name;
        this.level = level;
    }

    public void verbose(String msg) {
        if (level <= VERBOSE) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§f全部", ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§f全部", TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§f全部", TLocale.Translate.setColored(msg))));
+            }
        }
    }

    public void finest(String msg) {
        if (level <= FINEST) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§e良好", ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§e良好", TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§e良好", TLocale.Translate.setColored(msg))));
+            }
        }
    }

    public void fine(String msg) {
        if (level <= FINE) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§a正常", ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§a正常", TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§a正常", TLocale.Translate.setColored(msg))));
+            }
        }
    }

    public void info(String msg) {
        if (level <= INFO) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§b信息", ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§b信息", TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§b信息", TLocale.Translate.setColored(msg))));
+            }
        }
    }

    public void warn(String msg) {
        if (level <= WARN) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§6警告", "§6" + ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§6警告", "§6" + TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§6警告", "§6" + TLocale.Translate.setColored(msg))));
+            }
        }
    }

    public void error(String msg) {
        if (level <= ERROR) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§c错误", "§c" + ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§c错误", "§c" + TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§c错误", "§c" + TLocale.Translate.setColored(msg))));
+            }
        }
    }

    public void fatal(String msg) {
        if (level <= FATAL) {
-            Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, plugin.getName(), "§4致命错误", "§4" + ChatColor.translateAlternateColorCodes('&', msg)));
+            if (TabooLib.isSpigot()) {
+                Bukkit.getConsoleSender().sendMessage(Strings.replaceWithOrder(pattern, name, "§4致命错误", "§4" + TLocale.Translate.setColored(msg)));
+            } else {
+                BungeeCord.getInstance().getConsole().sendMessage(TextComponent.fromLegacyText(Strings.replaceWithOrder(pattern, name, "§4致命错误", "§4" + TLocale.Translate.setColored(msg))));
+            }
        }
    }

@@ -87,4 +124,7 @@ public class TLogger {
        return new TLogger("§8[§3§l{0}§8][§r{1}§8] §f{2}", plugin, TLogger.FINE);
    }

+    public static TLogger getUnformatted(String name) {
+        return new TLogger("§8[§3§l{0}§8][§r{1}§8] §f{2}", name, TLogger.FINE);
+    }
 }
--- a/src/main/java/com/ilummc/tlib/nms/ActionBar.java
+++ b/src/main/java/com/ilummc/tlib/nms/ActionBar.java
@@ -40,10 +40,8 @@ public abstract class ActionBar {
        @Override
        public void send(Player player, String text) {
            net.minecraft.server.v1_12_R1.ChatComponentText component = new net.minecraft.server.v1_12_R1.ChatComponentText(text);
-            net.minecraft.server.v1_12_R1.PacketPlayOutChat packet = new net.minecraft.server.v1_12_R1.PacketPlayOutChat(component,
-                    net.minecraft.server.v1_12_R1.ChatMessageType.a((byte) 2));
+            net.minecraft.server.v1_12_R1.PacketPlayOutChat packet = new net.minecraft.server.v1_12_R1.PacketPlayOutChat(component, net.minecraft.server.v1_12_R1.ChatMessageType.a((byte) 2));
            ((org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
-
        }
    }
 }
--- a/src/main/java/com/ilummc/tlib/util/asm/AsmClassTransformer.java
+++ b/src/main/java/com/ilummc/tlib/util/asm/AsmClassTransformer.java
@@ -13,16 +13,15 @@ import java.util.Map;
 public class AsmClassTransformer extends ClassVisitor implements Opcodes {

    private final Class<?> from;
-
-    private final String fromVer, toVer;
-
+    private final String fromVer;
+    private final String toVer;
    private final ClassWriter writer;
-
-    private String newClassName, prevName;
+    private String newClassName;
+    private String prevName;

    private AsmClassTransformer(Class<?> from, String fromVer, String toVer, ClassWriter classWriter) {
        super(Opcodes.ASM6, classWriter);
-        writer = classWriter;
+        this.writer = classWriter;
        this.from = from;
        this.fromVer = fromVer;
        this.toVer = toVer;
@@ -67,9 +66,15 @@ public class AsmClassTransformer extends ClassVisitor implements Opcodes {
        super.visitInnerClass(replace(name), outerName, replace(name).substring(outerName.length() + 1), access);
    }

+    @Override
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        super.visit(version, access, newClassName.replace('.', '/'), replace(signature), replace(superName), replace(interfaces));
+    }
+
    private String replace(String text) {
        if (text != null) {
-            return text.replace("net/minecraft/server/" + fromVer, "net/minecraft/server/" + toVer)
+            return text
+                    .replace("net/minecraft/server/" + fromVer, "net/minecraft/server/" + toVer)
                    .replace("org/bukkit/craftbukkit/" + fromVer, "org/bukkit/craftbukkit/" + toVer)
                    .replace(prevName, newClassName.replace('.', '/'));
        } else {
@@ -88,12 +93,6 @@ public class AsmClassTransformer extends ClassVisitor implements Opcodes {
        }
    }

-    @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        super.visit(version, access, newClassName.replace('.', '/'), replace(signature),
-                replace(superName), replace(interfaces));
-    }
-
    private class AsmMethodTransformer extends MethodVisitor {

        AsmMethodTransformer(MethodVisitor visitor) {