mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-25 14:46:46 +01:00
don't always copy defaults
This commit is contained in:
parent
4bfa790be9
commit
b81ca84a99
@ -46,18 +46,19 @@ public abstract class Config implements VersionedConfig, Unload {
|
|||||||
private CommentedConfigurationNode defaultRootNode = null;
|
private CommentedConfigurationNode defaultRootNode = null;
|
||||||
|
|
||||||
/* CONFIG MANAGER */
|
/* CONFIG MANAGER */
|
||||||
private ConfigurationLoader<CommentedConfigurationNode> configManager;
|
//private ConfigurationLoader<CommentedConfigurationNode> configManager;
|
||||||
|
|
||||||
public Config(String pathToParentFolder, String relativePath, boolean mergeNewKeys) {
|
public Config(String pathToParentFolder, String relativePath, boolean mergeNewKeys, boolean copyDefaults) {
|
||||||
//TODO: Check if this works...
|
//TODO: Check if this works...
|
||||||
this(new File(pathToParentFolder), relativePath, mergeNewKeys);
|
this(new File(pathToParentFolder), relativePath, mergeNewKeys, copyDefaults);
|
||||||
System.out.println("mcMMO Debug: Don't forget to check if loading config file by string instead of File works...");
|
System.out.println("mcMMO Debug: Don't forget to check if loading config file by string instead of File works...");
|
||||||
}
|
}
|
||||||
|
|
||||||
public Config(File pathToParentFolder, String relativePath, boolean mergeNewKeys) {
|
public Config(File pathToParentFolder, String relativePath, boolean mergeNewKeys, boolean copyDefaults) {
|
||||||
/*
|
/*
|
||||||
* These must be at the top
|
* These must be at the top
|
||||||
*/
|
*/
|
||||||
|
this.copyDefaults = copyDefaults;
|
||||||
this.mergeNewKeys = mergeNewKeys; //Whether or not we add new keys when they are found
|
this.mergeNewKeys = mergeNewKeys; //Whether or not we add new keys when they are found
|
||||||
mkdirDefaults(); // Make our default config dir
|
mkdirDefaults(); // Make our default config dir
|
||||||
DIRECTORY_DATA_FOLDER = pathToParentFolder; //Data Folder for our plugin
|
DIRECTORY_DATA_FOLDER = pathToParentFolder; //Data Folder for our plugin
|
||||||
@ -157,7 +158,14 @@ public abstract class Config implements VersionedConfig, Unload {
|
|||||||
{
|
{
|
||||||
//If it's gone we copy default files
|
//If it's gone we copy default files
|
||||||
//Note that we don't copy the values from the default copy put in /defaults/ that file exists only as a reference to admins and is unreliable
|
//Note that we don't copy the values from the default copy put in /defaults/ that file exists only as a reference to admins and is unreliable
|
||||||
|
if(copyDefaults)
|
||||||
return copyDefaultFromJar(FILE_RELATIVE_PATH, false);
|
return copyDefaultFromJar(FILE_RELATIVE_PATH, false);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//Make a new empty file
|
||||||
|
userCopy.createNewFile();
|
||||||
|
return userCopy;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user