Skip to content

Commit be6dfa3

Browse files
committed
Create static method to create a dummy instance
1 parent e1c35d7 commit be6dfa3

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
@ApiStatus.Internal
1818
public record BukkitConfigurationAdapter(YamlConfiguration config) implements ConfigurationAdapter<YamlConfiguration> {
1919

20+
public static BukkitConfigurationAdapter createDummyInstance() {
21+
return new BukkitConfigurationAdapter(null);
22+
}
23+
2024
@Override
2125
public void setValue(String key, Object value) {
2226
config.set(key, value);

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@
2121
package dev.jorel.commandapi;
2222

2323
import dev.jorel.commandapi.config.BukkitConfigurationAdapter;
24-
import dev.jorel.commandapi.config.ConfigGenerator;
25-
import dev.jorel.commandapi.config.ConfigurationAdapter;
26-
import dev.jorel.commandapi.config.DefaultBukkitConfig;
2724
import org.bukkit.Bukkit;
2825
import org.bukkit.configuration.file.FileConfiguration;
29-
import org.bukkit.configuration.file.YamlConfiguration;
3026
import org.bukkit.plugin.InvalidPluginException;
3127
import org.bukkit.plugin.Plugin;
3228
import org.bukkit.plugin.java.JavaPlugin;
@@ -149,7 +145,7 @@ public void onEnable() {
149145
@Override
150146
public void saveDefaultConfig() {
151147
File configFile = new File(getDataFolder(), "config.yml");
152-
new BukkitConfigurationAdapter(null).saveDefaultConfig(getDataFolder(), configFile, getLogger());
148+
BukkitConfigurationAdapter.createDummyInstance().saveDefaultConfig(getDataFolder(), configFile, getLogger());
153149
}
154150

155151
}

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,19 @@
2020
*******************************************************************************/
2121
package dev.jorel.commandapi;
2222

23-
import java.io.File;
24-
import java.util.HashMap;
25-
import java.util.List;
26-
import java.util.Map;
27-
import java.util.Map.Entry;
28-
2923
import dev.jorel.commandapi.config.BukkitConfigurationAdapter;
30-
import dev.jorel.commandapi.config.ConfigGenerator;
31-
import dev.jorel.commandapi.config.ConfigurationAdapter;
32-
import dev.jorel.commandapi.config.DefaultBukkitConfig;
3324
import org.bukkit.Bukkit;
3425
import org.bukkit.configuration.file.FileConfiguration;
35-
import org.bukkit.configuration.file.YamlConfiguration;
3626
import org.bukkit.plugin.InvalidPluginException;
3727
import org.bukkit.plugin.Plugin;
3828
import org.bukkit.plugin.java.JavaPlugin;
3929

30+
import java.io.File;
31+
import java.util.HashMap;
32+
import java.util.List;
33+
import java.util.Map;
34+
import java.util.Map.Entry;
35+
4036
/**
4137
* Main CommandAPI plugin entrypoint
4238
*/
@@ -149,6 +145,6 @@ public void onEnable() {
149145
@Override
150146
public void saveDefaultConfig() {
151147
File configFile = new File(getDataFolder(), "config.yml");
152-
new BukkitConfigurationAdapter(null).saveDefaultConfig(getDataFolder(), configFile, getLogger());
148+
BukkitConfigurationAdapter.createDummyInstance().saveDefaultConfig(getDataFolder(), configFile, getLogger());
153149
}
154150
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,13 @@
88
import com.velocitypowered.api.plugin.Plugin;
99
import com.velocitypowered.api.plugin.annotation.DataDirectory;
1010
import com.velocitypowered.api.proxy.ProxyServer;
11-
import dev.jorel.commandapi.config.ConfigGenerator;
12-
import dev.jorel.commandapi.config.ConfigurationAdapter;
13-
import dev.jorel.commandapi.config.DefaultVelocityConfig;
1411
import dev.jorel.commandapi.config.VelocityConfigurationAdapter;
15-
import org.spongepowered.configurate.CommentedConfigurationNode;
1612
import org.spongepowered.configurate.ConfigurationNode;
1713
import org.spongepowered.configurate.yaml.NodeStyle;
1814
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
1915

2016
import java.io.File;
2117
import java.io.IOException;
22-
import java.nio.file.Files;
2318
import java.nio.file.Path;
2419
import java.util.logging.Logger;
2520

@@ -41,7 +36,7 @@ public CommandAPIMain(ProxyServer server, Logger logger, @DataDirectory Path dat
4136
Path configFile = dataDirectory.resolve("config.yml");
4237

4338
// Create or update config
44-
new VelocityConfigurationAdapter(null, null, null).saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), null);
39+
VelocityConfigurationAdapter.createDummyInstance().saveDefaultConfig(configFile.getParent().toFile(), configFile.toFile(), null);
4540

4641
// Load the file as a yaml node
4742
ConfigurationNode configYAML;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88

99
import java.io.File;
1010
import java.io.IOException;
11-
import java.nio.file.Files;
1211
import java.util.ArrayList;
1312
import java.util.Arrays;
14-
import java.util.HashMap;
1513
import java.util.HashSet;
1614
import java.util.List;
17-
import java.util.Map;
1815
import java.util.Set;
1916
import java.util.logging.Logger;
2017

2118
public record VelocityConfigurationAdapter(YamlConfigurationLoader loader, CommentedConfigurationNode config, DefaultVelocityConfig defaultVelocityConfig) implements ConfigurationAdapter<ConfigurationNode> {
2219

20+
public static VelocityConfigurationAdapter createDummyInstance() {
21+
return new VelocityConfigurationAdapter(null, null, null);
22+
}
23+
2324
@Override
2425
public void setValue(String key, Object value) {
2526
try {

0 commit comments

Comments
 (0)