Address code review

Author: DerEchtePilz

…dev/jorel/commandapi/CommandAPIMain.java …dev/jorel/commandapi/CommandAPIMain.javacommandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-mojang-mapped/src/main/java/dev/jorel/commandapi/CommandAPIMain.java renamed to commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/CommandAPIMain.java commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-mojang-mapped/src/main/java/dev/jorel/commandapi/CommandAPIMain.java renamed to commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/CommandAPIMain.java

@@ -54,39 +54,30 @@ public boolean contains(String key) {
 	}
 
 	@Override
-	public void tryCreateSection(String key, DefaultConfig defaultedBukkitConfig) {
+	public void tryCreateSection(String key) {
 		if (!key.contains(".")) {
 			return;
 		}
 
 		// Collect config keys
-		Set<String> keys = getKeys();
+		Set<String> keys = config.getKeys(true);
 		keys.removeIf(k -> !config.isConfigurationSection(k));
 
 		// Collect sections
-		String[] paths = key.split("\\.");
-		List<String> sectionCandidates = new ArrayList<>(Arrays.asList(paths).subList(0, paths.length - 1));
+		String[] sectionCandidates = key.split("\\.");
+		sectionCandidates = Arrays.copyOf(sectionCandidates, sectionCandidates.length - 1);
 
 		// Create new sections
 		ConfigurationSection section = null;
-		StringBuilder pathSoFar = new StringBuilder();
 		for (String sectionCandidate : sectionCandidates) {
-			if (pathSoFar.isEmpty()) {
-				pathSoFar.append(sectionCandidate);
-			} else {
-				pathSoFar.append(".").append(sectionCandidate);
-			}
-
 			if (keys.contains(sectionCandidate) && section == null) {
 				section = config.getConfigurationSection(sectionCandidate);
 			} else if (section == null) {
 				section = config.createSection(sectionCandidate);
-				config.setComments(pathSoFar.toString(), Arrays.asList(defaultedBukkitConfig.getAllSections().get(pathSoFar.toString()).comment()));
 			} else {
 				ConfigurationSection currentSection = section.getConfigurationSection(sectionCandidate);
 				if (currentSection == null) {
 					section = section.createSection(sectionCandidate);
-					config.setComments(pathSoFar.toString(), Arrays.asList(defaultedBukkitConfig.getAllSections().get(pathSoFar.toString()).comment()));
 				} else {
 					section = currentSection;
 				}

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

@@ -32,6 +32,14 @@ public void setValue(String key, Object value) {
 
 	@Override
 	public void setComment(String key, String[] comment) {
+		StringBuilder commentBuilder = new StringBuilder();
+		for (int i = 0; i < comment.length; i++) {
+			if (i > 0) {
+				commentBuilder.append("\n");
+			}
+			commentBuilder.append(comment[i]);
+		}
+		node(key).comment(commentBuilder.toString());
 	}
 
 	@Override
@@ -53,7 +61,7 @@ public String[] getComment(String key) {
 
 	@Override
 	public Set<String> getKeys() {
-		return new HashSet<>(nestedOptions(config));
+		return nestedOptions(config);
 	}
 
 	@Override
@@ -62,24 +70,7 @@ public boolean contains(String key) {
 	}
 
 	@Override
-	public void tryCreateSection(String key, DefaultConfig defaultedVelocityConfig) {
-		if (!key.contains(".")) {
-			return;
-		}
-		String[] path = key.split("\\.");
-		List<String> sectionCandidates = new ArrayList<>(Arrays.asList(path).subList(0, path.length - 1));
-
-		StringBuilder pathSoFar = new StringBuilder();
-		for (String section : sectionCandidates) {
-			if (pathSoFar.isEmpty()) {
-				pathSoFar.append(section);
-			} else {
-				pathSoFar.append(".").append(section);
-			}
-			if (node(pathSoFar.toString()).comment() == null) {
-				node(pathSoFar.toString()).comment(String.join("\n", defaultedVelocityConfig.getAllSections().get(pathSoFar.toString()).comment()));
-			}
-		}
+	public void tryCreateSection(String key) {
 	}
 
 	@Override

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java

@@ -18,7 +18,7 @@ public static ConfigGenerator createNew(DefaultConfig defaultConfig) {
 
 	public <T> void populateDefaultConfig(ConfigurationAdapter<T> adapter) {
 		for (Map.Entry<String, CommentedConfigOption<?>> commentedConfigOption : defaultConfig.getAllOptions().entrySet()) {
-			adapter.tryCreateSection(commentedConfigOption.getKey(), defaultConfig);
+			adapter.tryCreateSection(commentedConfigOption.getKey());
 			adapter.setValue(commentedConfigOption.getKey(), commentedConfigOption.getValue().option());
 			adapter.setComment(commentedConfigOption.getKey(), commentedConfigOption.getValue().comment());
 		}
@@ -36,11 +36,11 @@ public <T> ConfigurationAdapter<T> generateWithNewValues(ConfigurationAdapter<T>
 
 			// Update config option
 			if (existingConfig.contains(path)) {
-				updatedConfig.tryCreateSection(path, defaultConfig);
+				updatedConfig.tryCreateSection(path);
 				updatedConfig.setValue(path, existingConfig.getValue(path));
 			} else {
 				wasConfigUpdated = true;
-				updatedConfig.tryCreateSection(path, defaultConfig);
+				updatedConfig.tryCreateSection(path);
 				updatedConfig.setValue(path, commentedConfigOption.getValue().option());
 			}
 

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

@@ -18,7 +18,7 @@ public interface ConfigurationAdapter<Configuration> {
 
 	boolean contains(String key);
 
-	void tryCreateSection(String key, DefaultConfig defaultConfiguration);
+	void tryCreateSection(String key);
 
 	ConfigurationAdapter<Configuration> complete();