From 7755875dbf3d9c852ab6a28fbfcdb188b1f9219e Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 11 Mar 2021 12:02:21 -0800
Subject: [PATCH] Some refactoring of FlatFileDatabaseManager

---
 src/main/java/com/gmail/nossr50/commands/MHDCommand.java   | 6 +++---
 .../com/gmail/nossr50/database/DatabaseManagerFactory.java | 4 ++--
 ...leDatabaseManager.java => FlatFileDatabaseManager.java} | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename src/main/java/com/gmail/nossr50/database/{FlatfileDatabaseManager.java => FlatFileDatabaseManager.java} (99%)

diff --git a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java b/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
index a85fe9426..d3b547acc 100644
--- a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.FlatfileDatabaseManager;
+import com.gmail.nossr50.database.FlatFileDatabaseManager;
 import com.gmail.nossr50.database.SQLDatabaseManager;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
@@ -27,8 +27,8 @@ public class MHDCommand implements TabExecutor {
             sender.sendMessage("Mob health reset");
             return true;
         }
-        if (mcMMO.getDatabaseManager() instanceof FlatfileDatabaseManager) {
-            FlatfileDatabaseManager m = (FlatfileDatabaseManager) mcMMO.getDatabaseManager();
+        if (mcMMO.getDatabaseManager() instanceof FlatFileDatabaseManager) {
+            FlatFileDatabaseManager m = (FlatFileDatabaseManager) mcMMO.getDatabaseManager();
             m.resetMobHealthSettings();
             for (McMMOPlayer player : UserManager.getPlayers()) {
                 player.getProfile().setMobHealthbarType(Config.getInstance().getMobHealthbarDefault());
diff --git a/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java b/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java
index 24013a3a8..b6981403b 100644
--- a/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java
+++ b/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java
@@ -23,7 +23,7 @@ public class DatabaseManagerFactory {
             mcMMO.p.debug("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");
diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
similarity index 99%
rename from src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
rename to src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
index ef4f7ff5f..e5da7aff4 100644
--- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.*;
 import java.util.*;
 
-public final class FlatfileDatabaseManager implements DatabaseManager {
+public final class FlatFileDatabaseManager implements DatabaseManager {
     private final HashMap<PrimarySkillType, List<PlayerStat>> playerStatHash = new HashMap<>();
     private final List<PlayerStat> powerLevels = new ArrayList<>();
     private long lastUpdate = 0;
@@ -74,7 +74,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
     public static int DATA_ENTRY_COUNT = COOLDOWN_CHIMAERA_WING + 1; //Update this everytime new data is added
 
-    protected FlatfileDatabaseManager() {
+    protected FlatFileDatabaseManager() {
         usersFile = new File(mcMMO.getUsersFilePath());
         checkStructure();
         updateLeaderboards();
@@ -339,8 +339,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 /*
                  * If we couldn't find the user in the DB we need to add him
                  */
-                if(!wroteUser)
-                {
+                if(!wroteUser) {
                     writeUserToLine(profile, playerName, uuid, writer);
                 }