From f6c204fe7e35f56413aa14a3d5063717c0303eaa Mon Sep 17 00:00:00 2001 From: OldSerpskiStalker Date: Tue, 17 Sep 2024 22:49:21 +0500 Subject: [PATCH] Add constants structures in main class --- .../DynamicSpawnControl.java | 82 ++++++++++++++----- .../configs/SettingsGameDebugger.java | 4 +- .../technical/configs/SettingsLogFile.java | 4 +- .../technical/customlibrary/Log.java | 5 +- 4 files changed, 69 insertions(+), 26 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 e26b68d..74fc1ac 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 @@ -26,41 +26,79 @@ * Main class of modification */ @Mod( - modid = DynamicSpawnControl.MODID, - name = DynamicSpawnControl.NAME, - version = DynamicSpawnControl.VERSION + modid = DynamicSpawnControl.STRUCT_INFO_MOD.MOD_ID, + name = DynamicSpawnControl.STRUCT_INFO_MOD.NAME, + version = DynamicSpawnControl.STRUCT_INFO_MOD.VERSION ) public class DynamicSpawnControl { - /** - * Modification ID - */ - public static final String MODID = "dynamicspawncontrol"; - - /** - * Modification name - */ - public static final String NAME = "Dynamic Spawn Control"; - - /** - * Minecraft version - */ - public static final String VERSION = "1.12.2-14.23.5.2860"; - /** * */ - public static final String NAME_DIRECTORY = "DynamicsSpawnControl"; + public static final class STRUCT_INFO_MOD + { + /** + * Modification ID + */ + public static final String MOD_ID = "dynamicspawncontrol"; + + /** + * Modification name + */ + public static final String NAME = "Dynamic Spawn Control"; + + /** + * Minecraft version + */ + public static final String VERSION = "1.12.2-14.23.5.2860"; + } /** * */ - public static final String CONFIG_FILE_EXTENSION = ".cfg"; + public static final class STRUCT_FILES_DIRS + { + /** + * + */ + public static final String NAME_DIRECTORY = "DynamicsSpawnControl"; + + /** + * + */ + public static final String NAME_DIR_CONFIGS = "configs"; + + /** + * + */ + public static final String NAME_DIR_SCRIPTS = "scripts"; + + /** + * + */ + public static final String NAME_DIR_LOGS = "logs"; + } /** * */ - public static final String SCRIPT_FILE_EXTENSION = ".json"; + public static final class STRUCT_FILES_EXTENSION + { + /** + * + */ + public static final String CONFIG_FILE_EXTENSION = ".cfg"; + + /** + * + */ + public static final String SCRIPT_FILE_EXTENSION = ".json"; + + /** + * + */ + public static final String LOG_FILE_EXTENSION = ".txt"; + } /** * Main class instance @@ -121,7 +159,7 @@ public synchronized void preInit(FMLPreInitializationEvent event) globalDirectory = event.getModConfigurationDirectory(); // - Log.createLogFile(globalDirectory.getPath() + File.separator + NAME_DIRECTORY); + Log.createLogFile(globalDirectory.getPath() + File.separator + STRUCT_FILES_DIRS.NAME_DIRECTORY); Log.writeDataToLogFile(Log.TypeLog[0], "Check debugger -> " + checkDebugger.IsRunDebugger); // diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java index ba30c4e..f4d539d 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsGameDebugger.java @@ -88,7 +88,9 @@ public void init(FMLPreInitializationEvent event, final String nameClass) Log.writeDataToLogFile(Log.TypeLog[0], nameClass); ClientProxy.ConfigGameDebugger = new Configuration(new File(DynamicSpawnControl.getGlobalPathToConfigs().getPath() + - File.separator + DynamicSpawnControl.NAME_DIRECTORY + File.separator + "configs", "game_debugger" + DynamicSpawnControl.CONFIG_FILE_EXTENSION)); + File.separator + DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIRECTORY + + File.separator + DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIR_CONFIGS, + "game_debugger" + DynamicSpawnControl.STRUCT_FILES_EXTENSION.CONFIG_FILE_EXTENSION)); this.read(); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java index 625821e..b273a8a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/configs/SettingsLogFile.java @@ -37,7 +37,9 @@ public void init(FMLPreInitializationEvent event, final String nameClass) Log.writeDataToLogFile(Log.TypeLog[0], nameClass); ClientProxy.ConfigLogFile = new Configuration(new File(DynamicSpawnControl.getGlobalPathToConfigs().getPath() + - File.separator + DynamicSpawnControl.NAME_DIRECTORY + File.separator + "configs", "log" + DynamicSpawnControl.CONFIG_FILE_EXTENSION)); + File.separator + DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIRECTORY + File.separator + + DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIR_CONFIGS, + "log" + DynamicSpawnControl.STRUCT_FILES_EXTENSION.CONFIG_FILE_EXTENSION)); this.read(); } 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 e8265bd..cb5e802 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,5 +1,6 @@ package org.imesense.dynamicspawncontrol.technical.customlibrary; +import org.imesense.dynamicspawncontrol.DynamicSpawnControl; import org.imesense.dynamicspawncontrol.technical.configs.SettingsLogFile; import javax.annotation.Nonnull; @@ -39,7 +40,7 @@ public static void createLogFile(String path) { try { - File logsDirectory = new File(path, "logs"); + File logsDirectory = new File(path, DynamicSpawnControl.STRUCT_FILES_DIRS.NAME_DIR_LOGS); if (!logsDirectory.exists()) { @@ -57,7 +58,7 @@ public static void createLogFile(String path) SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); String currentDate = dateFormat.format(new Date()); - String fileName = logsDirectory + "/log_" + currentDate + ".txt"; + String fileName = logsDirectory + "/log_" + currentDate + DynamicSpawnControl.STRUCT_FILES_EXTENSION.LOG_FILE_EXTENSION; logFile = new File(fileName); FileWriter writer = new FileWriter(logFile);