From 843e0c5b74268efb71b2d76e2f46b3fd995ac399 Mon Sep 17 00:00:00 2001 From: OldSerpskiStalker Date: Sun, 29 Sep 2024 19:51:38 +0500 Subject: [PATCH] Make a single separate log under the debugger --- .../DynamicSpawnControl.java | 3 +-- .../technical/customlibrary/Log.java | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java index 6706ef1..7d061c9 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java @@ -12,7 +12,6 @@ import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; import org.imesense.dynamicspawncontrol.debug.CheckDebugger; -import org.imesense.dynamicspawncontrol.technical.configs.*; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnUpdateTimeWorld; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle; import org.imesense.dynamicspawncontrol.technical.initializer.RegisterCfgClasses; @@ -194,7 +193,7 @@ public synchronized void preInit(FMLPreInitializationEvent event) throws IOExcep globalDirectory = event.getModConfigurationDirectory(); // - Log.createLogFile(globalDirectory.getPath() + File.separator + STRUCT_FILES_DIRS.NAME_DIRECTORY); + Log.createLogFile(globalDirectory.getPath() + File.separator + STRUCT_FILES_DIRS.NAME_DIRECTORY, checkDebugger.IsRunDebugger); Log.writeDataToLogFile(1, "Debugger is running: " + (checkDebugger.IsRunDebugger ? "true" : "false")); // diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java index df7ade9..89936c3 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Log.java @@ -1,9 +1,8 @@ package org.imesense.dynamicspawncontrol.technical.customlibrary; import org.imesense.dynamicspawncontrol.DynamicSpawnControl; -import org.imesense.dynamicspawncontrol.technical.configs.ConfigLogFile; +import org.imesense.dynamicspawncontrol.technical.config.ConfigLogFile; -import javax.annotation.Nonnull; import java.io.*; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -36,7 +35,7 @@ public final class Log * * @param path */ - public static void createLogFile(final String path) + public static void createLogFile(final String path, boolean isDebugMode) { try { @@ -55,16 +54,22 @@ public static void createLogFile(final String path) } } - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); - String currentDate = dateFormat.format(new Date()); - - String fileName = logsDirectory + "/log_" + currentDate + DynamicSpawnControl.STRUCT_FILES_EXTENSION.LOG_FILE_EXTENSION; - logFile = new File(fileName); + if (isDebugMode) + { + logFile = new File(logsDirectory, "log_debug.txt"); + } + else + { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); + String currentDate = dateFormat.format(new Date()); + String fileName = logsDirectory + "/log_" + currentDate + DynamicSpawnControl.STRUCT_FILES_EXTENSION.LOG_FILE_EXTENSION; + logFile = new File(fileName); + } - FileWriter writer = new FileWriter(logFile); + FileWriter writer = new FileWriter(logFile, !isDebugMode); writer.write("*********************************************************************"); - writer.write("\n** Log file created: " + currentDate); + writer.write("\n** Log file created: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); writer.write("\n** DynamicsSpawnControl. Authors: OldSerpskiStalker, acidicMercury8"); writer.write("\n*******************************************************************");