Merge pull request #14 from RedStarMC/dev

Dev

Author: pingguomc

src/main/java/top/redstarmc/plugin/redstarlib/impl/ImplConfigManager.java

@@ -7,7 +7,6 @@
 
 import java.io.File;
 import java.util.Map;
-import java.util.Objects;
 
 public class ImplConfigManager extends ConfigurationManager {
 
@@ -16,29 +15,29 @@ public class ImplConfigManager extends ConfigurationManager {
             .toMap();
 
 
-    private static final File config_file = new File(RedStarLib.getInstance().getDataFolder(),"config.yml");
-
-    private static YamlConfiguration config;
+    private static final File config_file = new File(RedStarLib.getInstance().getDataFolder(),"plugin.yml");
 
     private static final String versioning = "0.0.0";
 
     public ImplConfigManager(){
-        super(config_file, config);
+        super(config_file);
     }
 
     @Override
     public void init() {
 
-        config = initFile();
-
-        if (!Objects.equals(config.getString("Versioning"), versioning)) {
+        YamlConfiguration config = getConfig();
 
-            config = new YamlConfiguration();
+        saveJarConfig("plugin.yml", RedStarLib.getInstance());
 
-            saveMapConfig(default_config);
-            config.set("Versioning", versioning);
-            save();
-        }
+//        if (!Objects.equals(config.getString("Versioning"), versioning)) {
+//
+//            config = new YamlConfiguration();
+//
+//            saveMapConfig(default_config);
+//            config.set("Versioning", versioning);
+//            save();
+//        }
     }
 
 }

src/main/java/top/redstarmc/plugin/redstarlib/manager/DataBaseManager.java

@@ -0,0 +1,66 @@
+package top.redstarmc.plugin.redstarlib.manager;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.function.SQLDebugHandler;
+import cc.carm.lib.easysql.hikari.HikariConfig;
+import cc.carm.lib.easysql.hikari.HikariDataSource;
+import cc.carm.lib.easysql.manager.SQLManagerImpl;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Properties;
+
+public abstract class DataBaseManager<T extends SQLManager,U extends SQLDebugHandler> {
+
+    SQLManager sqlManager;
+
+    public DataBaseManager(@NotNull Properties properties){
+        create(new HikariDataSource(new HikariConfig(properties)));
+        sqlManager.setDebugMode(false);
+    }
+
+    public DataBaseManager(@NotNull HikariConfig config){
+        create(new HikariDataSource(config));
+        sqlManager.setDebugMode(false);
+    }
+
+    public DataBaseManager(boolean debugMode, @NotNull Properties properties){
+        create(new HikariDataSource(new HikariConfig(properties)));
+        sqlManager.setDebugMode(debugMode);
+    }
+
+
+    public DataBaseManager(boolean debugMode,@NotNull HikariConfig config){
+        create(new HikariDataSource(config));
+        sqlManager.setDebugMode(debugMode);
+    }
+
+    public DataBaseManager(boolean debugMode, U debugHandler, @NotNull Properties properties){
+        create(new HikariDataSource(new HikariConfig(properties)));
+        sqlManager.setDebugMode(debugMode);
+        sqlManager.setDebugHandler(debugHandler);
+    }
+
+    public DataBaseManager(boolean debugMode, U debugHandler,@NotNull HikariConfig config){
+        create(new HikariDataSource(config));
+        sqlManager.setDebugMode(debugMode);
+        sqlManager.setDebugHandler(debugHandler);
+    }
+
+    public DataBaseManager(boolean debugMode, U debugHandler, HikariDataSource config){
+        sqlManager = new SQLManagerImpl(config);
+        sqlManager.setDebugMode(debugMode);
+        sqlManager.setDebugHandler(debugHandler);
+    }
+
+    private void create(@NotNull HikariDataSource hikariDataSource){
+        sqlManager = new SQLManagerImpl(hikariDataSource);
+    }
+
+    public SQLManager getSqlManager() {
+        return sqlManager;
+    }
+
+    public SQLManager getSM() {
+        return sqlManager;
+    }
+}