diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Logger.java b/Arctic_Nigthmare/src/arctic_nightmare/Logger.java index 382348590b48e9ebefad516fbb353931cbe5039a..cc3216676f964858c392c6e15be41f52098e8b31 100644 --- a/Arctic_Nigthmare/src/arctic_nightmare/Logger.java +++ b/Arctic_Nigthmare/src/arctic_nightmare/Logger.java @@ -5,18 +5,7 @@ import java.io.InputStreamReader; import java.util.Scanner; final public class Logger { - private static final String RESET = ""; - private static final String BLACK = "\u001B[30m"; - private static final String RED = "\u001B[31m"; - private static final String GREEN = "\u001B[32m"; - private static final String YELLOW = "\u001B[33m"; - private static final String BLUE = "\u001B[34m"; - private static final String PURPLE = "\u001B[35m"; - private static final String CYAN = "\u001B[36m"; - private static final String WHITE = "\u001B[37m"; private static int tabs; - - public enum colors {RESET, BLACK, RED, GREEN, YELLOW, BLUE, PURPLE, CYAN, WHITE}; private static BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); private static Scanner scanner = new Scanner(System.in); @@ -25,31 +14,7 @@ final public class Logger { tabs = 0; } - private static String getColorCode(colors color) - { - switch (color) - { - case RESET: - return RESET; - case BLACK: - return BLACK; - case RED: - return RED; - case GREEN: - return GREEN; - case CYAN: - return CYAN; - case YELLOW: - return YELLOW; - case BLUE: - return BLUE; - case PURPLE: - return PURPLE; - case WHITE: - return WHITE; - } - return RESET; - } + static int getNumericInput(int lowerConstraint, int upperConstraint) { int c = scanner.nextInt(); while(c < lowerConstraint || c > upperConstraint) { @@ -75,42 +40,26 @@ final public class Logger { if (1 > tabs) tabs =0; } - static void Log(String message, colors color) - { - if (tabs != 0) System.out.println(getColorCode(color) + String.format("%0" + tabs + "d", 0).replace("0", "\t") + message + RESET); - else System.out.println(getColorCode(color) + message + RESET); - } - - static void Log(String message) { - Log(message, colors.RESET); + if (tabs != 0) System.out.println(String.format("%0" + tabs + "d", 0).replace("0", "\t") + message); + else System.out.println(message); } static void Log(String message, boolean tabulated) { if(!tabulated)System.out.println(message); - else Log(message, colors.RESET); + else Log(message); } - static void LogAndIncreaseTabs(String message, colors color) + static void LogAndIncreaseTabs(String message) { - Log(message, color); + Log(message); increaseTabs(); } - static void LogAndIncreaseTabs(String message) - { - LogAndIncreaseTabs(message, colors.RESET); - } - - static void LogAndDecreaseTabs(String message, colors color) + static void LogAndDecreaseTabs(String message) { - Log(message, color); + Log(message); decreaseTabs(); } - - static void LogAndDecreaseTabs(String message) - { - LogAndDecreaseTabs(message, colors.RESET); - } }