Merge pull request #4 from MEFRREEX/feat/more-server-software

feat: more server software and fixes

README.md

@@ -12,6 +12,7 @@ Features:
 - MySQL support
 - Disabled printing logo and tips from JOOQ
 - Inclusion of JOOQ, SQLite and MySQL drivers in jar file
+- Support for different server software (Nukkit, PowerNukkitX, JukeboxMC, WaterdogPE)
 
 ## 🛠 Examples
 
@@ -62,7 +63,7 @@ System.out.println("Value from table: " + value);
 
 Example of using a MySQL database
 ```java
-MySQLDatabase database = new MySQLDatabase("host", "database", "user", "password");
+MySQLDatabase database = new MySQLDatabase("127.0.0.1:3306", "database", "user", "password");
 
 // Other code will be identical...
 ```
@@ -71,7 +72,7 @@ Example of using SQlite or MySQL database
 ```java
 IDatabase database = sqlite ? 
     new SQLiteDatabase(new File("database.db")) : 
-    new MySQLDatabase("host", "database", "user", "password");
+    new MySQLDatabase("127.0.0.1:3306", "database", "user", "password");
 ```
 
 You can make a separate class with methods for the database

api/src/main/java/com/mefrreex/jooq/database/MySQLDatabase.java

@@ -2,6 +2,7 @@
 
 import com.mefrreex.jooq.exception.ConnectionNotEstablishedException;
 import org.jooq.SQLDialect;
+import lombok.Getter;
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -10,6 +11,7 @@
 import java.sql.SQLException;
 import java.util.concurrent.CompletableFuture;
 
+@Getter
 public class MySQLDatabase implements IDatabase {
 
     private final String host;
@@ -19,10 +21,7 @@ public class MySQLDatabase implements IDatabase {
     private Connection connection;
 
     public MySQLDatabase(String host, String database, String user, String password) {
-        if (!host.contains(":")) {
-            throw new IllegalArgumentException("Host must be in format: address:port");
-        }
-        this.host = host;
+        this.host = host.contains(":") ? host : host + ":3306";
         this.database = database;
         this.user = user;
         this.password = password;

api/src/main/java/com/mefrreex/jooq/database/SQLiteDatabase.java

@@ -2,6 +2,7 @@
 
 import com.mefrreex.jooq.exception.ConnectionNotEstablishedException;
 import org.jooq.SQLDialect;
+import lombok.Getter;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,17 +11,18 @@
 import java.sql.SQLException;
 import java.util.concurrent.CompletableFuture;
 
+@Getter
 public class SQLiteDatabase implements IDatabase {
 
-    private final File database;
+    private final File file;
     private Connection connection;
 
-    public SQLiteDatabase(File database) {
-        this.database = database;
-        if (!database.exists()) {
+    public SQLiteDatabase(File file) {
+        this.file = file;
+        if (!file.exists()) {
             try {
-                if (!database.createNewFile()) {
-                    throw new IOException("Failed to create the database file.");
+                if (!file.createNewFile()) {
+                    throw new IOException("Failed to create the database file");
                 }
             } catch (IOException e) {
                 e.printStackTrace();
@@ -38,7 +40,7 @@ public CompletableFuture<Connection> getConnection() {
         return CompletableFuture.supplyAsync(() -> {
             try {
                 if (connection == null || connection.isClosed()) {
-                    connection = DriverManager.getConnection("jdbc:sqlite:" + database.getAbsolutePath());
+                    connection = DriverManager.getConnection("jdbc:sqlite:" + file.getAbsolutePath());
                 }
                 return connection;
             } catch (SQLException e) {

build.gradle.kts

@@ -13,7 +13,7 @@ tasks.build {
 allprojects {
     group = "com.mefrreex.jooqconnector"
     description = "jooqconnector"
-    version = "1.0.0"
+    version = "1.0.1"
 }
 
 subprojects {
@@ -42,6 +42,10 @@ subprojects {
         }
     }
 
+    fun getArchiveName(): String {
+        return name
+    }
+
     publishing {
         publications {
             create<MavenPublication>("maven") {

plugin-jukeboxmc/build.gradle.kts

@@ -0,0 +1,22 @@
+plugins {
+    id("java")
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+}
+
+repositories {
+    maven("https://repo.jukeboxmc.eu/releases")
+    maven("https://repo.jukeboxmc.eu/snapshots")
+}
+
+dependencies {
+    compileOnlyApi("org.jukeboxmc:JukeboxMC-API:1.0.0-SNAPSHOT")
+    api(project(":api"))
+}
+
+tasks.withType<Jar> {
+    archiveFileName.set("JOOQConnector-JukeboxMC-${project.version}.jar")
+}
+
+tasks.build {
+    dependsOn(tasks.shadowJar)
+}

plugin-jukeboxmc/src/main/java/com/mefrreex/jooq/JOOQConnectorJukeboxMC.java

@@ -0,0 +1,16 @@
+package com.mefrreex.jooq;
+
+import org.jukeboxmc.api.plugin.Plugin;
+
+public class JOOQConnectorJukeboxMC extends Plugin {
+
+    @Override
+    public void onStartup() {
+        JOOQConnector.setJOOQMessagesEnabled(false);
+    }
+
+    @Override
+    public void onEnable() {
+
+    }
+}

plugin-jukeboxmc/src/main/resources/plugin.yml

@@ -0,0 +1,4 @@
+name: "JOOQConnector"
+version: "${project.version}"
+author: "MEFRREEX"
+main: com.mefrreex.jooq.JOOQConnectorJukeboxMC

plugin-waterdogpe/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    id("java")
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+}
+
+repositories {
+    mavenCentral()
+    maven("https://repo.waterdog.dev/main")
+    maven("https://repo.opencollab.dev/maven-releases")
+    maven("https://repo.opencollab.dev/maven-snapshots")
+}
+
+dependencies {
+    compileOnlyApi("dev.waterdog.waterdogpe:waterdog:2.0.0-SNAPSHOT")
+    api(project(":api"))
+}
+
+tasks.withType<Jar> {
+    archiveFileName.set("JOOQConnector-WaterdogPE-${project.version}.jar")
+}
+
+tasks.build {
+    dependsOn(tasks.shadowJar)
+}

plugin-waterdogpe/src/main/java/com/mefrreex/jooq/JOOQConnectorWaterdogPE.java

@@ -0,0 +1,16 @@
+package com.mefrreex.jooq;
+
+import dev.waterdog.waterdogpe.plugin.Plugin;
+
+public class JOOQConnectorWaterdogPE extends Plugin {
+
+    @Override
+    public void onStartup() {
+        JOOQConnector.setJOOQMessagesEnabled(false);
+    }
+
+    @Override
+    public void onEnable() {
+
+    }
+}

plugin-waterdogpe/src/main/resources/plugin.yml

@@ -0,0 +1,4 @@
+name: "JOOQConnector"
+version: "${project.version}"
+author: "MEFRREEX"
+main: com.mefrreex.jooq.JOOQConnectorWaterdogPE

settings.gradle.kts

@@ -3,3 +3,5 @@ rootProject.name = "JOOQConnector"
 include("api")
 include("plugin-nukkit")
 include("plugin-pnx")
+include("plugin-jukeboxmc")
+include("plugin-waterdogpe")