Add support for data value ranges in blocks.yml

For example `Block_1|0-5`

pom.xml

@@ -76,8 +76,6 @@
                     <artifactSet>
                         <includes>
                             <include>com.turt2live.metrics:MetricsExtension</include>
-                            <include>commons-logging:commons-logging</include>
-                            <include>net.snaq:dbpool</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -85,14 +83,6 @@
                             <pattern>com.turt2live.metrics</pattern>
                             <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>org.apache.commons.logging</pattern>
-                            <shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.snaq</pattern>
-                            <shadedPattern>com.gmail.nossr50.dbpool</shadedPattern>
-                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -146,11 +136,6 @@
             <artifactId>MetricsExtension</artifactId>
             <version>0.0.5-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>net.snaq</groupId>
-            <artifactId>dbpool</artifactId>
-            <version>5.1</version>
-        </dependency>
     </dependencies>
     <distributionManagement>
         <repository>

src/main/java/com/gmail/nossr50/api/ExperienceAPI.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.api;
 
 import java.util.Set;
-import java.util.UUID;
 
 import org.bukkit.entity.Player;
 
@@ -87,14 +86,6 @@ public final class ExperienceAPI {
         UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
     }
 
-    /**
-     * Adds raw XP to an offline player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @deprecated We're using float for our XP values now
-     * replaced by {@link #addRawXPOffline(String playerName, String skillType, float XP)}
-     */
     @Deprecated
     public static void addRawXPOffline(String playerName, String skillType, int XP) {
         addRawXPOffline(playerName, skillType, (float) XP);
@@ -105,9 +96,6 @@ public final class ExperienceAPI {
      * </br>
      * This function is designed for API usage.
      *
-     * @deprecated We're using uuids to get an offline player
-     * replaced by {@link #addRawXPOffline(UUID uuid, String skillType, float XP)}
-     *
      * @param playerName The player to add XP to
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
@@ -115,27 +103,10 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static void addRawXPOffline(String playerName, String skillType, float XP) {
         addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
     }
 
-    /**
-     * Adds raw XP to an offline player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The UUID of player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static void addRawXPOffline(UUID uuid, String skillType, float XP) {
-        addOfflineXP(uuid, getSkillType(skillType), (int) Math.floor(XP));
-    }
-
     /**
      * Adds XP to the player, calculates for XP Rate only.
      * </br>
@@ -181,7 +152,6 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
         addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
@@ -233,7 +203,6 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
         SkillType skill = getSkillType(skillType);
 
@@ -304,28 +273,10 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    @Deprecated
     public static int getOfflineXP(String playerName, String skillType) {
         return getOfflineProfile(playerName).getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
-    /**
-     * Get the amount of XP an offline player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static int getOfflineXP(UUID uuid, String skillType) {
-        return getOfflineProfile(uuid).getSkillXpLevel(getNonChildSkillType(skillType));
-    }
-
     /**
      * Get the raw amount of XP a player has in a specific skill.
      * </br>
@@ -355,28 +306,10 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    @Deprecated
     public static float getOfflineXPRaw(String playerName, String skillType) {
         return getOfflineProfile(playerName).getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
-    /**
-     * Get the raw amount of XP an offline player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static float getOfflineXPRaw(UUID uuid, String skillType) {
-        return getOfflineProfile(uuid).getSkillXpLevelRaw(getNonChildSkillType(skillType));
-    }
-
     /**
      * Get the total amount of XP needed to reach the next level.
      * </br>
@@ -406,28 +339,10 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    @Deprecated
     public static int getOfflineXPToNextLevel(String playerName, String skillType) {
         return getOfflineProfile(playerName).getXpToLevel(getNonChildSkillType(skillType));
     }
 
-    /**
-     * Get the total amount of XP an offline player needs to reach the next level.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the total amount of XP needed to reach the next level
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static int getOfflineXPToNextLevel(UUID uuid, String skillType) {
-        return getOfflineProfile(uuid).getXpToLevel(getNonChildSkillType(skillType));
-    }
-
     /**
      * Get the amount of XP remaining until the next level.
      * </br>
@@ -461,34 +376,14 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    @Deprecated
     public static int getOfflineXPRemaining(String playerName, String skillType) {
         SkillType skill = getNonChildSkillType(skillType);
+
         PlayerProfile profile = getOfflineProfile(playerName);
 
         return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
     }
 
-    /**
-     * Get the amount of XP an offline player has left before leveling up.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP needed to reach the next level
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static float getOfflineXPRemaining(UUID uuid, String skillType) {
-        SkillType skill = getNonChildSkillType(skillType);
-        PlayerProfile profile = getOfflineProfile(uuid);
-
-        return profile.getXpToLevel(skill) - profile.getSkillXpLevelRaw(skill);
-    }
-
     /**
      * Add levels to a skill.
      * </br>
@@ -516,7 +411,6 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static void addLevelOffline(String playerName, String skillType, int levels) {
         PlayerProfile profile = getOfflineProfile(playerName);
         SkillType skill = getSkillType(skillType);
@@ -536,37 +430,6 @@ public final class ExperienceAPI {
         profile.scheduleAsyncSave();
     }
 
-    /**
-     * Add levels to a skill for an offline player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to add levels to
-     * @param skillType Type of skill to add levels to
-     * @param levels Number of levels to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static void addLevelOffline(UUID uuid, String skillType, int levels) {
-        PlayerProfile profile = getOfflineProfile(uuid);
-        SkillType skill = getSkillType(skillType);
-
-        if (skill.isChildSkill()) {
-            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
-
-            for (SkillType parentSkill : parentSkills) {
-                profile.addLevels(parentSkill, (levels / parentSkills.size()));
-            }
-
-            profile.scheduleAsyncSave();
-            return;
-        }
-
-        profile.addLevels(skill, levels);
-        profile.scheduleAsyncSave();
-    }
-
     /**
      * Get the level a player has in a specific skill.
      * </br>
@@ -594,27 +457,10 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static int getLevelOffline(String playerName, String skillType) {
         return getOfflineProfile(playerName).getSkillLevel(getSkillType(skillType));
     }
 
-    /**
-     * Get the level an offline player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to get the level for
-     * @param skillType The skill to get the level for
-     * @return the level of a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static int getLevelOffline(UUID uuid, String skillType) {
-        return getOfflineProfile(uuid).getSkillLevel(getSkillType(skillType));
-    }
-
     /**
      * Gets the power level of a player.
      * </br>
@@ -637,7 +483,6 @@ public final class ExperienceAPI {
      *
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static int getPowerLevelOffline(String playerName) {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(playerName);
@@ -649,27 +494,6 @@ public final class ExperienceAPI {
         return powerLevel;
     }
 
-    /**
-     * Gets the power level of an offline player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to get the power level for
-     * @return the power level of the player
-     *
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static int getPowerLevelOffline(UUID uuid) {
-        int powerLevel = 0;
-        PlayerProfile profile = getOfflineProfile(uuid);
-
-        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
-            powerLevel += profile.getSkillLevel(type);
-        }
-
-        return powerLevel;
-    }
-
     /**
      * Get the level cap of a specific skill.
      * </br>
@@ -709,28 +533,10 @@ public final class ExperienceAPI {
      *
      * @return the position on the leaderboard
      */
-    @Deprecated
     public static int getPlayerRankSkill(String playerName, String skillType) {
         return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType));
     }
 
-    /**
-     * Get the position on the leaderboard of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The name of the player to check
-     * @param skillType The skill to check
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     *
-     * @return the position on the leaderboard
-     */
-    public static int getPlayerRankSkill(UUID uuid, String skillType) {
-        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(uuid).getPlayerName()).get(getNonChildSkillType(skillType));
-    }
 
     /**
      * Get the position on the power level leaderboard of a player.
@@ -743,26 +549,10 @@ public final class ExperienceAPI {
      *
      * @return the position on the power level leaderboard
      */
