From 7fb6325285024d7cba92227c09f922d050f3fd92 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Sun, 28 Aug 2022 20:50:48 +0200 Subject: [PATCH] Revert "Made it possible to save/load shops" This reverts commit 91c0c2ecd148a204a8b65fbb5a266c6d2abc747e. --- .../com/alttd/playershops/PlayerShops.java | 5 -- .../playershops/config/DatabaseConfig.java | 2 +- .../playershops/database/ShopQueries.java | 62 ------------------- .../playershops/handler/ShopHandler.java | 23 ------- .../alttd/playershops/shop/AbstractShop.java | 4 +- 5 files changed, 3 insertions(+), 93 deletions(-) diff --git a/src/main/java/com/alttd/playershops/PlayerShops.java b/src/main/java/com/alttd/playershops/PlayerShops.java index fa20293..7e73b5c 100644 --- a/src/main/java/com/alttd/playershops/PlayerShops.java +++ b/src/main/java/com/alttd/playershops/PlayerShops.java @@ -1,9 +1,7 @@ package com.alttd.playershops; import com.alttd.playershops.config.Config; -import com.alttd.playershops.config.DatabaseConfig; import com.alttd.playershops.config.MessageConfig; -import com.alttd.playershops.database.Database; import com.alttd.playershops.handler.ShopHandler; import com.alttd.playershops.listener.PlayerListener; import com.alttd.playershops.listener.ShopListener; @@ -38,8 +36,6 @@ public class PlayerShops extends JavaPlugin { registerListeners(); registerCommands(); - Database.getDatabase(); //Start database - shopHandler = new ShopHandler(instance); } @@ -80,7 +76,6 @@ public class PlayerShops extends JavaPlugin { public void reloadConfigs() { Config.reload(); MessageConfig.reload(); - DatabaseConfig.reload(); } } diff --git a/src/main/java/com/alttd/playershops/config/DatabaseConfig.java b/src/main/java/com/alttd/playershops/config/DatabaseConfig.java index 3df79c0..5e31be9 100644 --- a/src/main/java/com/alttd/playershops/config/DatabaseConfig.java +++ b/src/main/java/com/alttd/playershops/config/DatabaseConfig.java @@ -26,7 +26,7 @@ public class DatabaseConfig extends AbstractConfiguration { public static String DRIVER = "mysql"; public static String IP = "localhost"; public static String PORT = "3306"; - public static String DATABASE_NAME = "playershops"; + public static String DATABASE_NAME = "AltitudeQuests"; public static String USERNAME = "root"; public static String PASSWORD = "root"; diff --git a/src/main/java/com/alttd/playershops/database/ShopQueries.java b/src/main/java/com/alttd/playershops/database/ShopQueries.java index cec9fdf..26dd6eb 100644 --- a/src/main/java/com/alttd/playershops/database/ShopQueries.java +++ b/src/main/java/com/alttd/playershops/database/ShopQueries.java @@ -148,66 +148,4 @@ public class ShopQueries { return null; } } - - public static int saveShopWithoutId(AbstractShop shop) { - String sql = "INSERT INTO shops " + - "(owner_name, owner_uuid, shop_type, server, container_location, sign_location, " + - "price, amount, balance, item_one, item_two, last_transaction)" + - "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + - "ON DUPLICATE KEY UPDATE owner_name = ?, owner_uuid = ?, shop_type = ?, server = ?, " + - "container_location = ?, sign_location = ?, price = ?, amount = ?, balance = ?, " + - "item_one = ?, item_two = ?, last_transaction = ?"; - try { - PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql); - - statement.setString(2, shop.getOwnerName()); - statement.setString(3, shop.getOwnerUUID().toString()); - statement.setString(4, shop.getServer()); - statement.setString(5, shop.getType().toString()); - statement.setString(6, locationToString(shop.getContainerLocation())); - statement.setString(7, locationToString(shop.getSignLocation())); - statement.setDouble(8, shop.getPrice()); - statement.setInt(9, shop.getAmount()); - statement.setDouble(10, shop.getBalance()); - statement.setBytes(11, shop.getItemStack().serializeAsBytes()); - statement.setBytes(12, shop.getSecondaryItem().serializeAsBytes()); - statement.setLong(13, shop.getLastTransaction()); - //repeat everything except id for update - statement.setString(14, shop.getOwnerName()); - statement.setString(15, shop.getOwnerUUID().toString()); - statement.setString(16, shop.getServer()); - statement.setString(17, shop.getType().toString()); - statement.setString(18, locationToString(shop.getContainerLocation())); - statement.setString(19, locationToString(shop.getSignLocation())); - statement.setDouble(20, shop.getPrice()); - statement.setInt(21, shop.getAmount()); - statement.setDouble(22, shop.getBalance()); - statement.setBytes(23, shop.getItemStack().serializeAsBytes()); - statement.setBytes(24, shop.getSecondaryItem().serializeAsBytes()); - statement.setLong(25, shop.getLastTransaction()); - - if (statement.executeUpdate() != 1) { - //TODO error - } - } catch (SQLException e) { - e.printStackTrace(); - } - return loadShopWithoutId(shop); - } - - private static int loadShopWithoutId(AbstractShop shop) { - String sql = "SELECT FROM shops WHERE server = ? AND container_location = ?"; - try { - PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql); - statement.setString(1, shop.getServer()); - statement.setString(2, locationToString(shop.getContainerLocation())); - - ResultSet resultSet = statement.executeQuery(); - if (resultSet.next()) - return resultSet.getInt("id"); - } catch (SQLException e) { - e.printStackTrace(); - } - return (-1); - } } diff --git a/src/main/java/com/alttd/playershops/handler/ShopHandler.java b/src/main/java/com/alttd/playershops/handler/ShopHandler.java index 2174382..53a93bc 100644 --- a/src/main/java/com/alttd/playershops/handler/ShopHandler.java +++ b/src/main/java/com/alttd/playershops/handler/ShopHandler.java @@ -2,11 +2,9 @@ package com.alttd.playershops.handler; import com.alttd.playershops.PlayerShops; import com.alttd.playershops.config.Config; -import com.alttd.playershops.database.ShopQueries; import com.alttd.playershops.events.PlayerCreateShopEvent; import com.alttd.playershops.shop.AbstractShop; import com.alttd.playershops.shop.ShopType; -import com.alttd.playershops.utils.Logger; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import lombok.Getter; @@ -16,7 +14,6 @@ import org.bukkit.Tag; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -37,13 +34,6 @@ public class ShopHandler { shopBuildLimits = new Object2IntOpenHashMap<>(); shopBuildLimits.defaultReturnValue(Config.shopLimit); shopMaterials = new ArrayList<>(); // TODO move into parent method where materials are loaded in. - loadShops(); - } - - private void loadShops() { - for (AbstractShop shop : ShopQueries.loadShops()) { - shopLocation.put(shop.getContainerLocation(), shop); - } } public AbstractShop getShop(Location location) { @@ -117,19 +107,6 @@ public class ShopHandler { if(playerCreateShopEvent.isCancelled()) return null; - shopLocation.put(shop.getContainerLocation(), shop); - - new BukkitRunnable() { - @Override - public void run() { - int id = ShopQueries.saveShopWithoutId(shop); - if (id == -1) - Logger.warn("Tried to save a shop without id but couldn't get an id back [" + shop + "]"); - else - shop.setId(id); - } - }.runTaskAsynchronously(PlayerShops.getInstance()); - return shop; } } diff --git a/src/main/java/com/alttd/playershops/shop/AbstractShop.java b/src/main/java/com/alttd/playershops/shop/AbstractShop.java index 7d7f05a..ea91e28 100644 --- a/src/main/java/com/alttd/playershops/shop/AbstractShop.java +++ b/src/main/java/com/alttd/playershops/shop/AbstractShop.java @@ -12,8 +12,8 @@ import java.util.UUID; public abstract class AbstractShop { - @Getter @Setter - private int id = -1; + @Getter + private int id; private String ownerName; @Getter private UUID ownerUUID;