A few fixes

Author: DerEchtePilz

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/config/BukkitConfigurationAdapter.java

@@ -119,7 +119,7 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
 			}
 			try {
 				ConfigurationAdapter<YamlConfiguration> bukkitConfigurationAdapter = new BukkitConfigurationAdapter(new YamlConfiguration());
-				configGenerator.populateDefaultConfig(bukkitConfigurationAdapter);
+				configGenerator.generate(bukkitConfigurationAdapter);
 				bukkitConfigurationAdapter.config().save(configFile);
 			} catch (IOException e) {
 				logger.severe("Could not create default config file! This is (probably) a bug.");
@@ -135,7 +135,7 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
 		try {
 			YamlConfiguration existingYamlConfig = YamlConfiguration.loadConfiguration(configFile);
 			ConfigurationAdapter<YamlConfiguration> existingConfig = new BukkitConfigurationAdapter(existingYamlConfig);
-			ConfigurationAdapter<YamlConfiguration> updatedConfig = configGenerator.generateWithNewValues(existingConfig);
+			ConfigurationAdapter<YamlConfiguration> updatedConfig = configGenerator.generate(existingConfig);
 			if (updatedConfig == null) {
 				return;
 			}

commandapi-platforms/commandapi-velocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/config/VelocityConfigurationAdapter.java

@@ -8,10 +8,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
 
@@ -103,7 +100,7 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
 			}
 			try {
 				ConfigurationAdapter<ConfigurationNode> velocityConfigurationAdapter = new VelocityConfigurationAdapter(configLoader, configLoader.createNode(), defaultConfig);
-				configGenerator.populateDefaultConfig(velocityConfigurationAdapter);
+				configGenerator.generate(velocityConfigurationAdapter);
 				configLoader.save(velocityConfigurationAdapter.config());
 			} catch (IOException e) {
 				logger.severe("Could not create default config file! This is (probably) a bug.");
@@ -118,7 +115,7 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
 				// If the config does exist, update it if necessary
 				CommentedConfigurationNode existingYamlConfig = configLoader.load();
 				ConfigurationAdapter<ConfigurationNode> existingConfig = new VelocityConfigurationAdapter(configLoader, existingYamlConfig, defaultConfig);
-				ConfigurationAdapter<ConfigurationNode> updatedConfig = configGenerator.generateWithNewValues(existingConfig);
+				ConfigurationAdapter<ConfigurationNode> updatedConfig = configGenerator.generate(existingConfig);
 				if (updatedConfig != null) {
 					configLoader.save(updatedConfig.config());
 				}

commandapi-plugin/src/main/java/dev/jorel/commandapi/config/ConfigGenerator.java

@@ -16,16 +16,7 @@ public static ConfigGenerator createNew(DefaultConfig defaultConfig) {
 		return new ConfigGenerator(defaultConfig);
 	}
 
-	public <T> void populateDefaultConfig(ConfigurationAdapter<T> adapter) {
-		for (Map.Entry<String, CommentedConfigOption<?>> commentedConfigOption : defaultConfig.getAllOptions().entrySet()) {
-			adapter.tryCreateSection(commentedConfigOption.getKey());
-			adapter.setValue(commentedConfigOption.getKey(), commentedConfigOption.getValue().option());
-			adapter.setComment(commentedConfigOption.getKey(), commentedConfigOption.getValue().comment());
-		}
-		adapter.complete();
-	}
-
-	public <T> ConfigurationAdapter<T> generateWithNewValues(ConfigurationAdapter<T> existingConfig) {
+	public <T> ConfigurationAdapter<T> generate(ConfigurationAdapter<T> existingConfig) {
 		ConfigurationAdapter<T> updatedConfig = existingConfig.createNew();
 
 		boolean shouldRemoveValues = shouldRemoveOptions(existingConfig);