-    @Deprecated
     public static int getPlayerRankOverall(String playerName) {
         return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
     }
 
-    /**
-     * Get the position on the power level leaderboard of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The name of the player to check
-     *
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     *
-     * @return the position on the power level leaderboard
-     */
-    public static int getPlayerRankOverall(UUID uuid) {
-        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(uuid).getPlayerName()).get(null);
-    }
-
     /**
      * Sets the level of a player in a specific skill type.
      * </br>
@@ -790,27 +580,10 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    @Deprecated
     public static void setLevelOffline(String playerName, String skillType, int skillLevel) {
         getOfflineProfile(playerName).modifySkill(getSkillType(skillType), skillLevel);
     }
 
-    /**
-     * Sets the level of an offline player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to set the level of
-     * @param skillType The skill to set the level for
-     * @param skillLevel The value to set the level to
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static void setLevelOffline(UUID uuid, String skillType, int skillLevel) {
-        getOfflineProfile(uuid).modifySkill(getSkillType(skillType), skillLevel);
-    }
-
     /**
      * Sets the XP of a player in a specific skill type.
      * </br>
@@ -840,28 +613,10 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    @Deprecated
     public static void setXPOffline(String playerName, String skillType, int newValue) {
         getOfflineProfile(playerName).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
-    /**
-     * Sets the XP of an offline player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to set the XP of
-     * @param skillType The skill to set the XP for
-     * @param newValue The value to set the XP to
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static void setXPOffline(UUID uuid, String skillType, int newValue) {
-        getOfflineProfile(uuid).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
-    }
-
     /**
      * Removes XP from a player in a specific skill type.
      * </br>
@@ -891,37 +646,12 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    @Deprecated
     public static void removeXPOffline(String playerName, String skillType, int xp) {
         getOfflineProfile(playerName).removeXp(getNonChildSkillType(skillType), xp);
     }
 
-    /**
-     * Removes XP from an offline player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to change the XP of
-     * @param skillType The skill to change the XP for
-     * @param xp The amount of XP to remove
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static void removeXPOffline(UUID uuid, String skillType, int xp) {
-        getOfflineProfile(uuid).removeXp(getNonChildSkillType(skillType), xp);
-    }
-
     // Utility methods follow.
-    private static void addOfflineXP(UUID playerUniqueId, SkillType skill, int XP) {
-        PlayerProfile profile = getOfflineProfile(playerUniqueId);
 
-        profile.addXp(skill, XP);
-        profile.save();
-    }
-
-    @Deprecated
     private static void addOfflineXP(String playerName, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerName);
 
@@ -929,20 +659,8 @@ public final class ExperienceAPI {
         profile.scheduleAsyncSave();
     }
 
-    private static PlayerProfile getOfflineProfile(UUID uuid) {
-        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
-
-        if (!profile.isLoaded()) {
-            throw new InvalidPlayerException();
-        }
-
-        return profile;
-    }
-
-    @Deprecated
     private static PlayerProfile getOfflineProfile(String playerName) {
-        UUID uuid = mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId();
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
-        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
 
         if (!profile.isLoaded()) {
             throw new InvalidPlayerException();

src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java

@@ -12,7 +12,6 @@ import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class ConvertDatabaseCommand implements CommandExecutor {
@@ -56,13 +55,13 @@ public class ConvertDatabaseCommand implements CommandExecutor {
                 UserManager.clearAll();
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getUniqueId());
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
 
                     if (profile.isLoaded()) {
                         mcMMO.getDatabaseManager().saveUser(profile);
                     }
 
-                    new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                    UserManager.addUser(player);
                 }
 
                 new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);

src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java

@@ -9,7 +9,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.database.FormulaConversionTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class ConvertExperienceCommand implements CommandExecutor {
@@ -38,7 +37,7 @@ public class ConvertExperienceCommand implements CommandExecutor {
                 new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                    UserManager.addUser(player);
                 }
 
                 return true;

src/main/java/com/gmail/nossr50/config/Config.java

@@ -232,7 +232,6 @@ public class Config extends AutoUpdateConfigLoader {
     /* General Settings */
     public String getLocale() { return config.getString("General.Locale", "en_us"); }
     public boolean getMOTDEnabled() { return config.getBoolean("General.MOTD_Enabled", true); }
-    public boolean getShowProfileLoadedMessage() { return config.getBoolean("General.Show_Profile_Loaded", true); }
     public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
     public int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
     public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
