From 23499e768210aaf5d3759cf518f93e75b31b1bc7 Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Sat, 4 Mar 2023 23:41:05 -0500 Subject: [PATCH] Add verbose check to locale extractor --- .../configurations/PluginSettings.java | 2 +- .../us/crazycrew/crazyauctions/utils/FileUtils.java | 13 ++++++------- .../crazyauctions/loader/AuctionsStarter.java | 13 ++++++++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/us/crazycrew/crazyauctions/configurations/PluginSettings.java b/api/src/main/java/us/crazycrew/crazyauctions/configurations/PluginSettings.java index ca40497..670bf83 100644 --- a/api/src/main/java/us/crazycrew/crazyauctions/configurations/PluginSettings.java +++ b/api/src/main/java/us/crazycrew/crazyauctions/configurations/PluginSettings.java @@ -58,7 +58,7 @@ public class PluginSettings implements SettingsHolder { "Submit your finalized config using https://bin.bloom.host/ and send it to us in https://discord.gg/crazycrew", "" }) - public static final Property LOCALE_FILE = newProperty("settings.locale-file", "en-US"); + public static final Property LOCALE_FILE = newProperty("settings.locale-file", "en-US.yml"); @Comment("Whether you want to have verbose logging enabled or not.") public static final Property VERBOSE_LOGGING = newProperty("settings.verbose-logging", true); diff --git a/api/src/main/java/us/crazycrew/crazyauctions/utils/FileUtils.java b/api/src/main/java/us/crazycrew/crazyauctions/utils/FileUtils.java index 5364381..815d25c 100644 --- a/api/src/main/java/us/crazycrew/crazyauctions/utils/FileUtils.java +++ b/api/src/main/java/us/crazycrew/crazyauctions/utils/FileUtils.java @@ -22,18 +22,17 @@ public class FileUtils { * @param output the output wherever you use this. * @param replace if we should replace or not. */ - public static void extract(String input, Path output, boolean replace) { + public static void extract(String input, Path output, boolean replace, boolean verbose) { URL directory = FileUtils.class.getResource(input); - if (directory == null) CrazyLogger.debug("<#E0115F>Could not find <#11e092>" + input + " <#E0115F>in the jar."); + if (directory == null) if (verbose) CrazyLogger.debug("<#E0115F>Could not find <#11e092>" + input + " <#E0115F>in the jar."); assert directory != null; - if (!directory.getProtocol().equals("jar")) - CrazyLogger.debug("<#E0115F>Failed because the protocol does not equal .jar!"); + if (!directory.getProtocol().equals("jar")) if (verbose) CrazyLogger.debug("Failed because the protocol does not equal .jar!"); ZipFile jar; try { - CrazyLogger.debug("<#E0115F>Starting to extract files from <#11e092>" + input + " <#E0115F>directory in the jar."); + if (verbose) CrazyLogger.debug("<#E0115F>Starting to extract files from <#11e092>" + input + " <#E0115F>directory in the jar."); jar = ((JarURLConnection) directory.openConnection()).getJarFile(); } catch (Exception e) { @@ -56,7 +55,7 @@ public class FileUtils { if (entry.isDirectory()) { if (exists) { - CrazyLogger.debug("<#E0115F>File already exists."); + if (verbose) CrazyLogger.debug("<#E0115F>File already exists."); return; } @@ -64,7 +63,7 @@ public class FileUtils { try { Files.createDirectories(outFile); - CrazyLogger.debug("<#E0115F>Directories have been created."); + if (verbose) CrazyLogger.debug("<#E0115F>Directories have been created."); } catch (Exception e) { e.printStackTrace(); } diff --git a/platforms/paper/src/main/java/us/crazycrew/crazyauctions/loader/AuctionsStarter.java b/platforms/paper/src/main/java/us/crazycrew/crazyauctions/loader/AuctionsStarter.java index 8e69564..786eb07 100644 --- a/platforms/paper/src/main/java/us/crazycrew/crazyauctions/loader/AuctionsStarter.java +++ b/platforms/paper/src/main/java/us/crazycrew/crazyauctions/loader/AuctionsStarter.java @@ -11,6 +11,7 @@ import us.crazycrew.crazyauctions.configurations.ConfigSettings; import us.crazycrew.crazyauctions.configurations.LocaleSettings; import us.crazycrew.crazyauctions.configurations.PluginSettings; import us.crazycrew.crazyauctions.configurations.migrations.PluginMigrationService; +import us.crazycrew.crazyauctions.utils.FileUtils; import us.crazycrew.crazycore.CrazyLogger; import us.crazycrew.crazycore.paper.PaperConsole; import us.crazycrew.crazycore.paper.PaperCore; @@ -50,11 +51,6 @@ public class AuctionsStarter implements PluginBootstrap { .withYamlFile(new File(context.getDataDirectory().toFile(), "config.yml")) .configurationData(ConfigSettings.class) .create(); - - locale = SettingsManagerBuilder - .withYamlFile(new File(context.getDataDirectory().toFile() + "/locale/", pluginConfig.getProperty(PluginSettings.LOCALE_FILE))) - .configurationData(LocaleSettings.class) - .create(); } @Override @@ -74,6 +70,13 @@ public class AuctionsStarter implements PluginBootstrap { // Add the logger manager. LogManager.getLogManager().addLogger(CrazyLogger.getLogger()); + FileUtils.extract("/locale", context.getDataDirectory(), false, getPluginConfig().getProperty(PluginSettings.VERBOSE_LOGGING)); + + locale = SettingsManagerBuilder + .withYamlFile(new File(context.getDataDirectory().toFile() + "/locale/", pluginConfig.getProperty(PluginSettings.LOCALE_FILE))) + .configurationData(LocaleSettings.class) + .create(); + return new CrazyAuctions(this.paperCore); }