diff --git a/Bansystem-1.0-SNAPSHOT.jar b/Bansystem-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..d7a524a Binary files /dev/null and b/Bansystem-1.0-SNAPSHOT.jar differ 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; + } +}