From 70fa92f22ca8d013e7e101645d4ef60a21a52223 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sat, 19 Nov 2022 13:58:35 +0000
Subject: [PATCH] Remove dirty printStackTrace hacks

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 libraries/launcher/.gitignore                 |  1 +
 .../org/prismlauncher/utils/logging/Log.java  | 10 +-
 .../utils/logging/LogPrintStream.java         | 99 -------------------
 3 files changed, 5 insertions(+), 105 deletions(-)
 delete mode 100644 libraries/launcher/org/prismlauncher/utils/logging/LogPrintStream.java

diff --git a/libraries/launcher/.gitignore b/libraries/launcher/.gitignore
index cc1c52bf..dda456e3 100644
--- a/libraries/launcher/.gitignore
+++ b/libraries/launcher/.gitignore
@@ -4,3 +4,4 @@ out
 .classpath
 .idea
 .project
+bin/
diff --git a/libraries/launcher/org/prismlauncher/utils/logging/Log.java b/libraries/launcher/org/prismlauncher/utils/logging/Log.java
index 374a8107..e3aa538b 100644
--- a/libraries/launcher/org/prismlauncher/utils/logging/Log.java
+++ b/libraries/launcher/org/prismlauncher/utils/logging/Log.java
@@ -44,10 +44,8 @@ import java.io.PrintStream;
  */
 public final class Log {
 
-    // original before overridden
-    private static final PrintStream OUT = new PrintStream(System.out), ERR = new PrintStream(System.err);
-    private static final PrintStream ERROR_PREFIX = new LogPrintStream(System.err, Level.ERROR),
-            FATAL_PREFIX = new LogPrintStream(System.err, Level.FATAL);
+    // original before possibly overridden by MC
+	private static final PrintStream OUT = new PrintStream(System.out), ERR = new PrintStream(System.err);
     private static final boolean DEBUG = Boolean.getBoolean("org.prismlauncher.debug");
 
     public static void launcher(String message) {
@@ -68,7 +66,7 @@ public final class Log {
 
     public static void error(String message, Throwable e) {
         error(message);
-        e.printStackTrace(ERROR_PREFIX);
+        e.printStackTrace(ERR);
     }
 
     public static void fatal(String message) {
@@ -77,7 +75,7 @@ public final class Log {
 
     public static void fatal(String message, Throwable e) {
         fatal(message);
-        e.printStackTrace(FATAL_PREFIX);
+        e.printStackTrace(ERR);
     }
 
     /**
diff --git a/libraries/launcher/org/prismlauncher/utils/logging/LogPrintStream.java b/libraries/launcher/org/prismlauncher/utils/logging/LogPrintStream.java
deleted file mode 100644
index 8a182817..00000000
--- a/libraries/launcher/org/prismlauncher/utils/logging/LogPrintStream.java
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  Linking this library statically or dynamically with other modules is
- *  making a combined work based on this library. Thus, the terms and
- *  conditions of the GNU General Public License cover the whole
- *  combination.
- *
- *  As a special exception, the copyright holders of this library give
- *  you permission to link this library with independent modules to
- *  produce an executable, regardless of the license terms of these
- *  independent modules, and to copy and distribute the resulting
- *  executable under terms of your choice, provided that you also meet,
- *  for each linked independent module, the terms and conditions of the
- *  license of that module. An independent module is a module which is
- *  not derived from or based on this library. If you modify this
- *  library, you may extend this exception to your version of the
- *  library, but you are not obliged to do so. If you do not wish to do
- *  so, delete this exception statement from your version.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.prismlauncher.utils.logging;
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-/**
- * Used to create a print stream that redirects to Log.
- */
-final class LogPrintStream extends PrintStream {
-
-    private final Level level;
-
-    public LogPrintStream(OutputStream out, Level level) {
-        super(out);
-
-        this.level = level;
-    }
-
-    @Override
-    public void println(String x) {
-        Log.log(x, level);
-    }
-
-    @Override
-    public void println(Object x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(boolean x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(char x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(int x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(long x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(float x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(double x) {
-        println(String.valueOf(x));
-    }
-
-    @Override
-    public void println(char[] x) {
-        println(String.valueOf(x));
-    }
-
-}
\ No newline at end of file