From 4f192337fc20927c9274d5e8d3ec905784052b13 Mon Sep 17 00:00:00 2001 From: Laura Date: Sun, 18 Jan 2026 16:13:27 +0100 Subject: [PATCH] made sql working again --- Bansystem-1.0-SNAPSHOT.jar | Bin 0 -> 13293 bytes pom.xml | 25 +++------ src/main/java/com/softwarerat/Main.java | 10 ++-- .../com/softwarerat/SQL/AsyncSQLHandler.java | 36 ------------ src/main/java/com/softwarerat/SQL/Homes.java | 52 ++++++++++++------ src/main/java/com/softwarerat/SQL/MySQL.java | 39 +++++++++++++ 6 files changed, 88 insertions(+), 74 deletions(-) create mode 100644 Bansystem-1.0-SNAPSHOT.jar delete mode 100644 src/main/java/com/softwarerat/SQL/AsyncSQLHandler.java create mode 100644 src/main/java/com/softwarerat/SQL/MySQL.java diff --git a/Bansystem-1.0-SNAPSHOT.jar b/Bansystem-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000000000000000000000000000000000..d7a524aa36560e9eee9745acb09be10055f9b691 GIT binary patch literal 13293 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 EKiiwlwEzGB literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index d9fea75..4060460 100644 --- a/pom.xml +++ b/pom.xml @@ -23,23 +23,12 @@ UTF-8 - - org.projectlombok - lombok - 1.18.28 - compile - - - - de.mint - AsyncMySQLPoolHandler - 1.0.5 - + + org.projectlombok + lombok + 1.18.42 + provided + - - - gitlab-zyonic - https://gitlab.zyonicsoftware.com/api/v4/projects/119/packages/maven - - + diff --git a/src/main/java/com/softwarerat/Main.java b/src/main/java/com/softwarerat/Main.java index ce2edc0..3704f6a 100644 --- a/src/main/java/com/softwarerat/Main.java +++ b/src/main/java/com/softwarerat/Main.java @@ -1,16 +1,18 @@ package com.softwarerat; -import com.softwarerat.SQL.AsyncSQLHandler; + import com.softwarerat.SQL.Homes; +import com.softwarerat.SQL.MySQL; + import lombok.Getter; @Getter public class Main { - AsyncSQLHandler asyncSQLHandler; + Homes homes; public void enableAPI(String user, String pw, String Database, String host){ - asyncSQLHandler = new AsyncSQLHandler(host,user,pw,Database); - homes = new Homes(asyncSQLHandler); + MySQL.connect(); + homes = new Homes(); } } \ No newline at end of file diff --git a/src/main/java/com/softwarerat/SQL/AsyncSQLHandler.java b/src/main/java/com/softwarerat/SQL/AsyncSQLHandler.java deleted file mode 100644 index c69657b..0000000 --- a/src/main/java/com/softwarerat/SQL/AsyncSQLHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.softwarerat.SQL; - -import java.sql.ResultSet; - -import de.mint.asyncmysqlpoolhandler.configservice.ConfigBuilder; -import de.mint.asyncmysqlpoolhandler.configservice.ConfigPoolFramework; -import de.mint.asyncmysqlpoolhandler.enumservice.EnumPoolFramework; -import de.mint.asyncmysqlpoolhandler.mainservice.AsyncMySQLPoolHandler; - -import java.sql.ResultSet; -import java.util.concurrent.ExecutionException; - -public class AsyncSQLHandler { - - private final AsyncMySQLPoolHandler MySQLPoolHandler; - private final ConfigPoolFramework configPoolFramework = ConfigBuilder.getConfigBuilder().build(); - - public AsyncSQLHandler(String hostname, String user, String pw, String DB) { - this.MySQLPoolHandler = new AsyncMySQLPoolHandler(hostname, user, pw, DB, EnumPoolFramework.HIKARICP, configPoolFramework); - this.openConnection(); - } - - private void openConnection() { - this.MySQLPoolHandler.openPool(); - } - - // Basic SQL Things - protected ResultSet executeQuery(String sql) throws ExecutionException, InterruptedException { - return this.MySQLPoolHandler.executeQueryAsync(sql).get(); - } - - protected void executeUpdate(String sql) throws ExecutionException, InterruptedException { - this.MySQLPoolHandler.executeUpdateAsync(sql).get(); - } - -} diff --git a/src/main/java/com/softwarerat/SQL/Homes.java b/src/main/java/com/softwarerat/SQL/Homes.java index dd0ab4c..4aa2eba 100644 --- a/src/main/java/com/softwarerat/SQL/Homes.java +++ b/src/main/java/com/softwarerat/SQL/Homes.java @@ -1,25 +1,26 @@ package com.softwarerat.SQL; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; public class Homes { - AsyncSQLHandler sqlHandler; - public Homes(AsyncSQLHandler sqlHandler) { - this.sqlHandler = sqlHandler; - } public PlayerHome getHomeByName(String name){ - + PreparedStatement ps = null; + try { + ps = MySQL.getConnection().prepareStatement("SELECT * FROM homes WHERE Name = '" + name + "';"); + } catch (SQLException ex) { + System.getLogger(Homes.class.getName()).log(System.Logger.Level.ERROR, (String) null, ex); + } ResultSet resultSet = null; try { - resultSet = sqlHandler.executeQuery("SELECT * FROM homes WHERE Name = '" + name + "';"); - } catch (ExecutionException | InterruptedException e) { - throw new RuntimeException(e); + resultSet = ps.executeQuery(); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } if (resultSet != null) { try { @@ -34,11 +35,21 @@ public class Homes { return null; } + + //FIX: creation with new sql handler public void createNewHome(PlayerHome playerHome){ + PreparedStatement ps = null; try { - sqlHandler.executeUpdate("INSERT INTO homes (Name, UUID, World, x, y, z) VALUES ('"+playerHome.getName()+"','"+playerHome.getUUID()+"','"+playerHome.getWorld()+"','"+playerHome.getX()+"','"+playerHome.getY()+"','"+playerHome.getZ()+"');"); - } catch (ExecutionException | InterruptedException e) { - throw new RuntimeException(e); + ps = MySQL.getConnection().prepareStatement("INSERT INTO homes (Name, UUID, World, x, y, z) VALUES ('"+playerHome.getName()+"','"+playerHome.getUUID()+"','"+playerHome.getWorld()+"','"+playerHome.getX()+"','"+playerHome.getY()+"','"+playerHome.getZ()+"');"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + try { + ps.executeUpdate(); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -46,10 +57,19 @@ public class Homes { public ArrayList getPlayerHomes(String UUID) { ArrayList homes = new ArrayList<>(); ResultSet resultSet = null; + PreparedStatement ps = null; try { - resultSet = sqlHandler.executeQuery("SELECT * FROM homes WHERE uuid = '" + UUID + "';"); - } catch (ExecutionException | InterruptedException e) { - throw new RuntimeException(e); + ps = MySQL.getConnection().prepareStatement("SELECT * FROM homes WHERE uuid = '" + UUID + "';"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + try { + resultSet = ps.executeQuery(); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } if (resultSet != null) { try { diff --git a/src/main/java/com/softwarerat/SQL/MySQL.java b/src/main/java/com/softwarerat/SQL/MySQL.java new file mode 100644 index 0000000..f192fef --- /dev/null +++ b/src/main/java/com/softwarerat/SQL/MySQL.java @@ -0,0 +1,39 @@ +package com.softwarerat.SQL; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class MySQL { + + private static Connection con; + private static String Host; + private static int port; + private static String database; + private static String user; + private static String password; + + public MySQL(String Host, int port, String database, String user, String password) { + MySQL.Host = Host; + MySQL.port = port; + MySQL.database = database; + MySQL.user = user; + MySQL.password = password; + connect(); + } + + public static void connect() { + try { + con = DriverManager.getConnection("jdbc:mysql://45.85.219.106:3306/Bansystem?autoRecconnect=true", "craftunity", "zFtf5zFTS*ncJrXT"); + } catch (SQLException var1) { + System.out.println("SQL Disconected"); + System.out.println("SQL Error"); + + } + + } + + public static Connection getConnection() { + return con; + } +}