@@ -314,8 +313,6 @@ public class Config extends AutoUpdateConfigLoader {
     public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
     public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
     public String getMySQLUserPassword() { return getStringIncludingInts("MySQL.Database.User_Password"); }
-    public int getMySQLMaxConnections() { return config.getInt("MySQL.Database.MaxConnections"); }
-    public int getMySQLMaxPoolSize() { return config.getInt("MySQL.Database.MaxPoolSize"); }
 
     private String getStringIncludingInts(String key) {
         String str = config.getString(key);

src/main/java/com/gmail/nossr50/config/HiddenConfig.java

@@ -12,7 +12,6 @@ public class HiddenConfig {
     private static int conversionRate;
     private static boolean useEnchantmentBuffs;
     private static boolean resendChunksAfterBlockAbility;
-    private static int uuidConvertAmount;
 
     public HiddenConfig(String fileName) {
         HiddenConfig.fileName = fileName;
@@ -34,7 +33,6 @@ public class HiddenConfig {
             conversionRate = config.getInt("Options.ConversionRate", 1);
             useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
             resendChunksAfterBlockAbility = config.getBoolean("Options.RefreshChunks", false);
-            uuidConvertAmount = config.getInt("Options.UUIDConvertAmount", 5);
         }
     }
 
@@ -53,8 +51,4 @@ public class HiddenConfig {
     public boolean resendChunksAfterBlockAbility() {
         return resendChunksAfterBlockAbility;
     }
-
-    public int getUUIDConvertAmount() {
-        return uuidConvertAmount;
-    }
 }

src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java

@@ -68,39 +68,59 @@ public class CustomBlockConfig extends ConfigLoader {
             Material blockMaterial = Material.matchMaterial(blockInfo[0]);
 
             if (blockMaterial == null) {
-                plugin.getLogger().warning("Invalid material name. This item will be skipped. - " + blockInfo[0]);
+                plugin.getLogger().warning("Invalid material name. [" + blockInfo[0] + "] This item will be skipped. - " + blockName);
                 continue;
             }
 
+            if (blockInfo.length == 2) {
+                String[] dataInfo = blockInfo[1].split("[-]");
+
+                if (dataInfo.length == 2) {
+                    byte startData = Byte.valueOf(dataInfo[0]);
+                    byte endData = Byte.valueOf(dataInfo[1]);
+
+                    for (byte blockData = startData; blockData <= endData; blockData++) {
+                        MaterialData blockMaterialData = new MaterialData(blockMaterial, blockData);
+                        loadBlock(skillType, blockList, blockName, blockMaterialData);
+                    }
+
+                    return;
+                }
+            }
+
             byte blockData = (blockInfo.length == 2) ? Byte.valueOf(blockInfo[1]) : 0;
+
             MaterialData blockMaterialData = new MaterialData(blockMaterial, blockData);
-
+            loadBlock(skillType, blockList, blockName, blockMaterialData);
-            if (blockList != null) {
-                blockList.add(blockMaterialData);
-            }
-
-            if (skillType.equals("Ability_Blocks")) {
-                continue;
-            }
-
-            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain");
-            int smeltingXp = 0;
-
-            if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
-                customOres.add(blockMaterialData);
-                smeltingXp = config.getInt(skillType + "." + blockName + ".Smelting_XP_Gain", xp / 10);
-            }
-            else if (skillType.equals("Woodcutting")) {
-                if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
-                    customLogs.add(blockMaterialData);
-                }
-                else {
-                    customLeaves.add(blockMaterialData);
-                    xp = 0; // Leaves don't grant XP
-                }
-            }
-
-            customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
         }
     }
+
+    private void loadBlock(String skillType, List<MaterialData> blockList, String blockName, MaterialData blockMaterialData) {
+        if (blockList != null) {
+            blockList.add(blockMaterialData);
+        }
+
+        if (skillType.equals("Ability_Blocks")) {
+            return;
+        }
+
+        int xp = config.getInt(skillType + "." + blockName + ".XP_Gain");
+        int smeltingXp = 0;
+
+        if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
+            customOres.add(blockMaterialData);
+            smeltingXp = config.getInt(skillType + "." + blockName + ".Smelting_XP_Gain", xp / 10);
+        }
+        else if (skillType.equals("Woodcutting")) {
+            if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
+                customLogs.add(blockMaterialData);
+            }
+            else {
+                customLeaves.add(blockMaterialData);
+                xp = 0; // Leaves don't grant XP
+            }
+        }
+
+        customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
+    }
 }

src/main/java/com/gmail/nossr50/database/DatabaseManager.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.database;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
@@ -68,42 +67,19 @@ public interface DatabaseManager {
      *
      * @param playerName The name of the player to be added to the database
      */
-    public void newUser(String playerName, String uuid);
+    public void newUser(String playerName);
 
     /**
      * 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
     public PlayerProfile loadPlayerProfile(String playerName, boolean createNew);
 
-    /**
-     * Load a player from the database.
-     *
-     * @param uuid The uuid of the player to load from the database
-     * @return The player's data, or an unloaded PlayerProfile if not found
-     */
-    public 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
-     */
-    public PlayerProfile loadPlayerProfile(String playerName, UUID uuid, boolean createNew);
-
     /**
      * Get all users currently stored in the database.
      *
@@ -119,19 +95,10 @@ public interface DatabaseManager {
      */
     public void convertUsers(DatabaseManager destination);
 
-    public boolean saveUserUUID(String userName, UUID uuid);
-
-    public boolean saveUserUUIDs(Map<String, UUID> fetchedUUIDs);
-
     /**
      * Retrieve the type of database in use. Custom databases should return CUSTOM.
      *
      * @return The type of database
      */
     public DatabaseType getDatabaseType();
-
-    /**
-     * Called when the plugin disables
-     */
-    public void onDisable();
 }

src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.database;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -9,12 +10,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import org.bukkit.OfflinePlayer;
 
@@ -27,7 +26,6 @@ import com.gmail.nossr50.datatypes.database.UpgradeType;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.StringUtils;
 
@@ -46,10 +44,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         usersFile = new File(mcMMO.getUsersFilePath());
         checkStructure();
         updateLeaderboards();
-
-        if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.ADD_UUIDS)) {
-            new UUIDUpdateAsyncTask(mcMMO.p, getStoredUsers()).runTaskAsynchronously(mcMMO.p);
-        }
     }
 
     public void purgePowerlessUsers() {
@@ -98,22 +92,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
+                tryClose(out);
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
 
@@ -178,22 +158,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
+                tryClose(out);
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
 
@@ -231,22 +197,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
+                tryClose(out);
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
 
@@ -257,7 +209,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
     public boolean saveUser(PlayerProfile profile) {
         String playerName = profile.getPlayerName();
-        UUID uuid = profile.getUniqueId();
 
         BufferedReader in = null;
         FileWriter out = null;
@@ -272,9 +223,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                 // While not at the end of the file
                 while ((line = in.readLine()) != null) {
-                    // Read the line in and copy it to the output if it's not the player we want to edit
+                    // Read the line in and copy it to the output it's not the player we want to edit
-                    String[] character = line.split(":");
+                    if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
-                    if (!character[41].equalsIgnoreCase(uuid.toString()) && !character[0].equalsIgnoreCase(playerName)) {
                         writer.append(line).append("\r\n");
                     }
                     else {
@@ -321,7 +271,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         writer.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":");
                         writer.append(profile.getSkillLevel(SkillType.ALCHEMY)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.ALCHEMY)).append(":");
-                        writer.append(uuid.toString()).append(":");
                         writer.append("\r\n");
                     }
                 }
@@ -336,22 +285,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 return false;
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
+                tryClose(out);
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
     }
