EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-15 12:04:43 +02:00
Code Issues Projects Releases Wiki Activity

Refactoring a bunch of stuff, more refactoring to come

Browse Source
This commit is contained in:
nossr50
2020-08-17 21:15:27 -07:00
parent 0e9e1f5133
commit daada1a643
161 changed files with 1934 additions and 2575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/gmail/nossr50/database/DatabaseManager.java
View File

@ -3,6 +3,7 @@ package com.gmail.nossr50.database;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.database.DatabaseType;
import com.gmail.nossr50.datatypes.database.PlayerStat;
import com.gmail.nossr50.datatypes.player.MMODataSnapshot;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
@ -40,15 +41,14 @@ public interface DatabaseManager {
* Currently only used for SQL
* @param uuid target UUID to cleanup
*/
void cleanupUser(UUID uuid);
void removeCache(UUID uuid);
/**
* Save a user to the database.
*
* @param profile The profile of the player to save
* @return true if successful, false on failure
* @param mmoDataSnapshot Snapshot of player data to save
*/
boolean saveUser(PlayerProfile profile);
boolean saveUser(MMODataSnapshot mmoDataSnapshot);
/**
* Retrieve leaderboard info.
@ -79,20 +79,6 @@ public interface DatabaseManager {
*/
void newUser(String playerName, UUID uuid);
/**
* Load a player from the database.
*
* @deprecated replaced by {@link #loadPlayerProfile(String playerName, UUID uuid, boolean createNew)}
*
* @param playerName The name of the player to load from the database
* @param createNew Whether to create a new record if the player is not
* found
* @return The player's data, or an unloaded PlayerProfile if not found
* and createNew is false
*/
@Deprecated
PlayerProfile loadPlayerProfile(String playerName, boolean createNew);
/**
* Load a player from the database.
*
@ -101,18 +87,6 @@ public interface DatabaseManager {
*/
PlayerProfile loadPlayerProfile(UUID uuid);
/**
* Load a player from the database. Attempt to use uuid, fall back on playername
*
* @param playerName The name of the player to load from the database
* @param uuid The uuid of the player to load from the database
* @param createNew Whether to create a new record if the player is not
* found
* @return The player's data, or an unloaded PlayerProfile if not found
* and createNew is false
*/
PlayerProfile loadPlayerProfile(String playerName, UUID uuid, boolean createNew);
/**
* Get all users currently stored in the database.
*
@ -128,9 +102,9 @@ public interface DatabaseManager {
*/
void convertUsers(DatabaseManager destination);
boolean saveUserUUID(String userName, UUID uuid);
// boolean saveUserUUID(String userName, UUID uuid);
boolean saveUserUUIDs(Map<String, UUID> fetchedUUIDs);
// boolean saveUserUUIDs(Map<String, UUID> fetchedUUIDs);
/**
* Retrieve the type of database in use. Custom databases should return CUSTOM.

4
src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java
View File

@ -23,7 +23,7 @@ public class DatabaseManagerFactory {
mcMMO.p.getLogger().info("Falling back on " + (Config.getInstance().getUseMySQL() ? "SQL" : "Flatfile") + " database");
}
return Config.getInstance().getUseMySQL() ? new SQLDatabaseManager() : new FlatfileDatabaseManager();
return Config.getInstance().getUseMySQL() ? new SQLDatabaseManager() : new FlatFileDatabaseManager();
}
/**
@ -60,7 +60,7 @@ public class DatabaseManagerFactory {
switch (type) {
case FLATFILE:
mcMMO.p.getLogger().info("Using FlatFile Database");
return new FlatfileDatabaseManager();
return new FlatFileDatabaseManager();
case SQL:
mcMMO.p.getLogger().info("Using SQL Database");

2
src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
View File

@ -1448,7 +1448,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
.setBarStateMap(xpBarStateMap);
PersistentPlayerData persistentPlayerData;
try {
persistentPlayerData = playerDataBuilder.build();
} catch (Exception e) {