EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Attempts to properly comment migrated config values

Browse Source 
Note that for some reason, YamlConfiguration cannot load the output created by StargateYamlConfiguration causing a major crash
This commit is contained in:
Kristian Knarvik
2023-04-19 22:17:29 +02:00
parent 032a4df4d7
commit 24b62ec749
3 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/net/knarcraft/stargate/config/StargateConfig.java
View File

@@ -15,6 +15,7 @@ import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.messaging.Messenger;
import org.dynmap.DynmapAPI;
@@ -434,18 +435,25 @@ public final class StargateConfig {
/**
* Changes all configuration values from the old name to the new name
*
* @param newConfig <p>The config to read from and write to</p>
* @param currentConfiguration <p>The current config to back up</p>
*/
private void migrateConfig(FileConfiguration newConfig) {
private void migrateConfig(FileConfiguration currentConfiguration) {
//Save the old config just in case something goes wrong
try {
newConfig.save(dataFolderPath + "/config.yml.old");
currentConfiguration.save(new File(dataFolderPath, "config.yml.old"));
} catch (IOException e) {
Stargate.debug("Stargate::migrateConfig", "Unable to save old backup and do migration");
e.printStackTrace();
return;
}
//Load old and new configuration
Stargate.getInstance().reloadConfig();
FileConfiguration oldConfiguration = Stargate.getInstance().getConfig();
YamlConfiguration newConfiguration = StargateYamlConfiguration.loadConfiguration(
FileHelper.getBufferedReaderFromInputStream(
FileHelper.getInputStreamForInternalFile("/config.yml")));
//Read all available config migrations
Map<String, String> migrationFields;
try {
@@ -460,15 +468,30 @@ public final class StargateConfig {
//Replace old config names with the new ones
for (String key : migrationFields.keySet()) {
if (newConfig.contains(key)) {
if (oldConfiguration.contains(key)) {
String newPath = migrationFields.get(key);
Object oldValue = newConfig.get(key);
Object oldValue = oldConfiguration.get(key);
if (!newPath.trim().isEmpty()) {
newConfig.set(newPath, oldValue);
oldConfiguration.set(newPath, oldValue);
}
newConfig.set(key, null);
oldConfiguration.set(key, null);
}
}
// Copy all keys to the new config
for (String key : oldConfiguration.getKeys(true)) {
Stargate.logInfo("Setting " + key + " to " + oldConfiguration.get(key));
newConfiguration.set(key, oldConfiguration.get(key));
}
try {
newConfiguration.save(new File(dataFolderPath, "config.yml"));
} catch (IOException e) {
Stargate.debug("Stargate::migrateConfig", "Unable to save migrated config");
e.printStackTrace();
}
Stargate.getInstance().reloadConfig();
}
/**