From 096ccea733426ae21d723cce8ac7fd1c564fc047 Mon Sep 17 00:00:00 2001 From: mlus-Asuka <1319237806@qq.com> Date: Fri, 29 Sep 2023 20:07:52 +0800 Subject: [PATCH] stupid sql --- gradle.properties | 2 +- .../vip/fubuki/playersync/PlayerSync.java | 8 +++---- .../vip/fubuki/playersync/sync/ChatSync.java | 4 ++-- .../fubuki/playersync/sync/ModsSupport.java | 6 ++--- .../fubuki/playersync/sync/VanillaSync.java | 22 +++++++++---------- .../vip/fubuki/playersync/util/JDBCsetUp.java | 1 - 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index b1aaf86..94c0529 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.1 \ No newline at end of file +mod_version=1.16.5-1.2.2 \ 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 ce8e4a4..e464adb 100644 --- a/src/main/java/vip/fubuki/playersync/PlayerSync.java +++ b/src/main/java/vip/fubuki/playersync/PlayerSync.java @@ -38,13 +38,13 @@ 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 "+JdbcConfig.DATABASE_NAME.get()+";",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," + - "xp int,food_level int,score int,health int,online boolean, last_server int, PRIMARY KEY (uuid))"); + "xp int,food_level int,score int,health int,online boolean, last_server int, PRIMARY KEY (uuid));"); JDBCsetUp.executeUpdate("CREATE TABLE IF NOT EXISTS chat (player CHAR(36) NOT NULL,message TEXT," + - "timestamp BIGINT)"); + "timestamp BIGINT);"); JDBCsetUp.executeUpdate("CREATE TABLE IF NOT EXISTS server_info (`id` INT NOT NULL,`enable` boolean NOT NULL,`last_update` BIGINT NOT NULL,PRIMARY KEY (`id`));"); long current = System.currentTimeMillis(); JDBCsetUp.executeUpdate("INSERT INTO server_info(id,enable,last_update) " + @@ -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/sync/ChatSync.java b/src/main/java/vip/fubuki/playersync/sync/ChatSync.java index e08bf4a..2121742 100644 --- a/src/main/java/vip/fubuki/playersync/sync/ChatSync.java +++ b/src/main/java/vip/fubuki/playersync/sync/ChatSync.java @@ -25,7 +25,7 @@ public class ChatSync { @SubscribeEvent public static void onPlayerChat(net.minecraftforge.event.ServerChatEvent event) throws SQLException { - JDBCsetUp.executeUpdate("INSERT INTO chat (player, message, timestamp) VALUES ('" + event.getUsername() + "', '" + event.getMessage() + "', '" + current + "')"); + JDBCsetUp.executeUpdate("INSERT INTO chat (player, message, timestamp) VALUES ('" + event.getUsername() + "', '" + event.getMessage() + "', '" + current + "');"); } @SubscribeEvent @@ -47,7 +47,7 @@ public class ChatSync { } public static void ReadMessage(PlayerList playerList) throws SQLException { - JDBCsetUp.QueryResult queryResult=JDBCsetUp.executeQuery("SELECT * FROM chat WHERE timestamp > " + current); + JDBCsetUp.QueryResult queryResult=JDBCsetUp.executeQuery("SELECT * FROM chat WHERE timestamp > " + current+";"); ResultSet resultSet= queryResult.getResultSet(); current = System.currentTimeMillis(); tick = 0; diff --git a/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java b/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java index 1577599..6f73ceb 100644 --- a/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java +++ b/src/main/java/vip/fubuki/playersync/sync/ModsSupport.java @@ -24,7 +24,7 @@ public class ModsSupport { Curios Support */ LazyOptional itemHandler = top.theillusivec4.curios.api.CuriosApi.getCuriosHelper().getEquippedCurios(player); - JDBCsetUp.QueryResult queryResult=JDBCsetUp.executeQuery("SELECT curios_item FROM curios WHERE uuid = '"+player.getUUID()+"'"); + JDBCsetUp.QueryResult queryResult=JDBCsetUp.executeQuery("SELECT curios_item FROM curios WHERE uuid = '"+player.getUUID()+"';"); ResultSet resultSet = queryResult.getResultSet(); if(resultSet.next()) { String curios_data=resultSet.getString("curios_item"); @@ -67,9 +67,9 @@ public class ModsSupport { } }); if(init) { - JDBCsetUp.executeUpdate("INSERT INTO curios (uuid,curios_item) VALUES ('"+player.getUUID()+"','"+ curios+"')"); + JDBCsetUp.executeUpdate("INSERT INTO curios (uuid,curios_item) VALUES ('"+player.getUUID()+"','"+ curios+"');"); } else { - JDBCsetUp.executeUpdate("UPDATE curios SET curios_item = '"+ curios+"' WHERE uuid = '"+player.getUUID()+"'"); + JDBCsetUp.executeUpdate("UPDATE curios SET curios_item = '"+ curios+"' WHERE uuid = '"+player.getUUID()+"';"); } } } diff --git a/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java b/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java index b7aae93..c861aa6 100644 --- a/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java +++ b/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java @@ -41,7 +41,7 @@ public class VanillaSync { public static void doPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) throws SQLException, CommandSyntaxException, IOException { String player_uuid = event.getEntity().getUUID().toString(); - JDBCsetUp.QueryResult queryResult=JDBCsetUp.executeQuery("SELECT online, last_server FROM player_data WHERE uuid='"+player_uuid+"'"); + JDBCsetUp.QueryResult queryResult=JDBCsetUp.executeQuery("SELECT online, last_server FROM player_data WHERE uuid='"+player_uuid+"';"); ResultSet resultSet=queryResult.getResultSet(); ServerPlayerEntity serverPlayer = (ServerPlayerEntity) event.getEntity(); if(!resultSet.next()){ @@ -50,11 +50,11 @@ public class VanillaSync { } boolean online = resultSet.getBoolean("online"); int lastServer = resultSet.getInt("last_server"); - queryResult=JDBCsetUp.executeQuery("SELECT * FROM player_data WHERE uuid='"+player_uuid+"'"); + queryResult=JDBCsetUp.executeQuery("SELECT * FROM player_data WHERE uuid='"+player_uuid+"';"); resultSet= queryResult.getResultSet(); if(online) { - queryResult=JDBCsetUp.executeQuery("SELECT last_update,enable FROM server_info WHERE id='"+lastServer+"'"); + queryResult=JDBCsetUp.executeQuery("SELECT last_update,enable FROM server_info WHERE id='"+lastServer+"';"); ResultSet getServerInfo = queryResult.getResultSet(); if(getServerInfo.next()){ long last_update = getServerInfo.getLong("last_update"); @@ -64,15 +64,15 @@ public class VanillaSync { serverPlayer.connection.disconnect(new StringTextComponent("playersync.already_online")); return; } - JDBCsetUp.executeUpdate("UPDATE server_info SET enable=false WHERE id=" + lastServer); + JDBCsetUp.executeUpdate("UPDATE server_info SET enable=false WHERE id=" + lastServer+";"); } getServerInfo.close(); } - JDBCsetUp.executeUpdate("UPDATE server_info SET last_update=" + System.currentTimeMillis() + " WHERE id=" + JdbcConfig.SERVER_ID.get()); - JDBCsetUp.executeUpdate("UPDATE player_data SET online=true,last_server=" + JdbcConfig.SERVER_ID.get() + " WHERE uuid='"+player_uuid+"'"); + JDBCsetUp.executeUpdate("UPDATE server_info SET last_update=" + System.currentTimeMillis() + " WHERE id=" + JdbcConfig.SERVER_ID.get()+";"); + JDBCsetUp.executeUpdate("UPDATE player_data SET online=true,last_server=" + JdbcConfig.SERVER_ID.get() + " WHERE uuid='"+player_uuid+"';"); if(resultSet.next()) { //Easy Part serverPlayer.setHealth(resultSet.getInt("health")); @@ -156,7 +156,7 @@ public class VanillaSync { } public static void doPlayerSaveToFile(PlayerEvent.SaveToFile event) throws SQLException, IOException { - JDBCsetUp.executeUpdate("UPDATE server_info SET last_update=" + System.currentTimeMillis() + " WHERE id=" + JdbcConfig.SERVER_ID.get()); + JDBCsetUp.executeUpdate("UPDATE server_info SET last_update=" + System.currentTimeMillis() + " WHERE id=" + JdbcConfig.SERVER_ID.get()+";"); if(!event.getEntity().getTags().contains("player_synced")) return; Store(event.getPlayer(),false,Dist.CLIENT.isDedicatedServer()); //Mod support @@ -177,13 +177,13 @@ public class VanillaSync { @SubscribeEvent public static void onServerShutdown(FMLServerStoppedEvent event) throws SQLException { - JDBCsetUp.executeUpdate("UPDATE server_info SET enable= 'false' WHERE id=" + JdbcConfig.SERVER_ID.get()); + JDBCsetUp.executeUpdate("UPDATE server_info SET enable= false WHERE id=" + JdbcConfig.SERVER_ID.get()+";"); } public static void doPlayerLogout(PlayerEvent.PlayerLoggedOutEvent event) throws SQLException, IOException { if(!event.getEntity().getTags().contains("player_synced")) return; String player_uuid = event.getEntity().getUUID().toString(); - JDBCsetUp.executeUpdate("UPDATE player_data SET online= 'false' WHERE uuid='"+player_uuid+"'"); + JDBCsetUp.executeUpdate("UPDATE player_data SET online= false WHERE uuid='"+player_uuid+"';"); Store(event.getPlayer(),false,Dist.CLIENT.isDedicatedServer()); //Mod support ModsSupport modsSupport = new ModsSupport(); @@ -264,8 +264,8 @@ public class VanillaSync { //SQL Operation if(init){ - JDBCsetUp.executeUpdate("INSERT INTO player_data (uuid,armor,inventory,enderchest,advancements,effects,xp,food_level,health,score,online) VALUES ('"+player_uuid+"','"+equipment+"','"+inventoryMap+"','"+ender_chest+"','"+advancements+"','"+effectMap+"','"+XP+"','"+food_level+"','"+health+"','"+score+"',online=true)"); - }else JDBCsetUp.executeUpdate("UPDATE player_data SET inventory = '"+inventoryMap+"',armor='"+equipment+"' ,xp='"+XP+"',effects='"+effectMap+"',enderchest='"+ender_chest+"',score='"+score+"',food_level='"+food_level+"',health='"+health+"',advancements='"+json+"' WHERE uuid = '"+player_uuid+"'"); + JDBCsetUp.executeUpdate("INSERT INTO player_data (uuid,armor,inventory,enderchest,advancements,effects,xp,food_level,health,score,online) VALUES ('"+player_uuid+"','"+equipment+"','"+inventoryMap+"','"+ender_chest+"','"+advancements+"','"+effectMap+"','"+XP+"','"+food_level+"','"+health+"','"+score+"',online=true);"); + }else JDBCsetUp.executeUpdate("UPDATE player_data SET inventory = '"+inventoryMap+"',armor='"+equipment+"' ,xp='"+XP+"',effects='"+effectMap+"',enderchest='"+ender_chest+"',score='"+score+"',food_level='"+food_level+"',health='"+health+"',advancements='"+json+"' WHERE uuid = '"+player_uuid+"';"); } private static File[] ScanAdvancementsFile(String player_uuid, File gameDir) { diff --git a/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java b/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java index 21c731c..4626e7b 100644 --- a/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java +++ b/src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java @@ -1,6 +1,5 @@ package vip.fubuki.playersync.util; -import org.lwjgl.system.CallbackI; import vip.fubuki.playersync.config.JdbcConfig; import java.sql.*;