Remove dirty printStackTrace hacks
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
parent
669eef92eb
commit
70fa92f22c
1
libraries/launcher/.gitignore
vendored
1
libraries/launcher/.gitignore
vendored
@ -4,3 +4,4 @@ out
|
||||
.classpath
|
||||
.idea
|
||||
.project
|
||||
bin/
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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));
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user