clean up functions

MrNavaStar · Jul 18, 2024 · 303b2da · 303b2da
1 parent a354492
commit 303b2da
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/src/main/java/me/mrnavastar/sqlib/Fabric.java b/src/main/java/me/mrnavastar/sqlib/Fabric.java
@@ -1,12 +1,13 @@
 package me.mrnavastar.sqlib;
 
+import me.mrnavastar.sqlib.impl.Config;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.nio.file.Path;
 
 public class Fabric extends SQLib {
 
     public static void init() {
-        init(Path.of(FabricLoader.getInstance().getGameDir() + "/sqlib"), FabricLoader.getInstance().getConfigDir());
+        database = Config.load(Path.of(FabricLoader.getInstance().getGameDir() + "/sqlib"), FabricLoader.getInstance().getConfigDir());
     }
 }
diff --git a/src/main/java/me/mrnavastar/sqlib/Quilt.java b/src/main/java/me/mrnavastar/sqlib/Quilt.java
@@ -1,12 +1,13 @@
 package me.mrnavastar.sqlib;
 
+import me.mrnavastar.sqlib.impl.Config;
 import org.quiltmc.loader.api.QuiltLoader;
 
 import java.nio.file.Path;
 
 public class Quilt extends SQLib {
 
     public static void init() {
-        init(Path.of(QuiltLoader.getGameDir() + "/sqlib"), QuiltLoader.getConfigDir());
+        database = Config.load(Path.of(QuiltLoader.getGameDir() + "/sqlib"), QuiltLoader.getConfigDir());
     }
 }
diff --git a/src/main/java/me/mrnavastar/sqlib/SQLib.java b/src/main/java/me/mrnavastar/sqlib/SQLib.java
@@ -1,11 +1,7 @@
 package me.mrnavastar.sqlib;
 
-import me.mrnavastar.sqlib.impl.Config;
 import me.mrnavastar.sqlib.api.database.Database;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 
-import java.nio.file.Path;
 import java.util.List;
 
 public class SQLib {
@@ -36,15 +32,7 @@ public static Database getDatabase() {
         }
     }
 
-    protected static void init(Path localDir, Path configDir) {
-        database = Config.load(localDir, configDir);
-    }
-
     public static List<Database> getDatabases() {
         return Database.getDatabases();
     }
-
-    public static void log(Level level, String message) {
-        LogManager.getLogger().log(level, "[SQLib] " + message);
-    }
 }
diff --git a/src/main/java/me/mrnavastar/sqlib/Velocity.java b/src/main/java/me/mrnavastar/sqlib/Velocity.java
@@ -1,11 +1,13 @@
 package me.mrnavastar.sqlib;
 
+import me.mrnavastar.sqlib.impl.Config;
+
 import java.nio.file.Path;
 
 public class Velocity extends SQLib {
 
     public static void init() {
         Path dir = Path.of("plugins/sqlib");
-        init(dir,dir);
+        database = Config.load(dir,dir);
     }
 }
diff --git a/src/main/java/me/mrnavastar/sqlib/impl/Config.java b/src/main/java/me/mrnavastar/sqlib/impl/Config.java
@@ -6,6 +6,7 @@
 import me.mrnavastar.sqlib.api.database.PostgreSQL;
 import me.mrnavastar.sqlib.api.database.SQLite;
 import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -77,7 +78,7 @@ public static me.mrnavastar.sqlib.api.database.Database load(Path localDir, Path
         }
 
         if (!INSTANCE.validate()) {
-            SQLib.log(Level.ERROR, "Invalid config - Stopping");
+            log(Level.ERROR, "Invalid config - Stopping");
             System.exit(1);
         }
 
@@ -88,4 +89,8 @@ public static me.mrnavastar.sqlib.api.database.Database load(Path localDir, Path
             default -> null;
         };
     }
+
+    public static void log(Level level, String message) {
+        LogManager.getLogger().log(level, "[SQLib] " + message);
+    }
 }