77import com .github .elic0de .thejpspit .player .PitPlayer ;
88import com .github .elic0de .thejpspit .player .Preferences ;
99import com .zaxxer .hikari .HikariDataSource ;
10- import java .io .InputStream ;
1110import java .nio .charset .StandardCharsets ;
1211import java .sql .Connection ;
1312import java .sql .PreparedStatement ;
1413import java .sql .ResultSet ;
1514import java .sql .SQLException ;
1615import java .sql .Statement ;
17- import java .util .Map ;
1816import java .util .Optional ;
1917import java .util .Properties ;
2018import java .util .UUID ;
@@ -94,7 +92,7 @@ public void initialize() throws RuntimeException {
9492 }
9593 setLoaded (true );
9694 } catch (SQLException e ) {
97- Bukkit .getLogger ().log (Level .SEVERE , "Failed to create MySQL database tables" );
95+ Bukkit .getLogger ().log (Level .SEVERE , "Failed to create MySQL database tables" , e );
9896 setLoaded (false );
9997 }
10098 }
@@ -109,7 +107,7 @@ public Optional<PitPlayer> getPitPlayer(UUID uuid) {
109107 try (PreparedStatement statement = getConnection ().prepareStatement (
110108 format ("""
111109 SELECT `kills`, `streaks`, `bestStreaks`, `deaths`, `rating`, `bestRating`, `xp`, `preferences`
112- FROM `%players_table %`
110+ FROM `%user_data %`
113111 WHERE `uuid`=?""" ))) {
114112
115113 statement .setString (1 , uuid .toString ());
@@ -139,7 +137,7 @@ public Optional<PitPlayer> getPitPlayer(UUID uuid) {
139137 public Optional <PitPreferences > getPitPreferences () {
140138 try (PreparedStatement statement = getConnection ().prepareStatement (format ("""
141139 SELECT `preferences`
142- FROM `%pit_preferences %`
140+ FROM `%pit_data %`
143141 """ ))) {
144142 final ResultSet resultSet = statement .executeQuery ();
145143 if (resultSet .next ()) {
@@ -157,7 +155,7 @@ public Optional<OfflinePitPlayer> getOfflinePitPlayer(UUID uuid) {
157155 try (PreparedStatement statement = getConnection ().prepareStatement (
158156 format ("""
159157 SELECT `kills`, `streaks`, `bestStreaks`, `deaths`, `rating`, `bestRating`, `xp`
160- FROM `%players_table %`
158+ FROM `%user_data %`
161159 WHERE `uuid`=?""" ))) {
162160
163161 statement .setString (1 , uuid .toString ());
@@ -190,7 +188,7 @@ public CompletableFuture<Optional<Integer>> getPlayerRanking(PitPlayer player, R
190188 FROM(SELECT `uuid`,
191189 RANK()
192190 OVER(ORDER BY %type% DESC)
193- AS rank FROM `%players_table %`)
191+ AS rank FROM `%user_data %`)
194192 WHERE `uuid`=?;
195193 """ ;
196194 try (PreparedStatement statement = getConnection ().prepareStatement (
@@ -216,7 +214,7 @@ public void createPitPlayer(Player player) {
216214 try {
217215 try (PreparedStatement statement = getConnection ().prepareStatement (
218216 format ("""
219- INSERT INTO `%players_table %` (`uuid`,`username`,`preferences`)
217+ INSERT INTO `%user_data %` (`uuid`,`username`,`preferences`)
220218 VALUES (?,?,?);""" ))) {
221219
222220 statement .setString (1 , player .getUniqueId ().toString ());
@@ -235,7 +233,7 @@ public void createPitPreferences(PitPreferences pitPreferences) {
235233 try {
236234 try (PreparedStatement statement = getConnection ().prepareStatement (
237235 format ("""
238- INSERT INTO `%pit_preferences %` (`preferences`)
236+ INSERT INTO `%pit_data %` (`preferences`)
239237 VALUES (?);""" ))) {
240238
241239 statement .setBytes (1 , plugin .getGson ().toJson (pitPreferences ).getBytes (StandardCharsets .UTF_8 ));
@@ -252,7 +250,7 @@ public void updateUserData(PitPlayer player) {
252250 try {
253251 try (PreparedStatement statement = getConnection ().prepareStatement (
254252 format ("""
255- UPDATE `%players_table %`
253+ UPDATE `%user_data %`
256254 SET `kills`=?, `streaks`=?, `bestStreaks`=?, `deaths`=?, `rating`=?, `bestRating`=?, `xp`=?, `preferences`=?
257255 WHERE `uuid`=?""" ))) {
258256
@@ -279,7 +277,7 @@ public void updateUserData(OfflinePitPlayer player) {
279277 try {
280278 try (PreparedStatement statement = getConnection ().prepareStatement (
281279 format ("""
282- UPDATE `%players_table %`
280+ UPDATE `%user_data %`
283281 SET `kills`=?, `streaks`=?, `deaths`=?, `rating`=?, `xp`=?
284282 WHERE `uuid`=?""" ))) {
285283
@@ -301,7 +299,7 @@ public void updateUserData(OfflinePitPlayer player) {
301299 @ Override
302300 public void updatePitPreferences (PitPreferences pitPreferences ) {
303301 try (PreparedStatement statement = getConnection ().prepareStatement (format ("""
304- UPDATE `%pit_preferences %`
302+ UPDATE `%pit_data %`
305303 SET `preferences` = ?
306304 """ ))) {
307305 statement .setBytes (1 , plugin .getGson ().toJson (pitPreferences ).getBytes (StandardCharsets .UTF_8 ));
@@ -315,7 +313,7 @@ public void updatePitPreferences(PitPreferences pitPreferences) {
315313 public void deletePlayerData () {
316314 try (Connection connection = getConnection ()) {
317315 try (PreparedStatement statement = connection .prepareStatement (format ("""
318- DELETE FROM `%players_table %`
316+ DELETE FROM `%user_data %`
319317 """ ))) {
320318 statement .executeUpdate ();
321319 }
0 commit comments