Pass config file to the ConfigurationAdapter impls

Author: DerEchtePilz

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

@@ -145,7 +145,7 @@ public void onEnable() {
 	@Override
 	public void saveDefaultConfig() {
 		File configFile = new File(getDataFolder(), "config.yml");
-		BukkitConfigurationAdapter.createDummyInstance().saveDefaultConfig(getDataFolder(), configFile, getLogger());
+		BukkitConfigurationAdapter.createDummyInstance(configFile).saveDefaultConfig(getDataFolder(), getLogger());
 	}
 
 }

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

@@ -14,10 +14,10 @@
 import java.util.Set;
 import java.util.logging.Logger;
 
-public record BukkitConfigurationAdapter(YamlConfiguration config) implements ConfigurationAdapter<YamlConfiguration> {
+public record BukkitConfigurationAdapter(YamlConfiguration config, File configFile) implements ConfigurationAdapter<YamlConfiguration> {
 
-	public static BukkitConfigurationAdapter createDummyInstance() {
-		return new BukkitConfigurationAdapter(null);
+	public static BukkitConfigurationAdapter createDummyInstance(File configFile) {
+		return new BukkitConfigurationAdapter(null, configFile);
 	}
 
 	@Override
@@ -107,7 +107,7 @@ public ConfigurationAdapter<YamlConfiguration> complete() {
 
 	@Override
 	public ConfigurationAdapter<YamlConfiguration> createNew() {
-		return new BukkitConfigurationAdapter(new YamlConfiguration());
+		return new BukkitConfigurationAdapter(new YamlConfiguration(), configFile);
 	}
 
 	@Override
@@ -116,14 +116,14 @@ public DefaultBukkitConfig createDefaultConfig() {
 	}
 
 	@Override
-	public ConfigurationAdapter<YamlConfiguration> loadFromFile(File file) {
-		YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
-		return new BukkitConfigurationAdapter(config);
+	public ConfigurationAdapter<YamlConfiguration> loadFromFile() {
+		YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+		return new BukkitConfigurationAdapter(config, configFile);
 	}
 
 	@Override
-	public void saveToFile(File file) throws IOException {
-		config.save(file);
+	public void saveToFile() throws IOException {
+		config.save(configFile);
 	}
 
 }

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/ConfigGenerationTests.java

@@ -67,7 +67,7 @@ public void setup() {
 		Map<String, CommentedSection> sections = new LinkedHashMap<>();
 		sections.put("messages", messages);
 
-		ConfigurationAdapter<YamlConfiguration> adapter = new BukkitConfigurationAdapter(new YamlConfiguration());
+		ConfigurationAdapter<YamlConfiguration> adapter = new BukkitConfigurationAdapter(new YamlConfiguration(), null);
 		bukkitConfig = DefaultBukkitConfig.create(options, sections);
 		generator = ConfigGenerator.createNew(bukkitConfig);
 		this.adapter = (BukkitConfigurationAdapter) generator.generate(adapter);

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

@@ -41,7 +41,7 @@ public CommandAPIMain(ProxyServer server, Logger logger, @DataDirectory Path dat
 			.build();
 
 		// Create or update config
-		VelocityConfigurationAdapter.createDummyInstance(loader).saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), logger);
+		VelocityConfigurationAdapter.createDummyInstance(loader).saveDefaultConfig(configFile.getParent().toFile(), logger);
 
 		// Load the file as a yaml node
 		ConfigurationNode configYAML;

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

@@ -83,12 +83,12 @@ public DefaultVelocityConfig createDefaultConfig() {
 	}
 
 	@Override
-	public ConfigurationAdapter<ConfigurationNode> loadFromFile(File file) throws IOException {
+	public ConfigurationAdapter<ConfigurationNode> loadFromFile() throws IOException {
 		return new VelocityConfigurationAdapter(loader, loader.load(), createDefaultConfig());
 	}
 
 	@Override
-	public void saveToFile(File file) throws IOException {
+	public void saveToFile() throws IOException {
 		loader.save(config);
 	}
 

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

@@ -29,11 +29,11 @@ public interface ConfigurationAdapter<Configuration> {
 
 	DefaultConfig createDefaultConfig();
 
-	ConfigurationAdapter<Configuration> loadFromFile(File file) throws IOException;
+	ConfigurationAdapter<Configuration> loadFromFile() throws IOException;
 
-	void saveToFile(File file) throws IOException;
+	void saveToFile() throws IOException;
 
-	default void saveDefaultConfig(File directory, File configFile, Logger logger) {
+	default void saveDefaultConfig(File directory, Logger logger) {
 		ConfigGenerator generator = ConfigGenerator.createNew(createDefaultConfig());
 		ConfigurationAdapter<Configuration> existingConfig;
 		if (!directory.exists()) {
@@ -43,7 +43,7 @@ default void saveDefaultConfig(File directory, File configFile, Logger logger) {
 			existingConfig = createNew();
 		} else {
 			try {
-				existingConfig = loadFromFile(configFile);
+				existingConfig = loadFromFile();
 			} catch (IOException e) {
 				logger.severe("Failed to load the config file!");
 				logger.severe("Error message: " + e.getMessage());
@@ -59,7 +59,7 @@ default void saveDefaultConfig(File directory, File configFile, Logger logger) {
 			return;
 		}
 		try {
-			updatedConfig.saveToFile(configFile);
+			updatedConfig.saveToFile();
 		} catch (IOException e) {
 			logger.severe("Failed to save the config file!");
 			logger.severe("Error message: " + e.getMessage());