CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A lot more cleanup

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2022-11-08 17:51:18 +00:00
parent f2ca9a6b31
commit 32c2ad2bbd
20 changed files with 417 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/launcher/org/prismlauncher/utils/logging/Level.java
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
*
* This program is free software: you can redistribute it and/or modify
@ -36,8 +36,13 @@
package org.prismlauncher.utils.logging;
public enum Level {
LAUNCHER("Launcher"), DEBUG("Debug"), INFO("Info"), MESSAGE("Message"),
WARNING("Warning"), ERROR("Error", true), FATAL("Fatal", true);
LAUNCHER("Launcher"),
DEBUG("Debug"),
INFO("Info"),
MESSAGE("Message"),
WARNING("Warning"),
ERROR("Error", true),
FATAL("Fatal", true);
String name;
boolean stderr;

52
libraries/launcher/org/prismlauncher/utils/logging/Log.java
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
*
* This program is free software: you can redistribute it and/or modify
@ -44,37 +44,12 @@ import java.io.PrintStream;
*/
public final class Log {
private static final PrintStream ERROR_PREFIX = new PrintStream(System.err) {
@Override
public void println(String x) {
error(x);
}
@Override
public void println(Object x) {
error(String.valueOf(x));
}
}, FATAL_PREFIX = new PrintStream(System.err) {
@Override
public void println(String x) {
fatal(x);
}
@Override
public void println(Object x) {
fatal(String.valueOf(x));
}
};
// 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);
private static final boolean DEBUG = Boolean.getBoolean("org.prismlauncher.debug");
private Log() {
}
public static void blankLine() {
System.out.println();
}
public static void launcher(String message) {
log(message, Level.LAUNCHER);
}
@ -84,16 +59,9 @@ public final class Log {
}
public static void debug(String message) {
if (!DEBUG)
return;
log(message, Level.DEBUG);
}
public static void info(String message) {
log(message, Level.INFO);
}
public static void warning(String message) {
log(message, Level.WARNING);
}
@ -113,12 +81,16 @@ public final class Log {
}
/**
* Logs a message with the prefix !![LEVEL]!.
* Logs a message with the prefix <code>!![LEVEL]!</code>. This is picked up by
* the log viewer to give it nice colours.
*
* @param message The message
* @param level The level
*/
public static void log(String message, Level level) {
if (!DEBUG && level == Level.DEBUG)
return;
String prefix = "!![" + level.name + "]!";
// prefix first line
message = prefix + message;
@ -126,9 +98,9 @@ public final class Log {
message = message.replace("\n", "\n" + prefix);
if (level.stderr)
System.err.println(message);
ERR.println(message);
else
System.out.println(message);
OUT.println(message);
}
}

99
libraries/launcher/org/prismlauncher/utils/logging/LogPrintStream.java Normal file
View File

@ -0,0 +1,99 @@
// 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));
}
}