From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Sat, 4 Feb 2023 10:58:12 +0100 Subject: [PATCH] Include time in startup logs 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 bfa091f72d6f477bcaf63d364639a1b4df9b1987..a075eaa65541ffcf4affa07e60c163fe7a0b9b4b 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; @@ -24,6 +25,26 @@ public class Main { } // Paper end + // 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"); @@ -306,13 +327,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 System.setProperty( "library.jansi.version", "Paper" ); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows - 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();