EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Temporarily add them back in :juice:

Browse Source
This commit is contained in:
nossr50
2019-05-13 08:21:24 -07:00
parent aeb518f38c
commit 39d10855d8
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/config/Config.java
View File

@@ -276,9 +276,9 @@ public abstract class Config implements VersionedConfig {
* *
* @return the path to the defaults directory * @return the path to the defaults directory
*/ */
private String getDefaultConfigCopyRelativePath() { // private String getDefaultConfigCopyRelativePath() {
return getDefaultConfigFile().getPath(); // return getDefaultConfigFile().getPath();
} // }
/** /**
* Grabs the File representation of the default config, which is stored on disk in a defaults folder * 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 * @return the copy of the default config file, stored in the defaults directory
*/ */
private File getDefaultConfigFile() { // private File getDefaultConfigFile() {
return new File(ConfigConstants.getDefaultsFolder(), FILE_RELATIVE_PATH); // return new File(ConfigConstants.getDefaultsFolder(), FILE_RELATIVE_PATH);
} // }
/** /**
* Creates the defaults directory * Creates the defaults directory

60
src/main/java/com/gmail/nossr50/config/ConfigConstants.java
View File

@@ -15,12 +15,12 @@ public class ConfigConstants {
/* FOLDER NAMES */ /* FOLDER NAMES */
public static final String FOLDER_NAME_CONFIG = "config"; public static final String FOLDER_NAME_CONFIG = "config";
public static final String FOLDER_NAME_SKILLS = "skills"; 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"; public static final String FOLDER_NAME_DEFAULTS = "defaults";
/* RELATIVE PATHS */ /* RELATIVE PATHS */
public final static String RELATIVE_PATH_CONFIG_DIR = File.separator + FOLDER_NAME_CONFIG + File.separator; 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_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"}; private final static String[] EXAMPLE_BLACKLIST_WORLDS = {"Example_15434453", "Example_2324423", "Example_323423465"};
//Add the worlds to the list //Add the worlds to the list
@@ -44,29 +44,29 @@ public class ConfigConstants {
return new File(getDataFolder(), FOLDER_NAME_CONFIG); return new File(getDataFolder(), FOLDER_NAME_CONFIG);
} }
// public static File getDefaultsFolder() { public static File getDefaultsFolder() {
// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_DEFAULTS); return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_DEFAULTS);
// } }
// public static File getDefaultsConfigFolder() { public static File getDefaultsConfigFolder() {
// return new File(getDefaultsFolder().getAbsolutePath(), FOLDER_NAME_CONFIG); return new File(getDefaultsFolder().getAbsolutePath(), FOLDER_NAME_CONFIG);
// } }
//
// public static File getDefaultsSkillFolder() {
// return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
// }
// public static File getDefaultsXPFolder() { public static File getDefaultsSkillFolder() {
// return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE); return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
// } }
public static File getDefaultsXPFolder() {
return new File(getDefaultsConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE);
}
public static File getConfigSkillFolder() { public static File getConfigSkillFolder() {
return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS); return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_SKILLS);
} }
// public static File getConfigXPFolder() { public static File getConfigXPFolder() {
// return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE); return new File(getConfigFolder().getAbsolutePath(), FOLDER_NAME_EXPERIENCE);
// } }
/** /**
* Creates all directories used by mcMMO config files * Creates all directories used by mcMMO config files
@@ -79,24 +79,24 @@ public class ConfigConstants {
/* DEFAULT DIRECTORIES */ /* DEFAULT DIRECTORIES */
// if (!getDefaultsFolder().exists()) if (!getDefaultsFolder().exists())
// getDefaultsFolder().mkdirs(); getDefaultsFolder().mkdirs();
//
// if (!getDefaultsConfigFolder().exists())
// getDefaultsConfigFolder().mkdirs();
//
// if (!getDefaultsSkillFolder().exists())
// getDefaultsSkillFolder().mkdirs();
// if (!getDefaultsXPFolder().exists()) if (!getDefaultsConfigFolder().exists())
// getDefaultsXPFolder().mkdirs(); getDefaultsConfigFolder().mkdirs();
if (!getDefaultsSkillFolder().exists())
getDefaultsSkillFolder().mkdirs();
if (!getDefaultsXPFolder().exists())
getDefaultsXPFolder().mkdirs();
/* CONFIG SUBDIRECTORIES */ /* CONFIG SUBDIRECTORIES */
if (!getConfigSkillFolder().exists()) if (!getConfigSkillFolder().exists())
getConfigSkillFolder().mkdirs(); getConfigSkillFolder().mkdirs();
// if (!getConfigXPFolder().exists()) if (!getConfigXPFolder().exists())
// getConfigXPFolder().mkdirs(); getConfigXPFolder().mkdirs();
} }
} }