diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java index 2301071b..cb8d01c6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/Database.java @@ -2,7 +2,6 @@ package com.hibiscusmc.hmccosmetics.database; import com.hibiscusmc.hmccosmetics.config.DatabaseSettings; import com.hibiscusmc.hmccosmetics.database.types.Data; -import com.hibiscusmc.hmccosmetics.database.types.InternalData; import com.hibiscusmc.hmccosmetics.database.types.MySQLData; import com.hibiscusmc.hmccosmetics.database.types.SQLiteData; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; @@ -16,9 +15,6 @@ public class Database { private static Data data; - @Deprecated - private static InternalData INTERNAL_DATA = new InternalData(); - private static final MySQLData MYSQL_DATA = new MySQLData(); private static final SQLiteData SQLITE_DATA = new SQLiteData(); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/InternalData.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/InternalData.java deleted file mode 100644 index 83143c89..00000000 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/InternalData.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hibiscusmc.hmccosmetics.database.types; - -import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; -import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; -import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; -import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import org.bukkit.Bukkit; -import org.bukkit.Color; -import org.bukkit.NamespacedKey; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; -import org.bukkit.persistence.PersistentDataType; - -import java.util.Map; -import java.util.UUID; - -@Deprecated -public class InternalData extends Data { - - NamespacedKey key = new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmetics"); - - @Override - public void setup() { - // Nothing - } - - @Override - public void save(CosmeticUser user) { - Player player = Bukkit.getPlayer(user.getUniqueId()); - - player.getPersistentDataContainer().set(key, PersistentDataType.STRING, serializeData(user)); - } - - @Override - public CosmeticUser get(UUID uniqueId) { - Player player = Bukkit.getPlayer(uniqueId); - CosmeticUser user = new CosmeticUser(uniqueId); - - if (!player.getPersistentDataContainer().has(key, PersistentDataType.STRING)) return user; - String rawData = player.getPersistentDataContainer().get(key, PersistentDataType.STRING); - - Map> a = deserializeData(user, rawData); - for (Map cosmeticColors : a.values()) { - for (Cosmetic cosmetic : cosmeticColors.keySet()) { - Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> { - // This can not be async. - user.addPlayerCosmetic(cosmetic, cosmeticColors.get(cosmetic)); - }); - } - } - return user; - } - - @Override - public void clear(UUID uniqueId) { - OfflinePlayer player = Bukkit.getOfflinePlayer(uniqueId); - - if (player.isOnline()) { - Player onlinePlayer = player.getPlayer(); - if (onlinePlayer.getPersistentDataContainer().has(key, PersistentDataType.STRING)) { - onlinePlayer.getPersistentDataContainer().remove(key); - } - return; - } - } -} diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java index 2372ca64..a0a32d07 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/SQLData.java @@ -15,7 +15,7 @@ import java.util.UUID; public abstract class SQLData extends Data { @Override - @SuppressWarnings({"Duplicates", "resource"}) // Duplicate is from deprecated InternalData + @SuppressWarnings({"resource"}) // Duplicate is from deprecated InternalData public CosmeticUser get(UUID uniqueId) { CosmeticUser user = new CosmeticUser(uniqueId); diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 915ef271..ad3e0cb9 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -6,7 +6,7 @@ config-version: 1 default-menu: defaultmenu debug-mode: false database-settings: - type: sqlite #MYSQL, SQLite, INTERNAL (not recommended!) + type: sqlite #MYSQL, SQLite mysql: database: database password: cherryBomb