Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Added ConfigBuilder and more TransientConfig constructors

Browse Source
This commit is contained in:
Auxilor
2022-03-22 14:01:18 +00:00
parent df4f98251c
commit f330cc954c
5 changed files with 100 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
eco-api/src/main/java/com/willfp/eco/core/config/ConfigBuilder.java Normal file
View File

@@ -0,0 +1,29 @@
package com.willfp.eco.core.config;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* Builder for configs to create them programmatically.
*/
public class ConfigBuilder extends TransientConfig {
/**
* Create a new empty config builder.
*/
public ConfigBuilder() {
super();
}
/**
* Add to the config builder.
*
* @param path The path.
* @param object The object.
* @return The builder.
*/
public ConfigBuilder add(@NotNull final String path,
@Nullable final Object object) {
set(path, object);
return this;
}
}

59
eco-api/src/main/java/com/willfp/eco/core/config/TransientConfig.java
View File

@@ -3,12 +3,16 @@ package com.willfp.eco.core.config;
import com.willfp.eco.core.Eco;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.wrapper.ConfigWrapper;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.util.Map;
/**
@@ -18,9 +22,9 @@ import java.util.Map;
*/
public class TransientConfig extends ConfigWrapper<Config> {
/**
* @param config The YamlConfiguration handle.
* @param config The ConfigurationSection handle.
*/
public TransientConfig(@NotNull final YamlConfiguration config) {
public TransientConfig(@NotNull final ConfigurationSection config) {
super(Eco.getHandler().getConfigFactory().createConfig(config));
}
@@ -33,6 +37,25 @@ public class TransientConfig extends ConfigWrapper<Config> {
)) : new TransientConfig());
}
/**
* @param file The File.
*/
public TransientConfig(@Nullable final File file) {
super(file != null ? Eco.getHandler().getConfigFactory().createConfig(YamlConfiguration.loadConfiguration(
file
)) : new TransientConfig());
}
/**
* @param file The file.
* @param type The config type to try read from.
*/
public TransientConfig(@Nullable final File file,
@NotNull final ConfigType type) {
super(file != null ? Eco.getHandler().getConfigFactory().createConfig(readFile(file), type)
: new TransientConfig());
}
/**
* Create a new empty transient config.
*
@@ -42,6 +65,20 @@ public class TransientConfig extends ConfigWrapper<Config> {
super(Eco.getHandler().getConfigFactory().createConfig(values));
}
/**
* Create a new empty transient config.
*
* @param values The values.
* @param type The type.
*/
public TransientConfig(@NotNull final Map<String, Object> values,
@NotNull final ConfigType type) {
super(
type == ConfigType.JSON ? Eco.getHandler().getConfigFactory().createConfig(values)
: new TransientConfig(Eco.getHandler().getConfigFactory().createConfig(values).toBukkit())
);
}
/**
* Create a new empty transient config.
*/
@@ -57,4 +94,22 @@ public class TransientConfig extends ConfigWrapper<Config> {
@NotNull final ConfigType type) {
super(Eco.getHandler().getConfigFactory().createConfig(contents, type));
}
/**
* Read a file to a string.
*
* @param file The file.
* @return The string.
*/
private static String readFile(@Nullable final File file) {
if (file == null) {
return "";
}
try {
return Files.readString(file.toPath());
} catch (IOException e) {
return "";
}
}
}

10
eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java
View File

@@ -1,5 +1,6 @@
package com.willfp.eco.core.config.interfaces;
import com.willfp.eco.core.config.ConfigBuilder;
import com.willfp.eco.core.config.ConfigType;
import com.willfp.eco.core.config.TransientConfig;
import com.willfp.eco.core.placeholder.PlaceholderInjectable;
@@ -672,4 +673,13 @@ public interface Config extends Cloneable, PlaceholderInjectable {
empty.createSection("temp", this.toMap());
return empty.getConfigurationSection("temp");
}
/**
* Create a new config builder.
*
* @return The builder.
*/
static ConfigBuilder builder() {
return new ConfigBuilder();
}
}

4
eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java
View File

@@ -5,7 +5,7 @@ import com.willfp.eco.core.PluginLike;
import com.willfp.eco.core.config.ConfigType;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.interfaces.LoadableConfig;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@@ -59,7 +59,7 @@ public interface ConfigFactory {
* @param config The handle.
* @return The config implementation.
*/
Config createConfig(@NotNull YamlConfiguration config);
Config createConfig(@NotNull ConfigurationSection config);
/**
* Create config.

3
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfigFactory.kt
View File

@@ -12,11 +12,12 @@ import com.willfp.eco.internal.config.json.EcoUpdatableJSONConfig
import com.willfp.eco.internal.config.yaml.EcoLoadableYamlConfig
import com.willfp.eco.internal.config.yaml.EcoUpdatableYamlConfig
import com.willfp.eco.internal.config.yaml.EcoYamlConfigSection
import org.bukkit.configuration.ConfigurationSection
import org.bukkit.configuration.file.YamlConfiguration
import java.io.StringReader
object EcoConfigFactory : ConfigFactory {
override fun createConfig(config: YamlConfiguration): Config {
override fun createConfig(config: ConfigurationSection): Config {
return EcoYamlConfigSection(config)
}