@@ -367,7 +302,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
     public Map<SkillType, Integer> readRank(String playerName) {
         updateLeaderboards();
 
-        Map<SkillType, Integer> skills = new EnumMap<SkillType, Integer>(SkillType.class);
+        Map<SkillType, Integer> skills = new HashMap<SkillType, Integer>();
 
         for (SkillType skill : SkillType.NON_CHILD_SKILLS) {
             skills.put(skill, getPlayerRank(playerName, playerStatHash.get(skill)));
@@ -378,7 +313,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         return skills;
     }
 
-    public void newUser(String playerName, String uuid) {
+    public void newUser(String playerName) {
         BufferedWriter out = null;
         synchronized (fileWritingLock) {
             try {
@@ -427,8 +362,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 out.append(Config.getInstance().getMobHealthbarDefault().toString()).append(":"); // Mob Healthbar HUD
                 out.append("0:"); // Alchemy
                 out.append("0:"); // AlchemyXp
-                out.append(uuid).append(":"); // UUID
+                
-
                 // Add more in the same format as the line above
 
                 out.newLine();
@@ -437,32 +371,12 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 e.printStackTrace();
             }
             finally {
-                if (out != null) {
+                tryClose(out);
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
     }
 
-    @Deprecated
     public PlayerProfile loadPlayerProfile(String playerName, boolean create) {
-        return loadPlayerProfile(playerName, "", false);
-    }
-
-    public PlayerProfile loadPlayerProfile(UUID uuid) {
-        return loadPlayerProfile("", uuid.toString(), false);
-    }
-
-    public PlayerProfile loadPlayerProfile(String playerName, UUID uuid, boolean create) {
-        return loadPlayerProfile(playerName, uuid.toString(), create);
-    }
-
-    private PlayerProfile loadPlayerProfile(String playerName, String uuid, boolean create) {
         BufferedReader in = null;
         String usersFilePath = mcMMO.getUsersFilePath();
 
@@ -476,14 +390,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     // Find if the line contains the player we want.
                     String[] character = line.split(":");
 
-                    if (!character[41].equalsIgnoreCase(uuid) && !character[0].equalsIgnoreCase(playerName)) {
-                        continue;
-                    }
-
-                    // Update playerName in database after name change
                     if (!character[0].equalsIgnoreCase(playerName)) {
-                        mcMMO.p.debug("Name change detected: " + character[0] + " => " + playerName);
+                        continue;
-                        character[0] = playerName;
                     }
 
                     return loadFromLine(character);
@@ -491,13 +399,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                 // Didn't find the player, create a new one
                 if (create) {
-                    if (uuid.isEmpty()) {
+                    newUser(playerName);
-                        newUser(playerName, uuid);
+                    return new PlayerProfile(playerName, true);
-                        return new PlayerProfile(playerName, true);
-                    }
-
-                    newUser(playerName, uuid);
-                    return new PlayerProfile(playerName, UUID.fromString(uuid), true);
                 }
             }
             catch (Exception e) {
@@ -511,18 +414,14 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         in.close();
                     }
                     catch (IOException e) {
-                        // Ignore
+                        e.printStackTrace();
                     }
                 }
             }
         }
 
         // Return unloaded profile
-        if (uuid.isEmpty()) {
+        return new PlayerProfile(playerName);
-            return new PlayerProfile(playerName);
-        }
-
-        return new PlayerProfile(playerName, UUID.fromString(uuid));
     }
 
     public void convertUsers(DatabaseManager destination) {
@@ -554,131 +453,11 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 e.printStackTrace();
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
     }
 
-    public boolean saveUserUUID(String userName, UUID uuid) {
-        boolean worked = false;
-
-        BufferedReader in = null;
-        FileWriter out = null;
-        String usersFilePath = mcMMO.getUsersFilePath();
-
-        synchronized (fileWritingLock) {
-            try {
-                in = new BufferedReader(new FileReader(usersFilePath));
-                StringBuilder writer = new StringBuilder();
-                String line;
-
-                while ((line = in.readLine()) != null) {
-                    String[] character = line.split(":");
-                    if (!worked && character[0].equalsIgnoreCase(userName)) {
-                        if (character.length < 42) {
-                            mcMMO.p.getLogger().severe("Could not update UUID for " + userName + "!");
-                            mcMMO.p.getLogger().severe("Database entry is invalid.");
-                            break;
-                        }
-
-                        line = line.replace(character[41], uuid.toString());
-                        worked = true;
-                    }
-
-                    writer.append(line).append("\r\n");
-                }
-
-                out = new FileWriter(usersFilePath); // Write out the new file
-                out.write(writer.toString());
-            }
-            catch (Exception e) {
-                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
-            }
-            finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-            }
-        }
-
-        return worked;
-    }
-
-    public boolean saveUserUUIDs(Map<String, UUID> fetchedUUIDs) {
-        BufferedReader in = null;
-        FileWriter out = null;
-        String usersFilePath = mcMMO.getUsersFilePath();
-
-        synchronized (fileWritingLock) {
-            try {
-                in = new BufferedReader(new FileReader(usersFilePath));
-                StringBuilder writer = new StringBuilder();
-                String line;
-
-                while (((line = in.readLine()) != null) && !fetchedUUIDs.isEmpty()) {
-                    String[] character = line.split(":");
-                    if (fetchedUUIDs.containsKey(character[0])) {
-                        if (character.length < 42) {
-                            mcMMO.p.getLogger().severe("Could not update UUID for " + character[0] + "!");
-                            mcMMO.p.getLogger().severe("Database entry is invalid.");
-                            return false;
-                        }
-
-                        line = line.replace(character[41], fetchedUUIDs.remove(character[0]).toString());
-                    }
-
-                    writer.append(line).append("\r\n");
-                }
-
-                out = new FileWriter(usersFilePath); // Write out the new file
-                out.write(writer.toString());
-            }
-            catch (Exception e) {
-                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
-            }
-            finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
     public List<String> getStoredUsers() {
         ArrayList<String> users = new ArrayList<String>();
         BufferedReader in = null;
@@ -699,14 +478,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 e.printStackTrace();
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
         return users;
@@ -776,14 +548,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " during user " + playerName + " (Are you sure you formatted it correctly?) " + e.toString());
             }
             finally {
-                if (in != null) {
+                tryClose(in);
-                    try {
-                        in.close();
-                    }
-                    catch (IOException e) {
-                        // Ignore
-                    }
-                }
             }
         }
 
@@ -833,7 +598,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     in = new BufferedReader(new FileReader(usersFilePath));
                     StringBuilder writer = new StringBuilder();
                     String line;
-                    HashSet<String> usernames = new HashSet<String>();
                     HashSet<String> players = new HashSet<String>();
 
                     while ((line = in.readLine()) != null) {
@@ -848,13 +612,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         }
                         String[] character = line.split(":");
 
-                        // Prevent the same username from being present multiple times
-                        if (!usernames.add(character[0])) {
-                            continue;
-                        }
-
                         // Prevent the same player from being present multiple times
-                        if (character.length == 42 && (!character[41].isEmpty() && !players.add(character[41]))) {
+                        if (!players.add(character[0])) {
                             continue;
                         }
 
@@ -886,7 +645,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         }
 
                         // If they're valid, rewrite them to the file.
-                        if (character.length == 42) {
+                        if (character.length == 41) {
                             writer.append(line).append("\r\n");
                             continue;
                         }
@@ -940,25 +699,16 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                                 oldVersion = "1.4.08";
                             }
                         }
