diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/database/DatabaseConverter.java b/src/main/java/io/github/fisher2911/hmccosmetics/database/DatabaseConverter.java index f2ef6bfb..cbc48d37 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/database/DatabaseConverter.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/database/DatabaseConverter.java @@ -5,9 +5,7 @@ import io.github.fisher2911.hmccosmetics.cosmetic.CosmeticManager; import io.github.fisher2911.hmccosmetics.gui.ArmorItem; import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor; import io.github.fisher2911.hmccosmetics.user.User; -import io.th0rgal.oraxen.shaded.curl.CUrl; import org.bukkit.configuration.file.YamlConfiguration; -import org.jetbrains.annotations.Nullable; import java.io.File; import java.io.IOException; diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/database/MySQLDatabase.java b/src/main/java/io/github/fisher2911/hmccosmetics/database/MySQLDatabase.java deleted file mode 100644 index 70c3450e..00000000 --- a/src/main/java/io/github/fisher2911/hmccosmetics/database/MySQLDatabase.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.github.fisher2911.hmccosmetics.database; - -import com.j256.ormlite.support.ConnectionSource; -import com.zaxxer.hikari.HikariDataSource; -import io.github.fisher2911.hmccosmetics.HMCCosmetics; - -import java.sql.SQLException; - -public class MySQLDatabase extends Database { - - String SAVE_STATEMENT = - "INSERT INTO " + TABLE_NAME + "(" + - PLAYER_UUID_COLUMN + ", " + - BACKPACK_COLUMN + ", " + - HAT_COLUMN + ", " + - DYE_COLOR_COLUMN + ") " + - "VALUES (?,?,?,?) " + - "ON DUPLICATE KEY UPDATE " + - BACKPACK_COLUMN + "=?, " + - HAT_COLUMN + "=?, " + - DYE_COLOR_COLUMN + "=?"; - - String LOAD_STATEMENT = - "SELECT " + - BACKPACK_COLUMN + ", " + - HAT_COLUMN + ", " + - DYE_COLOR_COLUMN + " " + - "FROM " + TABLE_NAME + " " + - "WHERE " + - PLAYER_UUID_COLUMN + "=?"; - - private final HikariDataSource dataSource; - - public MySQLDatabase(final HMCCosmetics plugin, final ConnectionSource dataSource, final String SAVE_STATEMENT, final String LOAD_STATEMENT, final HikariDataSource dataSource1) throws SQLException { - super(plugin, dataSource, DatabaseType.MYSQL); - this.SAVE_STATEMENT = SAVE_STATEMENT; - this.LOAD_STATEMENT = LOAD_STATEMENT; - this.dataSource = dataSource1; - } - - public void getAll() { - - } - - @Override - public void close() { - this.dataSource.close(); - } -} diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/database/SQLiteDatabase.java b/src/main/java/io/github/fisher2911/hmccosmetics/database/SQLiteDatabase.java deleted file mode 100644 index de9cd80f..00000000 --- a/src/main/java/io/github/fisher2911/hmccosmetics/database/SQLiteDatabase.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.github.fisher2911.hmccosmetics.database; - -import com.j256.ormlite.support.ConnectionSource; -import io.github.fisher2911.hmccosmetics.HMCCosmetics; - -import java.sql.Connection; -import java.sql.SQLException; - -public class SQLiteDatabase extends Database { - - private Connection conn; - - public SQLiteDatabase(final HMCCosmetics plugin, final ConnectionSource connectionSource) throws SQLException { - super(plugin, connectionSource, DatabaseType.SQLITE); - } - - String SAVE_STATEMENT = - "INSERT INTO " + TABLE_NAME + "(" + - PLAYER_UUID_COLUMN + ", " + - BACKPACK_COLUMN + ", " + - HAT_COLUMN + ", " + - DYE_COLOR_COLUMN + - ") " + - "VALUES (?,?,?,?) " + - "ON CONFLICT (" + - PLAYER_UUID_COLUMN + ") " + - "DO UPDATE SET " + - BACKPACK_COLUMN + "=?," + - HAT_COLUMN + "=?, " + - DYE_COLOR_COLUMN + "=?"; - - String LOAD_STATEMENT = - "SELECT " + - BACKPACK_COLUMN + ", " + - HAT_COLUMN + ", " + - DYE_COLOR_COLUMN + " " + - "FROM " + TABLE_NAME + " " + - "WHERE " + - PLAYER_UUID_COLUMN + "=? "; - - @Override - public void close() { - try { - this.conn.close(); - } catch (final SQLException exception) { - exception.printStackTrace(); - } - } -} diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/listener/ClickListener.java b/src/main/java/io/github/fisher2911/hmccosmetics/listener/ClickListener.java index c88ab2a4..81edd4a9 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/listener/ClickListener.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/listener/ClickListener.java @@ -72,7 +72,7 @@ public class ClickListener implements Listener { final ItemStack mainHand = event.getPlayer().getInventory().getItemInMainHand(); - if (mainHand.getType().isBlock() && mainHand.getAmount() > 0) return; + if (mainHand.getType().isBlock() && mainHand.getAmount() > 0) this.userManager.updateCosmetics(player.getUniqueId(), true); }