From 114e4f5fb667dc973c653b257ace31bfd824010f Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 15 Dec 2018 17:06:04 +0200 Subject: [PATCH] Fixed config updater leaving behind old settings Changed order of the options that were being left behind in the first update --- .../settings/changes/ConfigUpdater.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/changes/ConfigUpdater.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/changes/ConfigUpdater.java index cf9e92337..2f0c412b8 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/changes/ConfigUpdater.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/changes/ConfigUpdater.java @@ -61,16 +61,16 @@ public class ConfigUpdater { new ConfigChange.Removed("Plugin.Bungee-Override"), new ConfigChange.Moved("Database.MySQL.LaunchOptions", "Database.MySQL.Launch_options"), + new ConfigChange.Moved("WebServer.InternalIP", "WebServer.Internal_IP"), + new ConfigChange.Moved("WebServer.Security.SSL-Certificate.KeyStorePath", "WebServer.Security.SSL-Certificate.KeyStore_path"), + new ConfigChange.Moved("WebServer.Security.SSL-Certificate.KeyPass", "WebServer.Security.SSL-Certificate.Key_pass"), + new ConfigChange.Moved("WebServer.Security.SSL-Certificate.StorePass", "WebServer.Security.SSL-Certificate.Store_pass"), + new ConfigChange.Moved("WebServer.Security.SSL-Certificate", "WebServer.Security.SSL_certificate"), + new ConfigChange.Moved("WebServer.DisableWebServer", "WebServer.Disable_Webserver"), + new ConfigChange.Moved("WebServer.ExternalWebServerAddress", "WebServer.External_Webserver_address"), new ConfigChange.Moved("WebServer", "Webserver"), new ConfigChange.Moved("Commands.AlternativeIP.Enabled", "Webserver.Alternative_IP"), new ConfigChange.Moved("Commands.AlternativeIP.Link", "Webserver.Alternative_IP.Address"), - new ConfigChange.Moved("Webserver.InternalIP", "Webserver.Internal_IP"), - new ConfigChange.Moved("Webserver.Security.SSL-Certificate", "Webserver.Security.SSL_certificate"), - new ConfigChange.Moved("Webserver.Security.SSL_certificate.KeyStorePath", "Webserver.Security.SSL_certificate.KeyStore_path"), - new ConfigChange.Moved("Webserver.Security.SSL_certificate.KeyPass", "Webserver.Security.SSL_certificate.Key_pass"), - new ConfigChange.Moved("Webserver.Security.SSL_certificate.StorePass", "Webserver.Security.SSL_certificate.Store_pass"), - new ConfigChange.Moved("Webserver.DisableWebServer", "Webserver.Disable_Webserver"), - new ConfigChange.Moved("Webserver.ExternalWebServerAddress", "Webserver.External_Webserver_address"), new ConfigChange.Moved("Data.Geolocations", "Data_gathering.Geolocations"), new ConfigChange.Moved("Data.Commands.LogUnknownCommands", "Data_gathering.Commands.Log_unknown"), @@ -102,10 +102,10 @@ public class ConfigUpdater { new ConfigChange.Moved("Theme.Graphs.Disk.Medium-Threshold", "Display_options.Graphs.Disk_space.Medium_threshold"), new ConfigChange.Moved("Commands.Colors", "Display_options.Command_colors"), + new ConfigChange.Moved("Customization.Formatting.DecimalPoints", "Customization.Formatting.Decimal_points"), + new ConfigChange.Moved("Customization.Formatting.TimeAmount", "Customization.Formatting.Time_amount"), + new ConfigChange.Moved("Customization.Formatting.Dates.RecentDays", "Customization.Formatting.Dates.Show_recent_day_names"), new ConfigChange.Moved("Customization.Formatting", "Formatting"), - new ConfigChange.Moved("Formatting.DecimalPoints", "Formatting.Decimal_points"), - new ConfigChange.Moved("Formatting.TimeAmount", "Formatting.Time_amount"), - new ConfigChange.Moved("Formatting.Dates.RecentDays", "Formatting.Dates.Show_recent_day_names"), new ConfigChange.Moved("Customization.WorldAliases", "World_aliases"), new ConfigChange.Moved("Analysis.Export.DestinationFolder", "Export.HTML_Export_path"),