-                        if (character.length <= 41) {
-                            // Addition of UUIDs
-                            // Version 1.5.01
-                            // Add a space because otherwise it gets removed
-                            newLine.append(" :");
-                            if (oldVersion == null) {
-                                oldVersion = "1.5.01";
-                            }
-                        }
 
                         // Remove any blanks that shouldn't be there, and validate the other fields
                         String[] newCharacter = newLine.toString().split(":");
                         boolean corrupted = false;
 
                         for (int i = 0; i < newCharacter.length; i++) {
-                            if (newCharacter[i].isEmpty() && !(i == 2 || i == 3 || i == 23 || i == 33 || i == 41)) {
+                            if (newCharacter[i].isEmpty() && !(i == 2 || i == 3 || i == 23 || i == 33)) {
                                 corrupted = true;
 
-                                if (newCharacter.length != 42) {
+                                if (newCharacter.length != 41) {
                                     newCharacter = (String[]) ArrayUtils.remove(newCharacter, i);
                                 }
                                 else {
@@ -979,7 +729,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                                 newCharacter[i] = Config.getInstance().getMobHealthbarDefault().toString();
                             }
 
-                            if (!StringUtils.isInt(newCharacter[i]) && !(i == 0 || i == 2 || i == 3 || i == 23 || i == 33 || i == 38 || i == 41)) {
+                            if (!StringUtils.isInt(newCharacter[i]) && !(i == 0 || i == 2 || i == 3 || i == 23 || i == 33 || i == 38)) {
                                 corrupted = true;
                                 newCharacter[i] = "0";
                             }
@@ -990,7 +740,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         }
 
                         if (oldVersion != null) {
-                            mcMMO.p.debug("Updating database line from before version " + oldVersion + " for player " + character[0]);
+                            mcMMO.p.debug("Updating database line for player " + character[0] + " from before version " + oldVersion);
                         }
 
                         if (corrupted || oldVersion != null) {
@@ -1009,22 +759,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
                 }
                 finally {
-                    if (in != null) {
+                    tryClose(in);
-                        try {
+                    tryClose(out);
-                            in.close();
-                        }
-                        catch (IOException e) {
-                            // Ignore
-                        }
-                    }
-                    if (out != null) {
-                        try {
-                            out.close();
-                        }
-                        catch (IOException e) {
-                            // Ignore
-                        }
-                    }
                 }
             }
 
@@ -1049,6 +785,18 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         }
     }
 
+    private void tryClose(Closeable c) {
+        if (c == null) {
+            return;
+        }
+        try {
+            c.close();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     private Integer getPlayerRank(String playerName, List<PlayerStat> statsList) {
         if (statsList == null) {
             return null;
@@ -1081,8 +829,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
     private PlayerProfile loadFromLine(String[] character) {
         Map<SkillType, Integer>   skills     = getSkillMapFromLine(character);      // Skill levels
-        Map<SkillType, Float>     skillsXp   = new EnumMap<SkillType, Float>(SkillType.class);     // Skill & XP
+        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
-        Map<AbilityType, Integer> skillsDATS = new EnumMap<AbilityType, Integer>(AbilityType.class); // Ability & Cooldown
+        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
         MobHealthbarType mobHealthbarType;
 
         // TODO on updates, put new values in a try{} ?
@@ -1121,19 +869,11 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
             mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
         }
 
-        UUID uuid;
+        return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, mobHealthbarType);
-        try {
-            uuid = UUID.fromString(character[41]);
-        }
-        catch (Exception e) {
-            uuid = null;
-        }
-
-        return new PlayerProfile(character[0], uuid, skills, skillsXp, skillsDATS, mobHealthbarType);
     }
 
     private Map<SkillType, Integer> getSkillMapFromLine(String[] character) {
-        Map<SkillType, Integer> skills = new EnumMap<SkillType, Integer>(SkillType.class);   // Skill & Level
+        Map<SkillType, Integer> skills = new HashMap<SkillType, Integer>();   // Skill & Level
 
         skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
         skills.put(SkillType.MINING, Integer.valueOf(character[1]));
@@ -1155,7 +895,4 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
     public DatabaseType getDatabaseType() {
         return DatabaseType.FLATFILE;
     }
-
-    @Override
-    public void onDisable() { }
 }

src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java

@@ -7,6 +7,5 @@ public enum UpgradeType {
     ADD_MOB_HEALTHBARS,
     DROP_SQL_PARTY_NAMES,
     DROP_SPOUT,
-    ADD_ALCHEMY,
+    ADD_ALCHEMY;
-    ADD_UUIDS;
 }

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.datatypes.player;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -93,20 +92,15 @@ public class McMMOPlayer {
     private boolean isUsingUnarmed;
     private final FixedMetadataValue playerMetadata;
 
-    public McMMOPlayer(Player player, PlayerProfile profile) {
+    public McMMOPlayer(Player player) {
         String playerName = player.getName();
-        UUID uuid = player.getUniqueId();
 
         this.player = player;
         playerMetadata = new FixedMetadataValue(mcMMO.p, playerName);
-        this.profile = profile;
+        profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, true);
         party = PartyManager.getPlayerParty(playerName);
         ptpRecord = new PartyTeleportRecord();
 
-        if (profile.getUniqueId() == null) {
-            profile.setUniqueId(uuid);
-        }
-
         /*
          * I'm using this method because it makes code shorter and safer (we don't have to add all SkillTypes manually),
          * but I actually have no idea about the performance impact, if there is any.
@@ -130,6 +124,69 @@ public class McMMOPlayer {
         for (ToolType toolType : ToolType.values()) {
             toolMode.put(toolType, false);
         }
+
+        if (!profile.isLoaded()) {
+            mcMMO.p.getLogger().warning("Unable to load the PlayerProfile for " + playerName + ". Will retry over the next several seconds.");
+            new RetryProfileLoadingTask().runTaskTimerAsynchronously(mcMMO.p, 11L, 31L);
+        }
+    }
+
+    private class RetryProfileLoadingTask extends BukkitRunnable {
+        private static final int MAX_TRIES = 5;
+        private final String playerName = McMMOPlayer.this.player.getName();
+        private int attempt = 0;
+
+        // WARNING: ASYNC TASK
+        // DO NOT MODIFY THE McMMOPLAYER FROM THIS CODE
+        @Override
+        public void run() {
+            // Quit if they logged out
+            if (!player.isOnline()) {
+                mcMMO.p.getLogger().info("Aborting profile loading recovery for " + playerName + " - player logged out");
+                this.cancel();
+                return;
+            }
+
+            // Send the message that we're doing the recovery
+            if (attempt == 0) {
+                player.sendMessage(LocaleLoader.getString("Recovery.Notice"));
+            }
+
+            // Increment attempt counter and try
+            attempt++;
+            PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, true);
+            // If successful, schedule the apply
+            if (profile.isLoaded()) {
+                new ApplySuccessfulProfile(profile).runTask(mcMMO.p);
+                player.sendMessage(LocaleLoader.getString("Recovery.Success"));
+                this.cancel();
+                return;
+            }
+
+            // If we've failed five times, give up
+            if (attempt >= MAX_TRIES) {
+                mcMMO.p.getLogger().severe("Giving up on attempting to load the PlayerProfile for " + playerName);
+                mcMMO.p.getServer().broadcast(LocaleLoader.getString("Recovery.AdminFailureNotice", playerName), Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
+                player.sendMessage(LocaleLoader.getString("Recovery.Failure").split("\n"));
+                this.cancel();
+                return;
+            }
+        }
+    }
+
+    private class ApplySuccessfulProfile extends BukkitRunnable {
+        private final PlayerProfile profile;
+
+        private ApplySuccessfulProfile(PlayerProfile profile) {
+            this.profile = profile;
+        }
+
+        // Synchronized task
+        // No database access permitted
+        @Override
+        public void run() {
+            McMMOPlayer.this.profile = profile;
+        }
     }
 
     public AcrobaticsManager getAcrobaticsManager() {

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.datatypes.player;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
@@ -20,7 +19,6 @@ import com.google.common.collect.ImmutableMap;
 
 public class PlayerProfile {
     private final String playerName;
-    private UUID uuid;
     private boolean loaded;
     private volatile boolean changed;
 
@@ -32,13 +30,7 @@ public class PlayerProfile {
     private final Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
     private final Map<AbilityType, Integer> abilityDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
 
-    @Deprecated
     public PlayerProfile(String playerName) {
-        this(playerName, null);
-    }
-
-    public PlayerProfile(String playerName, UUID uuid) {
-        this.uuid = uuid;
         this.playerName = playerName;
 
         mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
@@ -53,20 +45,13 @@ public class PlayerProfile {
         }
     }
 
-    @Deprecated
     public PlayerProfile(String playerName, boolean isLoaded) {
         this(playerName);
         this.loaded = isLoaded;
     }
 
-    public PlayerProfile(String playerName, UUID uuid, boolean isLoaded) {
+    public PlayerProfile(String playerName, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, MobHealthbarType mobHealthbarType) {
-        this(playerName, uuid);
-        this.loaded = isLoaded;
-    }
-
-    public PlayerProfile(String playerName, UUID uuid, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, MobHealthbarType mobHealthbarType) {
         this.playerName = playerName;
-        this.uuid = uuid;
         this.mobHealthbarType = mobHealthbarType;
 
         skills.putAll(levelData);
@@ -86,11 +71,11 @@ public class PlayerProfile {
         }
 
         // TODO should this part be synchronized?
-        PlayerProfile profileCopy = new PlayerProfile(playerName, uuid, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), mobHealthbarType);
+        PlayerProfile profileCopy = new PlayerProfile(playerName, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), mobHealthbarType);
         changed = !mcMMO.getDatabaseManager().saveUser(profileCopy);
 
         if (changed) {
-            mcMMO.p.getLogger().warning("PlayerProfile saving failed for player: " + playerName + " " + uuid);
+            mcMMO.p.getLogger().warning("PlayerProfile for " + playerName + " failed to save");
         }
     }
 
@@ -98,16 +83,6 @@ public class PlayerProfile {
         return playerName;
     }
 
-    public UUID getUniqueId() {
-        return uuid;
-    }
-
-    public void setUniqueId(UUID uuid) {
-        changed = true;
-
-        this.uuid = uuid;
-    }
-
     public boolean isLoaded() {
         return loaded;
     }

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -41,7 +41,7 @@ import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.ShareHandler;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
+import com.gmail.nossr50.runnables.commands.McScoreboardKeepTask;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
@@ -387,7 +387,9 @@ public class PlayerListener implements Listener {
             return;
         }
 
-        new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
+        McMMOPlayer mcMMOPlayer = UserManager.addUser(player);
+        mcMMOPlayer.actualizeRespawnATS();
+        ScoreboardManager.setupPlayer(player);
 
         if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
             Motd.displayAll(player);
@@ -401,6 +403,11 @@ public class PlayerListener implements Listener {
             player.sendMessage(LocaleLoader.getString("UpdateChecker.Outdated"));
             player.sendMessage(LocaleLoader.getString("UpdateChecker.NewAvailable"));
         }
+
+        if (Config.getInstance().getShowStatsAfterLogin()) {
+            ScoreboardManager.enablePlayerStatsScoreboard(player);
+            new McScoreboardKeepTask(player).runTaskLater(mcMMO.p, 1 * Misc.TICK_CONVERSION_FACTOR);
+        }
     }
 
     /**

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -38,7 +38,6 @@ import com.gmail.nossr50.runnables.UpdaterResultAsyncTask;
 import com.gmail.nossr50.runnables.backups.CleanBackupsTask;
 import com.gmail.nossr50.runnables.database.UserPurgeTask;
 import com.gmail.nossr50.runnables.party.PartyAutoKickTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.runnables.player.PowerLevelUpdatingTask;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.alchemy.Alchemy;
@@ -168,7 +167,8 @@ public class mcMMO extends JavaPlugin {
             holidayManager = new HolidayManager();
 
             for (Player player : getServer().getOnlinePlayers()) {
-                new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                UserManager.addUser(player); // In case of reload add all users back into UserManager
+                ScoreboardManager.setupPlayer(player);
             }
 
             debug("Version " + getDescription().getVersion() + " is enabled!");
@@ -242,7 +242,6 @@ public class mcMMO extends JavaPlugin {
             }
         }
 
-        databaseManager.onDisable();
         debug("Was disabled."); // How informative!
     }
 

src/main/java/com/gmail/nossr50/runnables/database/SQLDatabaseKeepaliveTask.java

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.runnables.database;
+
+import java.lang.ref.WeakReference;
+
+import org.bukkit.scheduler.BukkitRunnable;
+
+import com.gmail.nossr50.database.SQLDatabaseManager;
+
+/**
+ * This task is in charge of sending a MySQL ping over the MySQL connection
+ * every hour to prevent the connection from timing out and losing players'
+ * data when they join.
+ * <p/>
+ * A WeakReference is used to keep the database instance, because
+ * {@link com.gmail.nossr50.commands.database.ConvertDatabaseCommand database
+ * conversion} may create a SQLDatabaseManager that will be thrown out. If a
+ * normal reference was used, the conversion would cause a combined data and
+ * resource leak through this task.
+ */
+public class SQLDatabaseKeepaliveTask extends BukkitRunnable {
+    WeakReference<SQLDatabaseManager> databaseInstance;
+
+    public SQLDatabaseKeepaliveTask(SQLDatabaseManager dbman) {
+        databaseInstance = new WeakReference<SQLDatabaseManager>(dbman);
+    }
+
+    public void run() {
+        SQLDatabaseManager dbman = databaseInstance.get();
+        if (dbman != null) {
+            dbman.checkConnected();
+        }
+        else {
+            // This happens when the database was started for a conversion,
+            // or discarded by its creator for any other reason. If this code
+            // was not present, we would leak the connection resources.
+            this.cancel();
+        }
+    }
+}

src/main/java/com/gmail/nossr50/runnables/database/SQLReconnectTask.java

@@ -0,0 +1,22 @@
+package com.gmail.nossr50.runnables.database;
+
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.database.SQLDatabaseManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SQLReconnectTask extends BukkitRunnable {
+    @Override
+    public void run() {
+        if (((SQLDatabaseManager) mcMMO.getDatabaseManager()).checkConnected()) {
+            UserManager.saveAll();  // Save all profiles
+            UserManager.clearAll(); // Clear the profiles
+
+            for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                UserManager.addUser(player); // Add in new profiles, forcing them to 'load' again from MySQL
+            }
+        }
+    }
+}

src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java

@@ -1,73 +0,0 @@
-package com.gmail.nossr50.runnables.database;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.database.DatabaseManager;
-import com.gmail.nossr50.datatypes.database.UpgradeType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.uuid.UUIDFetcher;
-
-public class UUIDUpdateAsyncTask extends BukkitRunnable {
-    private mcMMO plugin;
-    private static final int MAX_LOOKUP = Math.max(HiddenConfig.getInstance().getUUIDConvertAmount(), 100);
-
-    private List<String> userNames;
-    private int size;
-    private int checkedUsers;
-    private long startMillis;
-
-    public UUIDUpdateAsyncTask(mcMMO plugin, List<String> userNames) {
-        this.plugin = plugin;
-        this.userNames = userNames;
-
-        this.checkedUsers = 0;
-        this.startMillis = System.currentTimeMillis();
-    }
-
-    @Override
-    public void run() {
-        size = userNames.size();
-
-        plugin.getLogger().info("Starting to check and update UUIDs, total amount of users: " + size);
-
-        List<String> userNamesSection;
-        Map<String, UUID> fetchedUUIDs = new HashMap<String, UUID>();
-
-        while (size != 0) {
-            if (size > MAX_LOOKUP) {
-                userNamesSection = userNames.subList(size - MAX_LOOKUP, size);
-                size -= MAX_LOOKUP;
-            }
-            else {
-                userNamesSection = userNames.subList(0, size);
-                size = 0;
-            }
-
-            try {
-                fetchedUUIDs.putAll(new UUIDFetcher(userNamesSection).call());
-            }
-            catch (Exception e) {
-                plugin.getLogger().severe("Unable to fetch UUIDs!");
-                return;
-            }
-
-            checkedUsers += userNamesSection.size();
-            userNamesSection.clear();
-            size = userNames.size();
-
-            Misc.printProgress(checkedUsers, DatabaseManager.progressInterval, startMillis);
-        }
-
-        if (mcMMO.getDatabaseManager().saveUserUUIDs(fetchedUUIDs)) {
-            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_UUIDS);
-            plugin.getLogger().info("UUID upgrade completed!");
-        }
-    }
-}

src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java

@@ -1,108 +0,0 @@
-package com.gmail.nossr50.runnables.player;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.commands.McScoreboardKeepTask;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
-public class PlayerProfileLoadingTask extends BukkitRunnable {
-    private static final int MAX_TRIES = 5;
-    private final Player player;
-    private int attempt = 0;
-    private ReentrantLock lock = new ReentrantLock();
-    private boolean cancelled = false;
-
-    public PlayerProfileLoadingTask(Player player) {
-        this.player = player;
-    }
-
-    // WARNING: ASYNC TASK
-    // DO NOT MODIFY THE McMMOPLAYER FROM THIS CODE
-    @Override
-    public void run() {
-        lock.lock();
-
-        if (this.cancelled) {
-            return;
-        }
-
-        // Quit if they logged out
-        if (!player.isOnline()) {
-            mcMMO.p.getLogger().info("Aborting profile loading recovery for " + player.getName() + " - player logged out");
-            this.cancel();
-            cancelled = true;
-            lock.unlock();
-            return;
-        }
-
-        // Increment attempt counter and try
-        attempt++;
-
-        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(player.getName(), player.getUniqueId(), true);
-        // If successful, schedule the apply
-        if (profile.isLoaded()) {
-            new ApplySuccessfulProfile(profile).runTask(mcMMO.p);
-            this.cancel();
-            cancelled = true;
-            lock.unlock();
-            return;
-        }
-
-        // If we've failed five times, give up
-        if (attempt >= MAX_TRIES) {
-            mcMMO.p.getLogger().severe("Giving up on attempting to load the PlayerProfile for " + player.getName());
-            mcMMO.p.getServer().broadcast(LocaleLoader.getString("Profile.Loading.AdminFailureNotice", player.getName()), Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
-            player.sendMessage(LocaleLoader.getString("Profile.Loading.Failure").split("\n"));
-            this.cancel();
-            cancelled = true;
-            lock.unlock();
-            return;
-        }
-        lock.unlock();
-    }
-
-    private class ApplySuccessfulProfile extends BukkitRunnable {
-        private final PlayerProfile profile;
-
-        private ApplySuccessfulProfile(PlayerProfile profile) {
-            this.profile = profile;
-        }
-
-        // Synchronized task
-        // No database access permitted
-        @Override
-        public void run() {
-            if (!player.isOnline()) {
-                mcMMO.p.getLogger().info("Aborting profile loading recovery for " + player.getName() + " - player logged out");
-                return;
-            }
-
-            McMMOPlayer mcMMOPlayer = new McMMOPlayer(player, profile);
-            UserManager.track(mcMMOPlayer);
-            mcMMOPlayer.actualizeRespawnATS();
-            ScoreboardManager.setupPlayer(player);
-
-            if (Config.getInstance().getShowProfileLoadedMessage()) {
-                player.sendMessage(LocaleLoader.getString("Profile.Loading.Success"));
-            }
-
-            if (Config.getInstance().getShowStatsAfterLogin()) {
-                ScoreboardManager.enablePlayerStatsScoreboard(player);
-                new McScoreboardKeepTask(player).runTaskLater(mcMMO.p, 1 * Misc.TICK_CONVERSION_FACTOR);
-            }
-        }
-    }
-}
-
-

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@@ -134,7 +134,10 @@ public final class AlchemyPotionBrewer {
 
             if (output != null && player != null) {
                 PotionStage potionStage = PotionStage.getPotionStage(input, output);
-                UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(potionStage, 1);
+
+                if (UserManager.hasPlayerDataKey(player)) {
+                    UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(potionStage, 1);
+                }
             }
         }
 

src/main/java/com/gmail/nossr50/util/Misc.java

@@ -13,7 +13,6 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.events.items.McMMOItemSpawnEvent;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.util.player.UserManager;
 
 public final class Misc {
@@ -113,7 +112,7 @@ public final class Misc {
 
         if (player != null) {
             UserManager.remove(player);
-            new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
+            UserManager.addUser(player);
         }
     }
 

src/main/java/com/gmail/nossr50/util/player/UserManager.java

@@ -18,12 +18,16 @@ public final class UserManager {
     private UserManager() {}
 
     /**
-     * Track a new user.
+     * Add a new user.
      *
-     * @param mcMMOPlayer the player profile to start tracking
+     * @param player The player to create a user record for
+     * @return the player's {@link McMMOPlayer} object
      */
-    public static void track(McMMOPlayer mcMMOPlayer) {
+    public static McMMOPlayer addUser(Player player) {
-        mcMMOPlayer.getPlayer().setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
+        McMMOPlayer mcMMOPlayer = new McMMOPlayer(player);
+        player.setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
+
+        return mcMMOPlayer;
     }
 
     /**

src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java

@@ -1,100 +0,0 @@
-package com.gmail.nossr50.util.uuid;
-
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-
-import com.google.common.collect.ImmutableList;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-
-public class UUIDFetcher implements Callable<Map<String, UUID>> {
-    private static final double PROFILES_PER_REQUEST = 100;
-    private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
-    private final JSONParser jsonParser = new JSONParser();
-    private final List<String> names;
-    private final boolean rateLimiting;
-
-    public UUIDFetcher(List<String> names, boolean rateLimiting) {
-        this.names = ImmutableList.copyOf(names);
-        this.rateLimiting = rateLimiting;
-    }
-
-    public UUIDFetcher(List<String> names) {
-        this(names, true);
-    }
-
-    public Map<String, UUID> call() throws Exception {
-        Map<String, UUID> uuidMap = new HashMap<String, UUID>();
-        int requests = (int) Math.ceil(names.size() / PROFILES_PER_REQUEST);
-        for (int i = 0; i < requests; i++) {
-            HttpURLConnection connection = createConnection();
-            String body = JSONArray.toJSONString(names.subList(i * 100, Math.min((i + 1) * 100, names.size())));
-            writeBody(connection, body);
-            JSONArray array = (JSONArray) jsonParser.parse(new InputStreamReader(connection.getInputStream()));
-            for (Object profile : array) {
-                JSONObject jsonProfile = (JSONObject) profile;
-                String id = (String) jsonProfile.get("id");
-                String name = (String) jsonProfile.get("name");
-                UUID uuid = UUIDFetcher.getUUID(id);
-                uuidMap.put(name, uuid);
-            }
-            if (rateLimiting && i != requests - 1) {
-                Thread.sleep(100L);
-            }
-        }
-        return uuidMap;
-    }
-
-    private static void writeBody(HttpURLConnection connection, String body) throws Exception {
-        OutputStream stream = connection.getOutputStream();
-        stream.write(body.getBytes());
-        stream.flush();
-        stream.close();
-    }
-
-    private static HttpURLConnection createConnection() throws Exception {
-        URL url = new URL(PROFILE_URL);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-        connection.setRequestMethod("POST");
-        connection.setRequestProperty("Content-Type", "application/json");
-        connection.setUseCaches(false);
-        connection.setDoInput(true);
-        connection.setDoOutput(true);
-        return connection;
-    }
-
-    private static UUID getUUID(String id) {
-        return UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" + id.substring(16, 20) + "-" + id.substring(20, 32));
-    }
-
-    public static byte[] toBytes(UUID uuid) {
-        ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[16]);
-        byteBuffer.putLong(uuid.getMostSignificantBits());
-        byteBuffer.putLong(uuid.getLeastSignificantBits());
-        return byteBuffer.array();
-    }
-
-    public static UUID fromBytes(byte[] array) {
-        if (array.length != 16) {
-            throw new IllegalArgumentException("Illegal byte array length: " + array.length);
-        }
-        ByteBuffer byteBuffer = ByteBuffer.wrap(array);
-        long mostSignificant = byteBuffer.getLong();
-        long leastSignificant = byteBuffer.getLong();
-        return new UUID(mostSignificant, leastSignificant);
-    }
-
-    public static UUID getUUIDOf(String name) throws Exception {
-        return new UUIDFetcher(Arrays.asList(name)).call().get(name);
-    }
-}

src/main/resources/config.yml

@@ -10,8 +10,6 @@
 General:
     Locale: en_US
     MOTD_Enabled: true
-    # Send a message to the player when his profile was successfully loaded
-    Show_Profile_Loaded: false
     # Amount of time (in minutes) to wait between saves of player information
     Save_Interval: 10
     # Allow mcMMO to report on basic anonymous usage
@@ -124,12 +122,6 @@ MySQL:
         User_Password: UserPassword
         Name: DataBaseName
         TablePrefix: mcmmo_
-        # This setting is the max simultaneous mysql connections allowed at a time, needs to be
-        # high enough to support multiple player logins in quick succession
-        MaxConnections: 30
-        # This setting is the max size of the pool of cached connections that we hold available
-        # at any given time
-        MaxPoolSize: 20
     Server:
         Port: 3306
         Address: localhost

src/main/resources/hidden.yml

@@ -11,6 +11,3 @@ Options:
     EnchantmentBuffs: true
     # true to enable refreshing of chunks around a player at the end of Super Breaker, Giga Drill Breaker, and Berserk.  This should fix blocks being broken client side, but not server-side
     RefreshChunks: false
-
-    # Amount of users to convert every interval
-    UUIDConvertAmount: 100

src/main/resources/locale/locale_en_US.properties

@@ -960,6 +960,7 @@ Scoreboard.Misc.Cooldown=[[LIGHT_PURPLE]]Cooldown
 Scoreboard.Misc.Overall=[[GOLD]]Overall
 
 #DATABASE RECOVERY
-Profile.Loading.Success=[[GREEN]]Your mcMMO profile has been loaded.
+Recovery.Notice=[[RED]]Notice: mcMMO was [[DARK_RED]]unable to load your data.[[RED]] Retrying 5 times...
-Profile.Loading.Failure=[[RED]]mcMMO still cannot load your data. You may want to [[AQUA]]contact the server owner.\n[[YELLOW]]You can still play on the server, but you will have [[BOLD]]no mcMMO levels[[YELLOW]] and any XP you get [[BOLD]]will not be saved[[YELLOW]].
+Recovery.Success=[[GREEN]]Success! Your mcMMO data was loaded.
-Profile.Loading.AdminFailureNotice=[[DARK_RED]][A][[RED]] mcMMO was unable to load the player data for [[YELLOW]]{0}[[RED]]. [[LIGHT_PURPLE]]Please inspect your database setup.
+Recovery.Failure=[[RED]]mcMMO still cannot load your data. You may want to [[AQUA]]contact the server owner.\n[[YELLOW]]You can still play on the server, but you will have [[BOLD]]no mcMMO levels[[YELLOW]] and any XP you get [[BOLD]]will not be saved[[YELLOW]].
+Recovery.AdminFailureNotice=[[DARK_RED]][A][[RED]] mcMMO was unable to load the player data for [[YELLOW]]{0}[[RED]]. [[LIGHT_PURPLE]]Please inspect your database setup.