add forge support!

build.gradle

@@ -9,6 +9,7 @@ group = project.maven_group
 
 repositories {
     maven { url "https://api.modrinth.com/maven" }
+    maven { url "https://maven.minecraftforge.net" }
     maven { url "https://repo.papermc.io/repository/maven-public/" }
     maven {
         name = "sonatype-oss-snapshots1"
@@ -27,6 +28,9 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
+    // Forge
+    implementation "net.minecraftforge:javafmllanguage:${project.forge_version}"
+
     // Paper
     compileOnly "io.papermc.paper:paper-api:${project.paper_version}"
     modImplementation "net.kyori:adventure-platform-fabric:${project.adventure_version}"
@@ -50,6 +54,8 @@ shadowJar {
 
     dependencies {
         mergeServiceFiles()
+        exclude(dependency('org.slf4j:.*:.*'))
+        exclude(dependency('net.java.dev.jna:.*:.*'))
     }
 }
 

gradle.properties

@@ -7,6 +7,10 @@ yarn_mappings=1.20.4+build.3
 loader_version=0.15.6
 fabric_version=0.95.0+1.20.4
 
+# Forge Properties
+# check this on https://files.minecraftforge.net/net/minecraftforge/forge/
+forge_version=1.20.4-49.0.11
+
 # Paper
 # check this on https://repo.papermc.io/#browse/browse:maven-public:io%2Fpapermc%2Fpaper%2Fpaper-api
 paper_version=1.20.4-R0.1-SNAPSHOT

src/main/java/me/mrnavastar/sqlib/DataContainer.java

@@ -10,7 +10,6 @@
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;

src/main/java/me/mrnavastar/sqlib/Fabric.java

@@ -1,29 +1,14 @@
 package me.mrnavastar.sqlib;
 
-import me.mrnavastar.sqlib.database.Database;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 
 import java.nio.file.Path;
 
-public class Fabric extends SQLib implements PreLaunchEntrypoint, DedicatedServerModInitializer, ClientModInitializer {
+public class Fabric extends SQLib implements PreLaunchEntrypoint {
 
     @Override
     public void onPreLaunch() {
         init(Path.of(FabricLoader.getInstance().getGameDir() + "/sqlib"), FabricLoader.getInstance().getConfigDir());
     }
-
-    @Override
-    public void onInitializeServer() {
-        ServerLifecycleEvents.SERVER_STOPPING.register(server -> databases.forEach(Database::close));
-    }
-
-    @Override
-    public void onInitializeClient() {
-        ClientLifecycleEvents.CLIENT_STOPPING.register(client -> databases.forEach(Database::close));
-    }
 }

src/main/java/me/mrnavastar/sqlib/Forge.java

@@ -0,0 +1,13 @@
+package me.mrnavastar.sqlib;
+
+import net.minecraftforge.fml.common.Mod;
+
+import java.nio.file.Path;
+
+@Mod(SQLib.MOD_ID)
+public class Forge extends SQLib {
+
+    public Forge() {
+        init(Path.of("./sqlib"), Path.of("./config"));
+    }
+}

src/main/java/me/mrnavastar/sqlib/Paper.java

@@ -1,6 +1,5 @@
 package me.mrnavastar.sqlib;
 
-import me.mrnavastar.sqlib.database.Database;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class Paper extends JavaPlugin {
@@ -9,9 +8,4 @@ public class Paper extends JavaPlugin {
     public void onLoad() {
         SQLib.init(getDataFolder().toPath(), getDataFolder().toPath());
     }
-
-    @Override
-    public void onDisable() {
-        SQLib.getAllDatabases().forEach(Database::close);
-    }
 }

src/main/java/me/mrnavastar/sqlib/SQLib.java

@@ -23,10 +23,10 @@
 
 public class SQLib {
 
-    public static final String MOD_ID = "SQLib";
+    public static final String MOD_ID = "sqlib";
     public static final Gson GSON = new Gson();
 
-    protected static final ArrayList<Database> databases = new ArrayList<>();
+    private static final ArrayList<Database> databases = new ArrayList<>();
     @Getter
     protected static Database database;
     protected static SQLibConfig config = new SQLibConfig();
@@ -72,6 +72,8 @@ else if (config.database.type.equalsIgnoreCase("MYSQL")) {
 
             database = new MySQLDatabase(config.database.name, config.mysql.address, String.valueOf(config.mysql.port), config.mysql.username, config.mysql.password);
         }
+
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> databases.forEach(Database::close)));
     }
 
     public static void registerDatabase(Database database) {

src/main/resources/META-INF/mods.toml

@@ -0,0 +1,15 @@
+modLoader = "javafml"
+loaderVersion = "[36,)"
+license = "CC0-1.0"
+issueTrackerURL="https://github.com/MrNavaStar/SQLib/issues"
+
+[[mods]]
+modId = "sqlib"
+version = "0.debug-build"
+displayName = "SQLib"
+displayURL="https://github.com/MrNavaStar/SQLib"
+logoFile="assets/sqlib/icon.png"
+authors="MrNavaStar"
+description = 'A simple SQL wrapper with a focus on Minecraft use cases'
+
+displayTest="IGNORE_ALL_VERSION"

src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "ProtoWeaver",
+    "pack_format": 8
+  }
+}