diff --git a/README.md b/README.md
index a581640..ed56309 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,7 @@
```yaml
Database:
+ Type: sqlite # pgsql, sqlite
Host: localhost
Port: 5432
Name: dominion
diff --git a/pom.xml b/pom.xml
index 0163a35..5abfb14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
cn.lunadeer
Dominion
- 1.14.9-beta
+ 1.15.9-beta
jar
Dominion
@@ -75,6 +75,11 @@
1.20.1-R0.1-SNAPSHOT
provided
+
+ org.xerial
+ sqlite-jdbc
+ 3.34.0
+
org.postgresql
postgresql
diff --git a/src/main/java/cn/lunadeer/dominion/utils/ConfigManager.java b/src/main/java/cn/lunadeer/dominion/utils/ConfigManager.java
index 80b7c44..169429d 100644
--- a/src/main/java/cn/lunadeer/dominion/utils/ConfigManager.java
+++ b/src/main/java/cn/lunadeer/dominion/utils/ConfigManager.java
@@ -17,6 +17,11 @@ public class ConfigManager {
_plugin.reloadConfig();
_file = _plugin.getConfig();
_debug = _file.getBoolean("Debug", false);
+ _db_type = _file.getString("Database.Type", "sqlite");
+ if (!_db_type.equals("pgsql") && !_db_type.equals("sqlite")) {
+ XLogger.err("当前数据库只支持 pgsql 或 sqlite,已重置为 sqlite");
+ setDbType("sqlite");
+ }
_db_host = _file.getString("Database.Host", "localhost");
_db_port = _file.getString("Database.Port", "5432");
_db_name = _file.getString("Database.Name", "dominion");
@@ -65,10 +70,27 @@ public class ConfigManager {
_plugin.saveConfig();
}
- public String getDBConnectionUrl() {
- return "jdbc:postgresql://" + _db_host + ":" + _db_port + "/" + _db_name;
+ public String getDbType() {
+ return _db_type;
}
+ public void setDbType(String db_type) {
+ _db_type = db_type;
+ _file.set("Database.Type", db_type);
+ _plugin.saveConfig();
+ }
+
+ public String getDbHost() {
+ return _db_host;
+ }
+
+ public String getDbPort() {
+ return _db_port;
+ }
+
+ public String getDbName() {
+ return _db_name;
+ }
public void setDbUser(String db_user) {
_db_user = db_user;
@@ -205,6 +227,7 @@ public class ConfigManager {
private FileConfiguration _file;
private Boolean _debug;
+ private String _db_type;
private String _db_host;
private String _db_port;
private String _db_user;
diff --git a/src/main/java/cn/lunadeer/dominion/utils/Database.java b/src/main/java/cn/lunadeer/dominion/utils/Database.java
index 2bbcc89..aee9315 100644
--- a/src/main/java/cn/lunadeer/dominion/utils/Database.java
+++ b/src/main/java/cn/lunadeer/dominion/utils/Database.java
@@ -8,10 +8,28 @@ public class Database {
public static Connection createConnection() {
try {
- Class.forName("org.postgresql.Driver");
- return DriverManager.getConnection(Dominion.config.getDBConnectionUrl(), Dominion.config.getDbUser(), Dominion.config.getDbPass());
+ String connectionUrl;
+ if (Dominion.config.getDbType().equals("pgsql")) {
+ XLogger.info("正在连接到 PostgreSQL 数据库");
+ Class.forName("org.postgresql.Driver");
+ connectionUrl = "jdbc:postgresql://" + Dominion.config.getDbHost() + ":" + Dominion.config.getDbPort();
+ connectionUrl += "/" + Dominion.config.getDbName();
+ return DriverManager.getConnection(connectionUrl, Dominion.config.getDbUser(), Dominion.config.getDbPass());
+ } else if (Dominion.config.getDbType().equals("sqlite")) {
+ XLogger.info("正在连接到 SQLite 数据库");
+ Class.forName("org.sqlite.JDBC");
+ connectionUrl = "jdbc:sqlite:" + Dominion.instance.getDataFolder() + "/" + Dominion.config.getDbName() + ".db";
+ return DriverManager.getConnection(connectionUrl);
+ } else {
+ XLogger.err("=== 严重错误 ===");
+ XLogger.err("数据库类型错误,只能为 pgsql 或 sqlite");
+ XLogger.err("===============");
+ return null;
+ }
} catch (ClassNotFoundException | SQLException e) {
+ XLogger.err("=== 严重错误 ===");
XLogger.err("Database connection failed: " + e.getMessage());
+ XLogger.err("===============");
return null;
}
}
@@ -26,13 +44,42 @@ public class Database {
// if query with no result return null
if (stmt.execute(sql)) {
return stmt.getResultSet();
- } else {
- return null;
}
} catch (SQLException e) {
- XLogger.err("Database query failed: " + e.getMessage());
- XLogger.err("SQL: " + sql);
- return null;
+ handleDatabaseError("Database query failed: ", e, sql);
+ }
+ return null;
+ }
+
+ private static void handleDatabaseError(String errorMessage, SQLException e, String sql) {
+ XLogger.err("=== 严重错误 ===");
+ XLogger.err(errorMessage + e.getMessage());
+ XLogger.err("SQL: " + sql);
+ XLogger.err("===============");
+ }
+
+ private static void addColumnIfNotExists(String tableName, String columnName, String columnDefinition) {
+ if (Dominion.config.getDbType().equals("pgsql")) {
+ String sql = "ALTER TABLE " + tableName + " ADD COLUMN IF NOT EXISTS " + columnName + " " + columnDefinition + ";";
+ query(sql);
+ } else if (Dominion.config.getDbType().equals("sqlite")) {
+ try {
+ ResultSet rs = query("PRAGMA table_info(" + tableName + ");");
+ boolean columnExists = false;
+ if (rs != null) {
+ while (rs.next()) {
+ if (columnName.equals(rs.getString("name"))) {
+ columnExists = true;
+ break;
+ }
+ }
+ }
+ if (!columnExists) {
+ query("ALTER TABLE " + tableName + " ADD COLUMN " + columnName + " " + columnDefinition + ";");
+ }
+ } catch (SQLException e) {
+ handleDatabaseError("Database operation failed: ", e, "");
+ }
}
}
@@ -40,15 +87,16 @@ public class Database {
String sql = "";
// player name
- sql += "CREATE TABLE IF NOT EXISTS player_name (" +
+ sql = "CREATE TABLE IF NOT EXISTS player_name (" +
" id SERIAL PRIMARY KEY," +
" uuid VARCHAR(36) NOT NULL UNIQUE," +
" last_known_name TEXT NOT NULL," +
" last_join_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP" +
");";
+ query(sql);
// dominion table
- sql += "CREATE TABLE IF NOT EXISTS dominion (" +
+ sql = "CREATE TABLE IF NOT EXISTS dominion (" +
" id SERIAL PRIMARY KEY," +
" owner VARCHAR(36) NOT NULL," +
" name TEXT NOT NULL UNIQUE," +
@@ -103,12 +151,13 @@ public class Database {
" vehicle_destroy BOOLEAN NOT NULL DEFAULT FALSE," +
" wither_spawn BOOLEAN NOT NULL DEFAULT FALSE," +
- " FOREIGN KEY (owner) REFERENCES player_name(uuid)," +
- " FOREIGN KEY (parent_dom_id) REFERENCES dominion(id)" +
+ " FOREIGN KEY (owner) REFERENCES player_name(uuid) ON DELETE CASCADE," +
+ " FOREIGN KEY (parent_dom_id) REFERENCES dominion(id) ON DELETE CASCADE" +
");";
+ query(sql);
// player privilege
- sql += "CREATE TABLE IF NOT EXISTS player_privilege (" +
+ sql = "CREATE TABLE IF NOT EXISTS player_privilege (" +
" id SERIAL PRIMARY KEY," +
" player_uuid VARCHAR(36) NOT NULL," +
" dom_id INT NOT NULL," +
@@ -150,17 +199,19 @@ public class Database {
" vehicle_destroy BOOLEAN NOT NULL DEFAULT FALSE," +
" UNIQUE (player_uuid, dom_id)," +
- " FOREIGN KEY (player_uuid) REFERENCES player_name(uuid)," +
- " FOREIGN KEY (dom_id) REFERENCES dominion(id)" +
+ " FOREIGN KEY (player_uuid) REFERENCES player_name(uuid) ON DELETE CASCADE," +
+ " FOREIGN KEY (dom_id) REFERENCES dominion(id) ON DELETE CASCADE" +
");";
+ query(sql);
- sql += "INSERT INTO player_name (" +
+ sql = "INSERT INTO player_name (" +
"id, uuid, last_known_name" +
") VALUES (" +
"-1, '00000000-0000-0000-0000-000000000000', 'server'" +
") ON CONFLICT DO NOTHING;";
+ query(sql);
- sql += "INSERT INTO dominion (" +
+ sql = "INSERT INTO dominion (" +
"id, owner, name, world, x1, y1, z1, x2, y2, z2, parent_dom_id, join_message, leave_message" +
") VALUES (" +
"-1, '00000000-0000-0000-0000-000000000000', '根领地', 'all', " +
@@ -168,44 +219,23 @@ public class Database {
"2147483647, 2147483647, 2147483647, -1, " +
"'欢迎', '再见'" +
") ON CONFLICT DO NOTHING;";
-
query(sql);
// 1.5.0
- sql = "ALTER TABLE dominion ADD COLUMN IF NOT EXISTS hopper BOOLEAN NOT NULL DEFAULT FALSE;";
- query(sql);
- sql = "ALTER TABLE player_privilege ADD COLUMN IF NOT EXISTS hopper BOOLEAN NOT NULL DEFAULT FALSE;";
- query(sql);
+ addColumnIfNotExists("dominion", "hopper", "BOOLEAN NOT NULL DEFAULT FALSE");
+ addColumnIfNotExists("player_privilege", "hopper", "BOOLEAN NOT NULL DEFAULT FALSE");
// 1.9.0
- sql = "ALTER TABLE dominion ADD COLUMN IF NOT EXISTS vehicle_spawn BOOLEAN NOT NULL DEFAULT FALSE;";
- query(sql);
- sql = "ALTER TABLE player_privilege ADD COLUMN IF NOT EXISTS vehicle_spawn BOOLEAN NOT NULL DEFAULT FALSE;";
- query(sql);
+ addColumnIfNotExists("dominion", "vehicle_spawn", "BOOLEAN NOT NULL DEFAULT FALSE");
+ addColumnIfNotExists("player_privilege", "vehicle_spawn", "BOOLEAN NOT NULL DEFAULT FALSE");
// 1.10.0
- sql = "ALTER TABLE dominion ADD COLUMN IF NOT EXISTS trample BOOLEAN NOT NULL DEFAULT FALSE;";
- query(sql);
+ addColumnIfNotExists("dominion", "trample", "BOOLEAN NOT NULL DEFAULT FALSE");
// 1.11.0
- sql = "ALTER TABLE dominion ADD COLUMN IF NOT EXISTS mob_drop_item BOOLEAN NOT NULL DEFAULT TRUE;";
- query(sql);
+ addColumnIfNotExists("dominion", "mob_drop_item", "BOOLEAN NOT NULL DEFAULT TRUE");
// 1.12.0
- sql = "ALTER TABLE dominion ADD COLUMN IF NOT EXISTS ender_man BOOLEAN NOT NULL DEFAULT FAlSE;";
- query(sql);
-
- // 1.14.7
- sql = "ALTER TABLE dominion DROP CONSTRAINT IF EXISTS dominion_owner_fkey;";
- sql += "ALTER TABLE dominion ADD CONSTRAINT dominion_owner_fkey FOREIGN KEY (owner) REFERENCES player_name(uuid) ON DELETE CASCADE;";
- sql += "ALTER TABLE dominion DROP CONSTRAINT IF EXISTS dominion_parent_dom_id_fkey;";
- sql += "ALTER TABLE dominion ADD CONSTRAINT dominion_parent_dom_id_fkey FOREIGN KEY (parent_dom_id) REFERENCES dominion(id) ON DELETE CASCADE;";
- sql += "ALTER TABLE player_privilege DROP CONSTRAINT IF EXISTS player_privilege_player_uuid_fkey;";
- sql += "ALTER TABLE player_privilege ADD CONSTRAINT player_privilege_player_uuid_fkey FOREIGN KEY (player_uuid) REFERENCES player_name(uuid) ON DELETE CASCADE;";
- sql += "ALTER TABLE player_privilege DROP CONSTRAINT IF EXISTS player_privilege_dom_id_fkey;";
- sql += "ALTER TABLE player_privilege ADD CONSTRAINT player_privilege_dom_id_fkey FOREIGN KEY (dom_id) REFERENCES dominion(id) ON DELETE CASCADE;";
- query(sql);
-
-
+ addColumnIfNotExists("dominion", "ender_man", "BOOLEAN NOT NULL DEFAULT FAlSE");
}
}
diff --git a/src/main/java/cn/lunadeer/dominion/utils/XLogger.java b/src/main/java/cn/lunadeer/dominion/utils/XLogger.java
index de6a235..1e844fc 100644
--- a/src/main/java/cn/lunadeer/dominion/utils/XLogger.java
+++ b/src/main/java/cn/lunadeer/dominion/utils/XLogger.java
@@ -28,7 +28,7 @@ public class XLogger {
}
public static void warn(String message) {
- _logger.info(" W | " + message);
+ _logger.warning(" W | " + message);
}
public static void err(Player player, String message) {
@@ -38,7 +38,7 @@ public class XLogger {
}
public static void err(String message) {
- _logger.info(" E | " + message);
+ _logger.severe(" E | " + message);
}
public static void debug(Player player, String message) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 2540c43..cfcffd7 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,4 +1,5 @@
Database:
+ Type: sqlite # pgsql, sqlite
Host: localhost
Port: 5432
Name: dominion