Don't update the Velocity config if not necessary

JorelAli · Sep 23, 2024 · 4bb5e0b · 4bb5e0b
1 parent d2fa1d0
commit 4bb5e0b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/...elocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java b/...elocity/commandapi-velocity-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java
@@ -44,7 +44,7 @@ public CommandAPIMain(ProxyServer server, Logger logger, @DataDirectory Path dat
  .path(configFile)
  .build();
 
- new VelocityConfigurationAdapter(null, null).saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), null);
+ new VelocityConfigurationAdapter(null, null, null).saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), null);
 
  // If the config doesn't exist, load it from the resources
 

diff --git a/...locity-plugin/src/main/java/dev/jorel/commandapi/config/VelocityConfigurationAdapter.java b/...locity-plugin/src/main/java/dev/jorel/commandapi/config/VelocityConfigurationAdapter.java
@@ -11,12 +11,14 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
-public record VelocityConfigurationAdapter(YamlConfigurationLoader loader, CommentedConfigurationNode config) implements ConfigurationAdapter<ConfigurationNode> {
+public record VelocityConfigurationAdapter(YamlConfigurationLoader loader, CommentedConfigurationNode config, DefaultVelocityConfig defaultVelocityConfig) implements ConfigurationAdapter<ConfigurationNode> {
 
  @Override
  public void setValue(String key, Object value) {
@@ -43,7 +45,11 @@ public Object getValue(String key) {
 
  @Override
  public String[] getComment(String key) {
- return new String[0];
+ CommentedConfigOption<?> option = defaultVelocityConfig.getAllOptions().get(key);
+ CommentedSection section = defaultVelocityConfig.getAllSections().get(key);
+ return option != null
+ ? option.comment()
+ : section.comment();
  }
 
  @Override
@@ -89,7 +95,7 @@ public ConfigurationAdapter<ConfigurationNode> complete() {
 
  @Override
  public ConfigurationAdapter<ConfigurationNode> createNew() {
- return new VelocityConfigurationAdapter(loader, loader.createNode());
+ return new VelocityConfigurationAdapter(loader, loader.createNode(), DefaultVelocityConfig.createDefault());
  }
 
  @Override
@@ -98,12 +104,13 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
  .nodeStyle(NodeStyle.BLOCK)
  .file(configFile)
  .build();
- ConfigGenerator configGenerator = ConfigGenerator.createNew(DefaultVelocityConfig.createDefault());
+ DefaultVelocityConfig defaultConfig = DefaultVelocityConfig.createDefault();
+ ConfigGenerator configGenerator = ConfigGenerator.createNew(defaultConfig);
  if (!directory.exists()) {
  directory.mkdirs();
 
  try {
- ConfigurationAdapter<ConfigurationNode> velocityConfigurationAdapter = new VelocityConfigurationAdapter(configLoader, configLoader.createNode());
+ ConfigurationAdapter<ConfigurationNode> velocityConfigurationAdapter = new VelocityConfigurationAdapter(configLoader, configLoader.createNode(), defaultConfig);
  configGenerator.populateDefaultConfig(velocityConfigurationAdapter);
  configLoader.save(velocityConfigurationAdapter.config());
  } catch (IOException e) {
@@ -113,7 +120,7 @@ public void saveDefaultConfig(File directory, File configFile, Logger logger) {
  try {
  // If the config does exist, update it if necessary
  CommentedConfigurationNode existingYamlConfig = configLoader.load();
- ConfigurationAdapter<ConfigurationNode> existingConfig = new VelocityConfigurationAdapter(configLoader, existingYamlConfig);
+ ConfigurationAdapter<ConfigurationNode> existingConfig = new VelocityConfigurationAdapter(configLoader, existingYamlConfig, defaultConfig);
  ConfigurationAdapter<ConfigurationNode> updatedConfig = configGenerator.generateWithNewValues(existingConfig);
  if (updatedConfig != null) {
  configLoader.save(updatedConfig.config());