From 3a9bd966aa25c638b96d833bfb107e9994533035 Mon Sep 17 00:00:00 2001
From: mlus <1319237806@qq.com>
Date: Sun, 11 Feb 2024 17:26:59 +0800
Subject: [PATCH] 1.3.0 update

---
 gradle.properties                             |  2 +-
 .../vip/fubuki/playersync/PlayerSync.java     |  4 +--
 .../fubuki/playersync/config/JdbcConfig.java  |  2 --
 .../vip/fubuki/playersync/util/JDBCsetUp.java | 25 +++++++++++--------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 94c0529..9bb16b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mod_version=1.16.5-1.2.2
\ No newline at end of file
+mod_version=1.16.5-1.3.0
\ No newline at end of file
diff --git a/src/main/java/vip/fubuki/playersync/PlayerSync.java b/src/main/java/vip/fubuki/playersync/PlayerSync.java
index e464adb..0491411 100644
--- a/src/main/java/vip/fubuki/playersync/PlayerSync.java
+++ b/src/main/java/vip/fubuki/playersync/PlayerSync.java
@@ -38,7 +38,7 @@ public class PlayerSync
 
     @SubscribeEvent
     public void onServerStarting(FMLServerStartingEvent event) throws SQLException {
-        JDBCsetUp.executeUpdate("CREATE DATABASE IF NOT EXISTS "+JdbcConfig.DATABASE_NAME.get()+";",1);
+        JDBCsetUp.executeUpdate("CREATE DATABASE IF NOT EXISTS `playersync`;",1);
 
         JDBCsetUp.executeUpdate("CREATE TABLE IF NOT EXISTS player_data (uuid CHAR(36) NOT NULL," +
                 "inventory MEDIUMBLOB,armor BLOB,advancements BLOB,enderchest MEDIUMBLOB,effects BLOB," +
@@ -53,7 +53,7 @@ public class PlayerSync
                 "last_update=" + current + ";");
 
         if(ModList.get().isLoaded("curios")) {
-            JDBCsetUp.executeUpdate("CREATE TABLE IF NOT EXISTS curios (uuid CHAR(36) NOT NULL,curios_item BLOB, PRIMARY KEY (uuid));");
+            JDBCsetUp.executeUpdate("CREATE TABLE IF NOT EXISTS curios (uuid CHAR(36) NOT NULL,curios_item BLOB, PRIMARY KEY (uuid))");
         }
     }
 
diff --git a/src/main/java/vip/fubuki/playersync/config/JdbcConfig.java b/src/main/java/vip/fubuki/playersync/config/JdbcConfig.java
index b8b3b8b..8e8e617 100644
--- a/src/main/java/vip/fubuki/playersync/config/JdbcConfig.java
+++ b/src/main/java/vip/fubuki/playersync/config/JdbcConfig.java
@@ -11,7 +11,6 @@ import java.util.Random;
 public class JdbcConfig {
     public static ForgeConfigSpec COMMON_CONFIG;
     public static ForgeConfigSpec.ConfigValue<String> HOST;
-    public static ForgeConfigSpec.ConfigValue<String> DATABASE_NAME;
     public static ForgeConfigSpec.IntValue PORT;
     public static ForgeConfigSpec.ConfigValue<String> USERNAME;
     public static ForgeConfigSpec.ConfigValue<String> PASSWORD;
@@ -26,7 +25,6 @@ public class JdbcConfig {
         ForgeConfigSpec.Builder COMMON_BUILDER = new ForgeConfigSpec.Builder();
         COMMON_BUILDER.comment("General settings").push("general");
         HOST=COMMON_BUILDER.comment("The host of the database").define("host", "localhost");
-        DATABASE_NAME= COMMON_BUILDER.comment("Database name").define("database_name", "playersync");
         PORT = COMMON_BUILDER.comment("database port").defineInRange("db_port", 3306, 0, 65535);
         USE_SSL = COMMON_BUILDER.comment("whether use SSL").define("use_ssl", false);
         USERNAME = COMMON_BUILDER.comment("username").define("user_name", "root");
diff --git a/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java b/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java
index 4626e7b..b6b6300 100644
--- a/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java
+++ b/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java
@@ -14,25 +14,28 @@ public class JDBCsetUp {
 
     public static QueryResult executeQuery(String sql) throws SQLException{
        Connection connection = getConnection();
+        PreparedStatement useStatement = connection.prepareStatement("USE `playersync`");
+        useStatement.executeUpdate();
 
-       PreparedStatement useStatement = connection.prepareStatement("USE " + JdbcConfig.DATABASE_NAME.get());
-       useStatement.executeUpdate();
-
-       PreparedStatement queryStatement = connection.prepareStatement(sql);
-       ResultSet resultSet =queryStatement.executeQuery();
+        PreparedStatement queryStatement = connection.prepareStatement(sql);
+        ResultSet resultSet = queryStatement.executeQuery();
        return new QueryResult(connection,resultSet);
     }
 
     public static int executeUpdate(String sql) throws SQLException{
-        return executeUpdate(sql,0);
-    }
-
-    public static int executeUpdate(String sql,int init) throws SQLException{
         try (Connection connection = getConnection()) {
 
-            if(init==0){
-                sql="USE " + JdbcConfig.DATABASE_NAME.get() +";" + sql;
+            PreparedStatement useStatement = connection.prepareStatement("USE `playersync`");
+            useStatement.executeUpdate();
+
+            try (PreparedStatement updateStatement = connection.prepareStatement(sql)) {
+                return updateStatement.executeUpdate();
             }
+        }
+    }
+
+    public static int executeUpdate(String sql,int i) throws SQLException{
+        try (Connection connection = getConnection()) {
 
             try (PreparedStatement updateStatement = connection.prepareStatement(sql)) {
                 return updateStatement.executeUpdate();