mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-19 14:59:29 +00:00
67 lines
3.0 KiB
Diff
67 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Sat, 4 Feb 2023 10:58:12 +0100
|
|
Subject: [PATCH] Include time in startup logs
|
|
|
|
Removed since 1.21
|
|
|
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..f4106b117c2b82a25616b590e7b0853f05864ea1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit;
|
|
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
+import java.text.DateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.Arrays;
|
|
import java.util.Calendar;
|
|
@@ -25,6 +26,26 @@ public class Main {
|
|
}
|
|
// Paper end - Reset loggers after shutdown
|
|
|
|
+ // Gale start - include time in startup logs
|
|
+ private static final DateFormat startupDateFormat = new SimpleDateFormat("HH:mm:ss");
|
|
+
|
|
+ private static void printlnStartupToSystemOut(String type, String line) {
|
|
+ System.out.println("[" + startupDateFormat.format(new Date()) + " " + type + "]: " + line);
|
|
+ }
|
|
+
|
|
+ public static void printlnStartupInfoToSystemOut(String line) {
|
|
+ printlnStartupToSystemOut("INFO", line);
|
|
+ }
|
|
+
|
|
+ public static void printlnStartupWarningToSystemOut(String line) {
|
|
+ printlnStartupToSystemOut("WARN", line);
|
|
+ }
|
|
+
|
|
+ public static void printlnStartupErrorToSystemOut(String line) {
|
|
+ printlnStartupToSystemOut("ERROR", line);
|
|
+ }
|
|
+ // Gale end - include time in startup logs
|
|
+
|
|
public static void main(String[] args) {
|
|
// Paper start
|
|
final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
|
|
@@ -288,13 +309,13 @@ public class Main {
|
|
String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
|
|
String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
|
|
|
|
- System.out.println("System Info: " + javaInfo + " " + osInfo);
|
|
+ printlnStartupInfoToSystemOut("System Info: " + javaInfo + " " + osInfo); // Gale - include time in startup logs
|
|
} else {
|
|
- System.out.println("Unable to read system info");
|
|
+ printlnStartupInfoToSystemOut("Unable to read system info"); // Gale - include time in startup logs
|
|
}
|
|
// Paper end - Log Java and OS versioning to help with debugging plugin issues
|
|
|
|
- System.out.println("Loading libraries, please wait...");
|
|
+ printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
|
|
net.minecraft.server.Main.main(options);
|
|
} catch (Throwable t) {
|
|
t.printStackTrace();
|