From 39d10855d8b03690ab960d96a7d105118e72a444 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 13 May 2019 08:21:24 -0700 Subject: [PATCH] Temporarily add them back in :juice: --- .../java/com/gmail/nossr50/config/Config.java | 12 ++-- .../gmail/nossr50/config/ConfigConstants.java | 60 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index f3ec72299..9226d1437 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -276,9 +276,9 @@ public abstract class Config implements VersionedConfig { * * @return the path to the defaults directory */ - private String getDefaultConfigCopyRelativePath() { - return getDefaultConfigFile().getPath(); - } +// private String getDefaultConfigCopyRelativePath() { +// return getDefaultConfigFile().getPath(); +// } /** * Grabs the File representation of the default config, which is stored on disk in a defaults folder @@ -286,9 +286,9 @@ public abstract class Config implements VersionedConfig { * * @return the copy of the default config file, stored in the defaults directory */ - private File getDefaultConfigFile() { - return new File(ConfigConstants.getDefaultsFolder(), FILE_RELATIVE_PATH); - } +// private File getDefaultConfigFile() { +// return new File(ConfigConstants.getDefaultsFolder(), FILE_RELATIVE_PATH); +// } /** * Creates the defaults directory diff --git a/src/main/java/com/gmail/nossr50/config/ConfigConstants.java b/src/main/java/com/gmail/nossr50/config/ConfigConstants.java index 9a1ac478b..fb691d06e 100644 --- a/src/main/java/com/gmail/nossr50/config/ConfigConstants.java +++ b/src/main/java/com/gmail/nossr50/config/ConfigConstants.java @@ -15,12 +15,12 @@ public class ConfigConstants { /* FOLDER NAMES */ public static final String FOLDER_NAME_CONFIG = "config"; public static final String FOLDER_NAME_SKILLS = "skills"; -// public static final String FOLDER_NAME_EXPERIENCE = "Experience Settings"; + public static final String FOLDER_NAME_EXPERIENCE = "Experience Settings"; public static final String FOLDER_NAME_DEFAULTS = "defaults"; /* RELATIVE PATHS */ public final static String RELATIVE_PATH_CONFIG_DIR = File.separator + FOLDER_NAME_CONFIG + File.separator; public final static String RELATIVE_PATH_SKILLS_DIR = RELATIVE_PATH_CONFIG_DIR + FOLDER_NAME_SKILLS + File.separator; -// public final static String RELATIVE_PATH_XP_DIR = RELATIVE_PATH_CONFIG_DIR + FOLDER_NAME_EXPERIENCE + File.separator; + public final static String RELATIVE_PATH_XP_DIR = RELATIVE_PATH_CONFIG_DIR + FOLDER_NAME_EXPERIENCE + File.separator; private final static String[] EXAMPLE_BLACKLIST_WORLDS = {"Example_15434453", "Example_2324423", "Example_323423465"}; //Add the worlds to the list @@ -44,29 +44,29 @@ public class ConfigConstants { return new File(getDataFolder(), FOLDER_NAME_CONFIG); } -// public static File getDefaultsFolder() { -// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_DEFAULTS); -// } + public static File getDefaultsFolder() { + return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_DEFAULTS); + } -// public static File getDefaultsConfigFolder() { -// return new File(getDefaultsFolder().getAbsolutePath(), FOLDER_NAME_CONFIG); -// } -// -// public static File getDefaultsSkillFolder() { -// return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS); -// } + public static File getDefaultsConfigFolder() { + return new File(getDefaultsFolder().getAbsolutePath(), FOLDER_NAME_CONFIG); + } -// public static File getDefaultsXPFolder() { -// return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE); -// } + public static File getDefaultsSkillFolder() { + return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS); + } + + public static File getDefaultsXPFolder() { + return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE); + } public static File getConfigSkillFolder() { return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS); } -// public static File getConfigXPFolder() { -// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE); -// } + public static File getConfigXPFolder() { + return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE); + } /** * Creates all directories used by mcMMO config files @@ -79,24 +79,24 @@ public class ConfigConstants { /* DEFAULT DIRECTORIES */ -// if (!getDefaultsFolder().exists()) -// getDefaultsFolder().mkdirs(); -// -// if (!getDefaultsConfigFolder().exists()) -// getDefaultsConfigFolder().mkdirs(); -// -// if (!getDefaultsSkillFolder().exists()) -// getDefaultsSkillFolder().mkdirs(); + if (!getDefaultsFolder().exists()) + getDefaultsFolder().mkdirs(); -// if (!getDefaultsXPFolder().exists()) -// getDefaultsXPFolder().mkdirs(); + if (!getDefaultsConfigFolder().exists()) + getDefaultsConfigFolder().mkdirs(); + + if (!getDefaultsSkillFolder().exists()) + getDefaultsSkillFolder().mkdirs(); + + if (!getDefaultsXPFolder().exists()) + getDefaultsXPFolder().mkdirs(); /* CONFIG SUBDIRECTORIES */ if (!getConfigSkillFolder().exists()) getConfigSkillFolder().mkdirs(); -// if (!getConfigXPFolder().exists()) -// getConfigXPFolder().mkdirs(); + if (!getConfigXPFolder().exists()) + getConfigXPFolder().mkdirs(); } }