Merge pull request #38 from Arctic-Gaming-LLC/pentlock1-patch-1

added load method onEnable

Author: pentlock1

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.pentlock</groupId>
     <artifactId>ThunderDataEngine</artifactId>
-    <version>0.2.10</version>
+    <version>0.2.11</version>
     <packaging>jar</packaging>
 
     <name>ThunderDataEngine</name>

src/main/java/net/pentlock/thunderdataengine/ThunderDataEngine.java

@@ -3,7 +3,9 @@
 import net.pentlock.thunderdataengine.listeners.PlayerLoginListener;
 import net.pentlock.thunderdataengine.listeners.PlayerLogoutListener;
 import net.pentlock.thunderdataengine.profiles.ThunderPlayer;
+import net.pentlock.thunderdataengine.utilities.FileNameCleaner;
 import net.pentlock.thunderdataengine.utilities.GuildUtil;
+import net.pentlock.thunderdataengine.utilities.HouseUtil;
 import net.pentlock.thunderdataengine.utilities.PlayerUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -13,7 +15,10 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
 
@@ -35,6 +40,7 @@ public void onEnable() {
         pm.registerEvents(new PlayerLogoutListener(), this);
 
         runnableSaveJson();
+        initiateFiles();
     }
 
     @Override
@@ -64,6 +70,15 @@ public void onDisable() {
                 e.printStackTrace();
             }
         }
+
+        Set<String> listHouseName = HouseUtil.HOUSES.keySet();
+        for (String houseName : listHouseName) {
+            try {
+                HouseUtil.saveHouse(houseName);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     public static ThunderDataEngine getPlugin() {
@@ -75,6 +90,24 @@ public void log(String log){
         plugin.getLogger().info(ChatColor.BLUE + log);
     }
 
+    public void initiateFiles() {
+        String[] fileNames = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData").list();
+        ThunderDataEngine.getPlugin().log("FileNames: " + Arrays.toString(fileNames));
+        if (fileNames != null) {
+            for (String fileName : fileNames) {
+                String cleaner = new FileNameCleaner().fileNameCleaner(fileName);
+                ThunderDataEngine.getPlugin().log("Clean name: " + cleaner);
+                try {
+                    HouseUtil.loadHouse(cleaner);
+                } catch (FileNotFoundException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+
+
     // Saves both player and guild to json every 5 mins
     public void runnableSaveJson() {
         new BukkitRunnable() {
@@ -97,6 +130,14 @@ public void run() {
                         e.printStackTrace();
                     }
                 }
+                Set<String> listHouseNames = HouseUtil.HOUSES.keySet();
+                for (String houseName : listHouseNames) {
+                    try {
+                        HouseUtil.saveHouse(houseName);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
             }
         }.runTaskTimerAsynchronously(this, 20, 6000);
     }

src/main/java/net/pentlock/thunderdataengine/listeners/PlayerLoginListener.java

@@ -48,10 +48,11 @@ public void onPlayerLoginEvent(PlayerLoginEvent event) {
         ThunderPlayer thunderPlayer = PlayerUtil.findPlayer(player.getUniqueId());
 
         // Clears a player's party on login - ensures that parties are not stored locally
-        assert thunderPlayer != null;
+
         thunderPlayer.setParty(player.getUniqueId());
         PlayerUtil.updatePlayer(thunderPlayer.getUUID(), thunderPlayer);
 
+
         // Checks to see if the player's guild exists by searching for its file
         File fileGuild = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/GuildData/" + thunderPlayer.getGuild() + ".json");
         if (fileGuild.exists()) {
@@ -64,5 +65,7 @@ public void onPlayerLoginEvent(PlayerLoginEvent event) {
                 }
             }
         }
+
+
     }
 }

src/main/java/net/pentlock/thunderdataengine/listeners/PlayerLogoutListener.java

@@ -22,11 +22,11 @@ public class PlayerLogoutListener implements Listener {
     public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
         UUID playerUUID = player.getUniqueId();
-        ThunderPlayer tcsPlayer = PlayerUtil.findPlayer(playerUUID);
-        assert tcsPlayer != null;
+        ThunderPlayer thunderPlayer = PlayerUtil.findPlayer(playerUUID);
+        assert thunderPlayer != null;
 
         //Updates the list of online Guild Members - important for Chat System
-        Guild guild = GuildUtil.findGuild(tcsPlayer.getGuild());
+        Guild guild = GuildUtil.findGuild(thunderPlayer.getGuild());
         boolean onlineGuildMember = false;
         if (guild != null) {
             for (Player playerTarget : Bukkit.getOnlinePlayers()) {
@@ -43,12 +43,12 @@ public void onPlayerQuit(PlayerQuitEvent event) {
 
             }
             if (!onlineGuildMember) {
-                GuildUtil.unLoadGuild(tcsPlayer.getGuild());
+                GuildUtil.unLoadGuild(thunderPlayer.getGuild());
             }
         }
 
         //Updates Player Party information
-        Party party = PartyUtil.findParty(tcsPlayer.getParty());
+        Party party = PartyUtil.findParty(thunderPlayer.getParty());
         if (party != null) {
             UUID[] members = party.getMembers();
             if (party.getLeader().toString().equalsIgnoreCase(player.getUniqueId().toString())) {
@@ -76,14 +76,14 @@ public void onPlayerQuit(PlayerQuitEvent event) {
                         if (!member.toString().equalsIgnoreCase(playerUUID.toString())) {
                             runMemberRemoval(party, player);
                             party.setLeader(member);
-                            tcsPlayer.setParty(playerUUID);
+                            thunderPlayer.setParty(playerUUID);
                             break;
                         }
                     }
                 }
             } else {
                 runMemberRemoval(party, player);
-                tcsPlayer.setParty(playerUUID);
+                thunderPlayer.setParty(playerUUID);
 
             }
         }

src/main/java/net/pentlock/thunderdataengine/utilities/FileNameCleaner.java

@@ -0,0 +1,25 @@
+package net.pentlock.thunderdataengine.utilities;
+
+public class FileNameCleaner {
+
+    private int middlePoint;
+
+
+    public FileNameCleaner() {
+    }
+
+    public String fileNameCleaner(String name) {
+
+            if (name.contains(".")) {
+                int size = name.length();
+                for (int i = 0; i < size; ) {
+                    if (String.valueOf(name.charAt(i)).equalsIgnoreCase(".")) {
+                        this.middlePoint = i;
+                    }
+                    i++;
+                }
+                return name.substring(0, middlePoint);
+            }
+            return name;
+    }
+}