Fix some uses of System.out/err.println()

Author: PseudoKnight

src/main/java/com/laytonsmith/PureUtilities/Common/StreamUtils.java

@@ -9,6 +9,7 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Streams are hard sometimes. This class abstracts most of the functionality that is commonly used.
@@ -145,11 +146,7 @@ public static InputStream GetInputStream(byte[] bytes) {
 	 * @return A new PrintStream object, based on System.out
 	 */
 	public static PrintStream GetSystemOut() {
-		try {
-			return new PrintStream(System.out, true, "UTF-8");
-		} catch(UnsupportedEncodingException ex) {
-			throw new Error(ex);
-		}
+		return new PrintStream(System.out, true, StandardCharsets.UTF_8);
 	}
 
 	/**
@@ -159,11 +156,7 @@ public static PrintStream GetSystemOut() {
 	 * @return A new PrintStream object, based on System.err
 	 */
 	public static PrintStream GetSystemErr() {
-		try {
-			return new PrintStream(System.err, true, "UTF-8");
-		} catch(UnsupportedEncodingException ex) {
-			throw new Error(ex);
-		}
+		return new PrintStream(System.err, true, StandardCharsets.UTF_8);
 	}
 
 	/**

src/main/java/com/laytonsmith/abstraction/StaticLayer.java

@@ -41,7 +41,7 @@ private static synchronized void InitConvertor() {
 				try {
 					if(convertor != null) {
 						//Uh... There are more than one implementations for this server type
-						System.out.println("More than one Convertor for this server type was detected!");
+						StreamUtils.GetSystemErr().println("More than one Convertor for this server type was detected!");
 					}
 					convertor = (Convertor) c.newInstance();
 					//At this point we are all set

src/main/java/com/laytonsmith/core/MSLog.java

@@ -189,11 +189,11 @@ public static void initialize(File root) {
 				if(o instanceof Tag) {
 					tags.add((Tag) o);
 				} else {
-					System.err.println("Element tagged with LogTag, but is not an instance of Tag: "
+					StreamUtils.GetSystemErr().println("Element tagged with LogTag, but is not an instance of Tag: "
 						+ f.getDeclaringClass() + "." + f.getName());
 				}
 			} catch (IllegalArgumentException | IllegalAccessException ex) {
-				System.err.println("Could not properly configure logger tag: " + ex.getMessage());
+				StreamUtils.GetSystemErr().println("Could not properly configure logger tag: " + ex.getMessage());
 			}
 		}
 		for(Tag t : tags) {
@@ -220,7 +220,7 @@ private static LogLevel GetLevel(Tag tag) {
 					+ ". Tags must be registered with the @LogTag annotation, otherwise they"
 					+ " are not configurable by the user!";
 			// Log this everywhere, since this is a problem for the developer.
-			System.err.println(message);
+			StreamUtils.GetSystemErr().println(message);
 			GetLogger().e(Tags.GENERAL, message, Target.UNKNOWN);
 		}
 		if(LOOKUP.containsKey(tag)) {

src/main/java/com/laytonsmith/core/Script.java

@@ -548,7 +548,7 @@ public Mixed eval(ParseTree c, final Environment env) throws CancelCommandExcept
 						+ TermColors.CYAN + brand + TermColors.RED + " version: " + TermColors.RESET + version + TermColors.RED + ";\n"
 						+ "Loaded extensions and versions:\n" + extensionData
 						+ "Here's the stacktrace:\n" + TermColors.RESET + Static.GetStacktraceString(e);
-				System.err.println(emsg);
+				StreamUtils.GetSystemErr().println(emsg);
 				throw new CancelCommandException(null, Target.UNKNOWN);
 			}
 		} finally {

src/main/java/com/laytonsmith/core/functions/Cmdline.java

@@ -99,12 +99,13 @@ public Boolean runAsync() {
 		@Override
 		public CVoid exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
 			String msg = Static.MCToANSIColors(args[0].val());
-			StreamUtils.GetSystemOut().print(msg);
+			PrintStream out = StreamUtils.GetSystemOut();
+			out.print(msg);
 			if(msg.contains("\033")) {
 				//We have color codes in it, we need to reset them
-				StreamUtils.GetSystemOut().print(TermColors.reset());
+				out.print(TermColors.reset());
 			}
-			StreamUtils.GetSystemOut().println();
+			out.println();
 			return CVoid.VOID;
 		}
 

src/main/java/com/laytonsmith/core/functions/Sandbox.java

@@ -1,5 +1,7 @@
 package com.laytonsmith.core.functions;
 
+import com.laytonsmith.PureUtilities.Common.StreamUtils;
+import com.laytonsmith.abstraction.enums.MCChatColor;
 import com.laytonsmith.core.FileWriteMode;
 import com.laytonsmith.PureUtilities.Common.StringUtils;
 import com.laytonsmith.PureUtilities.TermColors;
@@ -45,6 +47,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
@@ -334,10 +337,9 @@ public static class norway extends DummyFunction {
 
 		@Override
 		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
-			Function color = new Echoes.color();
-			String red = color.exec(t, environment, args.length == 3 ? args[0] : new CString("RED", t)).val();
-			String white = color.exec(t, environment, args.length == 3 ? args[1] : new CString("WHITE", t)).val();
-			String blue = color.exec(t, environment, args.length == 3 ? args[2] : new CString("BLUE", t)).val();
+			MCChatColor red = MCChatColor.RED;
+			MCChatColor white = MCChatColor.WHITE;
+			MCChatColor blue = MCChatColor.BLUE;
 			int multiplier = 2;
 			char c = '=';
 			String one = multiply(c, 1 * multiplier);
@@ -347,16 +349,18 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 			String twelve = multiply(c, 12 * multiplier);
 			String thirteen = multiply(c, 13 * multiplier);
 			String twentytwo = multiply(c, 22 * multiplier);
+			PrintStream out = StreamUtils.GetSystemOut();
+			String vertical = Static.MCToANSIColors(red + six + white + one + blue + two + white + one + red + twelve);
 			for(int i = 0; i < 6; ++i) {
-				System.out.println(Static.MCToANSIColors(red + six + white + one + blue + two + white + one + red + twelve) + TermColors.RESET);
+				out.println(vertical + TermColors.RESET);
 			}
-			System.out.println(Static.MCToANSIColors(white + seven + blue + two + white + thirteen) + TermColors.RESET);
+			out.println(Static.MCToANSIColors(white + seven + blue + two + white + thirteen) + TermColors.RESET);
 			for(int i = 0; i < 2; ++i) {
-				System.out.println(Static.MCToANSIColors(blue + twentytwo) + TermColors.RESET);
+				out.println(Static.MCToANSIColors(blue + twentytwo) + TermColors.RESET);
 			}
-			System.out.println(Static.MCToANSIColors(white + seven + blue + two + white + thirteen) + TermColors.RESET);
+			out.println(Static.MCToANSIColors(white + seven + blue + two + white + thirteen) + TermColors.RESET);
 			for(int i = 0; i < 6; ++i) {
-				System.out.println(Static.MCToANSIColors(red + six + white + one + blue + two + white + one + red + twelve) + TermColors.RESET);
+				out.println(vertical + TermColors.RESET);
 			}
 
 			return CVoid.VOID;