From 4c46af55d0ccec651109d5a6d5a16ba53ca4fae2 Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Thu, 6 Jan 2022 16:21:29 +0800
Subject: [PATCH] =?UTF-8?q?[v1.2.1]=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=20-=20[U]=20=E9=87=87=E7=94=A8=E6=9C=80=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20EasyPlugin=20-=20[U]=20=E4=BF=9D=E7=95=99=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8E=9F=E6=9C=AC?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../ultradepository/UltraDepository.java      | 20 ++++++------
 .../manager/ConfigManager.java                | 31 +++++++++++++------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index c34f04d..6844bff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>cc.carm.plugin</groupId>
     <artifactId>ultradepository</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 
     <name>UltraDepository</name>
     <description>超级仓库插件，支持设定不同物品的存储仓库。</description>
diff --git a/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java b/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java
index f3c01b9..ca90c32 100644
--- a/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java
+++ b/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java
@@ -38,28 +38,25 @@ public class UltraDepository extends EasyPlugin {
 	@Override
 	protected void load() {
 		instance = this;
-
-		log("加载配置文件...");
-		ConfigManager.initConfig();
-
-		GUI.initialize(this);
 	}
 
 	@Override
 	protected boolean initialize() {
 
-		log("初始化存储方式...");
-		StorageMethod storageMethod = PluginConfig.STORAGE_METHOD.get();
-		if (storageMethod == null) {
-			log("初始化存储方式失败，放弃加载");
+		log("加载配置文件...");
+		if (!ConfigManager.initialize()) {
+			log("初始化配置文件失败，放弃加载。");
 			return false;
 		}
 
-		storage = storageMethod.createStorage();
+		log("初始化存储方式...");
+		StorageMethod storageMethod = PluginConfig.STORAGE_METHOD.getOptional().orElse(StorageMethod.YAML);
 		log("	正在使用 " + storageMethod.name() + " 进行数据存储");
 
+		storage = storageMethod.createStorage();
 		if (!storage.initialize()) {
-			error("存储初始化失败，请检查配置文件。");
+			error("初始化存储失败，请检查配置文件。");
+			storage.shutdown();
 			return false;
 		}
 
@@ -79,6 +76,7 @@ public class UltraDepository extends EasyPlugin {
 		log("加载仓库管理器...");
 		depositoryManager = new DepositoryManager();
 		getDepositoryManager().loadDepositories();
+		GUI.initialize(this);
 
 		log("注册监听器...");
 		regListener(new UserListener());
diff --git a/src/main/java/cc/carm/plugin/ultradepository/manager/ConfigManager.java b/src/main/java/cc/carm/plugin/ultradepository/manager/ConfigManager.java
index 246ac6a..c66e397 100644
--- a/src/main/java/cc/carm/plugin/ultradepository/manager/ConfigManager.java
+++ b/src/main/java/cc/carm/plugin/ultradepository/manager/ConfigManager.java
@@ -9,12 +9,17 @@ public class ConfigManager {
 	private static FileConfig pluginConfiguration;
 	private static FileConfig messageConfiguration;
 
-	public static void initConfig() {
-		pluginConfiguration = new FileConfig(UltraDepository.getInstance(), "config.yml");
-		messageConfiguration = new FileConfig(UltraDepository.getInstance(), "messages.yml");
+	public static boolean initialize() {
+		try {
+			pluginConfiguration = new FileConfig(UltraDepository.getInstance(), "config.yml");
+			messageConfiguration = new FileConfig(UltraDepository.getInstance(), "messages.yml");
 
-		FileConfig.pluginConfiguration = () -> pluginConfiguration;
-		FileConfig.messageConfiguration = () -> messageConfiguration;
+			FileConfig.pluginConfiguration = () -> pluginConfiguration;
+			FileConfig.messageConfiguration = () -> messageConfiguration;
+			return true;
+		} catch (Exception ex) {
+			return false;
+		}
 	}
 
 	public static FileConfig getPluginConfig() {
@@ -26,13 +31,21 @@ public class ConfigManager {
 	}
 
 	public static void reload() {
-		getPluginConfig().reload();
-		getMessageConfig().reload();
+		try {
+			getPluginConfig().reload();
+			getMessageConfig().reload();
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
 	}
 
 	public static void saveConfig() {
-		getPluginConfig().save();
-		getMessageConfig().save();
+		try {
+			getPluginConfig().save();
+			getMessageConfig().save();
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
 	}
 
 }