测试上传

src/main/java/me/skymc/taboolib/Main.java

@@ -64,8 +64,6 @@ public class Main extends JavaPlugin implements Listener {
     @Getter
     private static File serverDataFolder;
     @Getter
-    private static File docsFolder;
-    @Getter
     private static StorageType storageType;
     @Getter
     private static boolean disable = false;
@@ -105,14 +103,12 @@ public class Main extends JavaPlugin implements Listener {
 	@Override
     public void onLoad() {
     	inst = this; disable = false;
-
-        TLib.init();
-
-    	// 启动监控
-    	new Metrics(this);
-    	
     	// 载入配置
 		saveDefaultConfig();
+
+		// 加载依赖
+        TLib.init();
+        
 		// 载入目录
 		setupDataFolder();
 		// 注册配置
@@ -218,6 +214,8 @@ public class Main extends JavaPlugin implements Listener {
 		
 		// 更新检测
 		new UpdateTask();
+    	// 启动监控
+    	new Metrics(this);
 		
 		// 启动
 		started = true;
@@ -286,16 +284,10 @@ public class Main extends JavaPlugin implements Listener {
 		if (!playerDataFolder.exists()) {
 			playerDataFolder.mkdirs();
 		}
-		
 		serverDataFolder = new File(getConfig().getString("DATAURL.SERVER-DATA"));
 		if (!serverDataFolder.exists()) {
 			serverDataFolder.mkdirs();
 		}
-		
-		docsFolder = new File(getDataFolder(), "Document");
-		if (!docsFolder.exists()) {
-			docsFolder.mkdirs();
-		}
 	}
 	
 	private void registerListener() {

src/main/java/me/skymc/taboolib/inventory/ItemUtils.java

@@ -76,9 +76,13 @@ public class ItemUtils {
 	}
 	
 	public static void LoadLib() {
-		itemdir = YamlConfiguration.loadConfiguration(new File(Main.getInst().getConfig().getString("DATAURL.ITEMDIR")));
-		reloadItemName();
-		reloadItemCache();
+		try {
+			reloadItemName();
+			reloadItemCache();
+			itemdir = YamlConfiguration.loadConfiguration(new File(Main.getInst().getConfig().getString("DATAURL.ITEMDIR")));
+		} catch (Exception e) {
+			MsgUtils.warn("物品库载入失败: &4" + e.getMessage());
+		}
 	}
 	
 	public static void loadItemsFile(File file, boolean finalFile) {
@@ -135,7 +139,6 @@ public class ItemUtils {
 		return item.getItemMeta().hasDisplayName() ? item.getItemMeta().getDisplayName() : itemlib.get(item.getType() + ":" + data) == null ? item.getType().toString() : itemlib.get(item.getType() + ":" + data);
 	}
 	
-	@SuppressWarnings("deprecation")
 	public static ItemStack getItemFromDir(String name) {
 		if (itemdir != null) {
 			return itemdir.getItemStack("item." + name);

src/main/java/me/skymc/taboolib/string/language2/Language2Format.java

@@ -2,6 +2,8 @@ package me.skymc.taboolib.string.language2;
 
 import lombok.Getter;
 import me.skymc.taboolib.string.language2.value.*;
+
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
@@ -100,40 +102,41 @@ public class Language2Format implements Language2Line {
 	private void parseValue(Player player, List<String> list, Language2Type type) {
 		if (list.size() == 0) {
 			return;
-		}	
+		}
 		// 变量转换
-		list = language2Value.setPlaceholder(list, player);
+		List<String> listPlaceholder = language2Value.setPlaceholder(list, player);
 		// 大标题
         switch (type) {
             case TITLE:
-                language2Lines.add(new Language2Title(this, list));
+                language2Lines.add(new Language2Title(this, listPlaceholder));
                 break;
             // 小标题
             case ACTION:
-                language2Lines.add(new Language2Action(this, list));
+                language2Lines.add(new Language2Action(this, listPlaceholder));
                 break;
             // JSON
             case JSON:
-                language2Lines.add(new Language2Json(this, list, player));
+                language2Lines.add(new Language2Json(this, listPlaceholder, player));
                 break;
             // JSON2
             case JSON2:
-                language2Lines.add(new Language2Json2(this, list, player));
+                language2Lines.add(new Language2Json2(this, listPlaceholder, player));
                 break;
             // 音效
             case SOUND:
-                language2Lines.add(new Language2Sound(this, list));
+                language2Lines.add(new Language2Sound(this, listPlaceholder));
                 break;
             // 书本
             case BOOK:
-                language2Lines.add(new Language2Book(this, list, player));
+                language2Lines.add(new Language2Book(this, listPlaceholder, player));
                 break;
             default:
-                language2Lines.add(new Language2Text(this, list));
+                language2Lines.add(new Language2Text(this, listPlaceholder));
                 break;
 		}
 		// 清理数据
 		list.clear();
+		listPlaceholder.clear();
 	}
 
 	@Override