Merge pull request #50 from RedstoneFuture/Improvements/Logger

Improvements/logger

missilewars-plugin/src/main/java/de/butzlabben/missilewars/Logger.java

@@ -27,12 +27,12 @@ import org.bukkit.Bukkit;
 public enum Logger {
 
     BOOT("[MW] Boot | "),
-    SUCCESS("[MW] Success | "),
-    NORMAL("[MW] "),
-    DEBUG("[MW] Debug | "),
     BOOTDONE("[MW] Boot | "),
+    NORMAL("[MW] Info | "),
+    SUCCESS("[MW] Success | "),
     WARN("[MW] Warn | "),
-    ERROR("[MW] Error | ");
+    ERROR("[MW] Error | "),
+    DEBUG("[MW] Debug | ");
 
     private final String prefix;
 
@@ -41,11 +41,9 @@ public enum Logger {
     }
 
     public void log(String msg) {
-        if (this == DEBUG && !Config.debug()) {
-            return;
-        }
-        if (this == BOOTDONE)
-            msg = msg + " [§aDONE§r]";
+        if (this == DEBUG && !Config.debug()) return;
+
+        if (this == BOOTDONE) msg = msg + " [§aDONE§r]";
         Bukkit.getConsoleSender().sendMessage(prefix + msg);
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/SetupUtil.java

@@ -23,14 +23,10 @@ import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.game.Arenas;
 import de.butzlabben.missilewars.wrapper.abstracts.Arena;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.*;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -39,8 +35,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * @author Butzlabben
@@ -104,9 +98,9 @@ public class SetupUtil {
         for (Arena arena : Arenas.getArenas()) {
             File file = new File(MissileWars.getInstance().getDataFolder(), arena.getShieldConfiguration().getSchematic());
             if (!file.isFile()) {
-                Logger.BOOT.log("Copying default shield schematic");
-
                 String resource = "shield.schematic";
+
+                Logger.BOOT.log("Copying default shield schematic (" + resource + ")");
                 copyFile(resource, file.getPath());
 
             }
@@ -116,16 +110,15 @@ public class SetupUtil {
     public static void checkMap(String worldName) {
         File file = new File(Config.getArenaFolder() + "/" + worldName);
         if (!file.isDirectory()) {
+            String resource = "MissileWars-Arena.zip";
 
             Logger.WARN.log("There was no map found with the name \"" + worldName + "\"");
-            Logger.BOOT.log("Copying default map");
-
-            String resource = "MissileWars-Arena.zip";
+            Logger.BOOT.log("Copying default map (" + resource + ")");
 
             try {
                 copyZip(resource, file.getPath());
             } catch (IOException e) {
-                Logger.ERROR.log("Unable to copy new map");
+                Logger.ERROR.log("Unable to copy new map!");
                 e.printStackTrace();
             }
         }
@@ -133,13 +126,11 @@ public class SetupUtil {
 
     public static void checkMissiles() {
         File file = new File(MissileWars.getInstance().getDataFolder(), "missiles");
-
-        // check if the directory "/missiles" exists
         if (!file.isDirectory()) {
-            Logger.BOOT.log("Copying default missiles folder");
-
             String resource = "missiles.zip";
 
+            Logger.BOOT.log("Copying default missiles folder (" + resource + ")");
+
             try {
                 copyZip(resource, file.getPath());
             } catch (IOException e) {
@@ -209,7 +200,6 @@ public class SetupUtil {
      *
      * @param zipIn    the input stream
      * @param filePath
-     *
      * @throws IOException
      */
     private static void extractFile(ZipInputStream zipIn, String filePath) throws IOException {