diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java index 3b199368..70c8977b 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java @@ -2,12 +2,12 @@ package com.willfp.eco.core.config; import com.willfp.eco.core.Eco; import com.willfp.eco.core.EcoPlugin; -import com.willfp.eco.core.config.wrapper.YamlConfigWrapper; +import com.willfp.eco.core.config.wrapper.LoadableYamlConfigWrapper; import com.willfp.eco.core.config.wrapper.WrappedBukkitConfig; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; -public abstract class BaseConfig extends YamlConfigWrapper { +public abstract class BaseConfig extends LoadableYamlConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java index c395209f..bcc3250d 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java @@ -2,10 +2,11 @@ package com.willfp.eco.core.config; import com.willfp.eco.core.Eco; import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.config.wrapper.LoadableYamlConfigWrapper; import com.willfp.eco.core.config.wrapper.YamlConfigWrapper; import org.jetbrains.annotations.NotNull; -public abstract class ExtendableConfig extends YamlConfigWrapper { +public abstract class ExtendableConfig extends LoadableYamlConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). *
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/JsonStaticBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/JsonStaticBaseConfig.java index 3c2f762c..8c4ffa90 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/JsonStaticBaseConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/JsonStaticBaseConfig.java @@ -3,9 +3,10 @@ package com.willfp.eco.core.config; import com.willfp.eco.core.Eco; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.config.wrapper.JSONConfigWrapper; +import com.willfp.eco.core.config.wrapper.LoadableJSONConfigWrapper; import org.jetbrains.annotations.NotNull; -public abstract class JsonStaticBaseConfig extends JSONConfigWrapper { +public abstract class JsonStaticBaseConfig extends LoadableJSONConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.json, lang.json). *
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/LoadableJSONConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/LoadableJSONConfig.java new file mode 100644 index 00000000..59b00a7b --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/config/LoadableJSONConfig.java @@ -0,0 +1,5 @@ +package com.willfp.eco.core.config; + +public interface LoadableJSONConfig extends JSONConfig, LoadableConfig { + +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/LoadableYamlConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/LoadableYamlConfig.java new file mode 100644 index 00000000..9612171f --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/config/LoadableYamlConfig.java @@ -0,0 +1,5 @@ +package com.willfp.eco.core.config; + +public interface LoadableYamlConfig extends Config, LoadableConfig { + +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java index b9e1d8b6..34aed686 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java @@ -2,10 +2,11 @@ package com.willfp.eco.core.config; import com.willfp.eco.core.Eco; import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.config.wrapper.LoadableYamlConfigWrapper; import com.willfp.eco.core.config.wrapper.YamlConfigWrapper; import org.jetbrains.annotations.NotNull; -public abstract class StaticBaseConfig extends YamlConfigWrapper { +public abstract class StaticBaseConfig extends LoadableYamlConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). *
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java
index e6e198d8..da5ebf19 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
import java.io.StringReader;
-public abstract class YamlConfig extends YamlConfigWrapper {
+public abstract class YamlConfig extends YamlConfigWrapper
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java
index 9a8ae09b..0af8fc74 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigFactory.java
@@ -3,6 +3,8 @@ package com.willfp.eco.core.config.wrapper;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.config.Config;
import com.willfp.eco.core.config.JSONConfig;
+import com.willfp.eco.core.config.LoadableJSONConfig;
+import com.willfp.eco.core.config.LoadableYamlConfig;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
@@ -19,12 +21,12 @@ public interface ConfigFactory {
* @param removeUnused Whether keys not present in the default config should be removed on update.
* @param updateBlacklist Substring of keys to not add/remove keys for.
*/
- Config createUpdatableYamlConfig(@NotNull String configName,
- @NotNull EcoPlugin plugin,
- @NotNull String subDirectoryPath,
- @NotNull Class> source,
- boolean removeUnused,
- @NotNull String... updateBlacklist);
+ LoadableYamlConfig createUpdatableYamlConfig(@NotNull String configName,
+ @NotNull EcoPlugin plugin,
+ @NotNull String subDirectoryPath,
+ @NotNull Class> source,
+ boolean removeUnused,
+ @NotNull String... updateBlacklist);
/**
* JSON loadable config.
@@ -34,10 +36,10 @@ public interface ConfigFactory {
* @param subDirectoryPath The subdirectory path.
* @param source The class that owns the resource.
*/
- JSONConfig createLoadableJSONConfig(@NotNull String configName,
- @NotNull EcoPlugin plugin,
- @NotNull String subDirectoryPath,
- @NotNull Class> source);
+ LoadableJSONConfig createLoadableJSONConfig(@NotNull String configName,
+ @NotNull EcoPlugin plugin,
+ @NotNull String subDirectoryPath,
+ @NotNull Class> source);
/**
* Yaml loadable config.
@@ -47,10 +49,10 @@ public interface ConfigFactory {
* @param subDirectoryPath The subdirectory path.
* @param source The class that owns the resource.
*/
- Config createLoadableYamlConfig(@NotNull String configName,
- @NotNull EcoPlugin plugin,
- @NotNull String subDirectoryPath,
- @NotNull Class> source);
+ LoadableYamlConfig createLoadableYamlConfig(@NotNull String configName,
+ @NotNull EcoPlugin plugin,
+ @NotNull String subDirectoryPath,
+ @NotNull Class> source);
/**
* Yaml config.
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/JSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/JSONConfigWrapper.java
index 9a921c90..f59e5ded 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/JSONConfigWrapper.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/JSONConfigWrapper.java
@@ -6,13 +6,13 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
-public abstract class JSONConfigWrapper extends ConfigWrapper