From 22c62e45be62070cff3ffa34879376a38d64920e Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 14 Jul 2021 13:39:58 +0200 Subject: [PATCH] Updated to eco 6.0.0 and continued config changes --- .../eco/core/config/LoadableJSONConfig.java | 5 ---- .../eco/core/config/LoadableYamlConfig.java | 5 ---- .../eco/core/config/base/ConfigYml.java | 4 +-- .../willfp/eco/core/config/base/LangYml.java | 4 +-- .../core/config/{ => json}/JSONConfig.java | 3 +- .../{ => json}/JsonStaticBaseConfig.java | 5 ++-- .../core/config/json/LoadableJSONConfig.java | 7 +++++ .../{ => json}/wrapper/JSONConfigWrapper.java | 5 ++-- .../wrapper/LoadableJSONConfigWrapper.java | 4 +-- .../core/config/wrapper/ConfigFactory.java | 6 ++-- .../core/config/wrapper/ConfigWrapper.java | 2 +- .../core/config/yaml/LoadableYamlConfig.java | 8 +++++ .../YamlBaseConfig.java} | 24 +++++++-------- .../core/config/{ => yaml}/YamlConfig.java | 5 ++-- .../YamlExtendableConfig.java} | 19 ++++++------ .../YamlStaticBaseConfig.java} | 11 ++++--- .../wrapper/LoadableYamlConfigWrapper.java | 4 +-- .../wrapper/WrappedYamlBukkitConfig.java} | 4 +-- .../{ => yaml}/wrapper/YamlConfigWrapper.java | 5 ++-- .../java/com/willfp/eco/core/data/Data.java | 4 +-- .../eco/internal/config/EcoConfigFactory.java | 30 +++++++++---------- .../config/json/JSONConfigWrapper.java | 2 +- .../config/json/LoadableJSONConfig.java | 2 +- .../config/yaml/LoadableYamlConfig.java | 4 +-- .../config/yaml/YamlConfigWrapper.java | 4 +-- .../willfp/eco/spigot/config/DataJson.java | 2 +- gradle.properties | 2 +- 27 files changed, 93 insertions(+), 87 deletions(-) delete mode 100644 eco-api/src/main/java/com/willfp/eco/core/config/LoadableJSONConfig.java delete mode 100644 eco-api/src/main/java/com/willfp/eco/core/config/LoadableYamlConfig.java rename eco-api/src/main/java/com/willfp/eco/core/config/{ => json}/JSONConfig.java (89%) rename eco-api/src/main/java/com/willfp/eco/core/config/{ => json}/JsonStaticBaseConfig.java (81%) create mode 100644 eco-api/src/main/java/com/willfp/eco/core/config/json/LoadableJSONConfig.java rename eco-api/src/main/java/com/willfp/eco/core/config/{ => json}/wrapper/JSONConfigWrapper.java (83%) rename eco-api/src/main/java/com/willfp/eco/core/config/{ => json}/wrapper/LoadableJSONConfigWrapper.java (89%) create mode 100644 eco-api/src/main/java/com/willfp/eco/core/config/yaml/LoadableYamlConfig.java rename eco-api/src/main/java/com/willfp/eco/core/config/{BaseConfig.java => yaml/YamlBaseConfig.java} (67%) rename eco-api/src/main/java/com/willfp/eco/core/config/{ => yaml}/YamlConfig.java (86%) rename eco-api/src/main/java/com/willfp/eco/core/config/{ExtendableConfig.java => yaml/YamlExtendableConfig.java} (61%) rename eco-api/src/main/java/com/willfp/eco/core/config/{StaticBaseConfig.java => yaml/YamlStaticBaseConfig.java} (57%) rename eco-api/src/main/java/com/willfp/eco/core/config/{ => yaml}/wrapper/LoadableYamlConfigWrapper.java (89%) rename eco-api/src/main/java/com/willfp/eco/core/config/{wrapper/WrappedBukkitConfig.java => yaml/wrapper/WrappedYamlBukkitConfig.java} (58%) rename eco-api/src/main/java/com/willfp/eco/core/config/{ => yaml}/wrapper/YamlConfigWrapper.java (67%) 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 deleted file mode 100644 index 59b00a7b..00000000 --- a/eco-api/src/main/java/com/willfp/eco/core/config/LoadableJSONConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 9612171f..00000000 --- a/eco-api/src/main/java/com/willfp/eco/core/config/LoadableYamlConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -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/base/ConfigYml.java b/eco-api/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java index d20e0632..41281a62 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java @@ -1,11 +1,11 @@ package com.willfp.eco.core.config.base; -import com.willfp.eco.core.config.BaseConfig; +import com.willfp.eco.core.config.yaml.YamlBaseConfig; import com.willfp.eco.core.EcoPlugin; import org.jetbrains.annotations.NotNull; -public class ConfigYml extends BaseConfig { +public class ConfigYml extends YamlBaseConfig { /** * Config.yml. * diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java b/eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java index 8da2b28b..d02a5916 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java @@ -1,10 +1,10 @@ package com.willfp.eco.core.config.base; -import com.willfp.eco.core.config.BaseConfig; +import com.willfp.eco.core.config.yaml.YamlBaseConfig; import com.willfp.eco.core.EcoPlugin; import org.jetbrains.annotations.NotNull; -public class LangYml extends BaseConfig { +public class LangYml extends YamlBaseConfig { /** * Lang.yml. * diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/JSONConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/JSONConfig.java similarity index 89% rename from eco-api/src/main/java/com/willfp/eco/core/config/JSONConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/JSONConfig.java index 1ea9356d..559bc01f 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/JSONConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/json/JSONConfig.java @@ -1,5 +1,6 @@ -package com.willfp.eco.core.config; +package com.willfp.eco.core.config.json; +import com.willfp.eco.core.config.Config; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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/json/JsonStaticBaseConfig.java similarity index 81% rename from eco-api/src/main/java/com/willfp/eco/core/config/JsonStaticBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/JsonStaticBaseConfig.java index 8c4ffa90..4fc337d8 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/json/JsonStaticBaseConfig.java @@ -1,9 +1,8 @@ -package com.willfp.eco.core.config; +package com.willfp.eco.core.config.json; 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 com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper; import org.jetbrains.annotations.NotNull; public abstract class JsonStaticBaseConfig extends LoadableJSONConfigWrapper { diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/json/LoadableJSONConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/LoadableJSONConfig.java new file mode 100644 index 00000000..ecb9f009 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/config/json/LoadableJSONConfig.java @@ -0,0 +1,7 @@ +package com.willfp.eco.core.config.json; + +import com.willfp.eco.core.config.LoadableConfig; + +public interface LoadableJSONConfig extends JSONConfig, LoadableConfig { + +} 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/json/wrapper/JSONConfigWrapper.java similarity index 83% rename from eco-api/src/main/java/com/willfp/eco/core/config/wrapper/JSONConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java index f59e5ded..6f30b025 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/json/wrapper/JSONConfigWrapper.java @@ -1,6 +1,7 @@ -package com.willfp.eco.core.config.wrapper; +package com.willfp.eco.core.config.json.wrapper; -import com.willfp.eco.core.config.JSONConfig; +import com.willfp.eco.core.config.json.JSONConfig; +import com.willfp.eco.core.config.wrapper.ConfigWrapper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableJSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java similarity index 89% rename from eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableJSONConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java index dae1ca55..59e79e3d 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableJSONConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/LoadableJSONConfigWrapper.java @@ -1,7 +1,7 @@ -package com.willfp.eco.core.config.wrapper; +package com.willfp.eco.core.config.json.wrapper; import com.willfp.eco.core.config.LoadableConfig; -import com.willfp.eco.core.config.LoadableJSONConfig; +import com.willfp.eco.core.config.json.LoadableJSONConfig; import org.jetbrains.annotations.NotNull; import java.io.File; 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 0af8fc74..fd4b064f 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 @@ -2,9 +2,9 @@ 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 com.willfp.eco.core.config.json.JSONConfig; +import com.willfp.eco.core.config.json.LoadableJSONConfig; +import com.willfp.eco.core.config.yaml.LoadableYamlConfig; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java index e845f10c..036d3e85 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java @@ -14,7 +14,7 @@ public abstract class ConfigWrapper implements Config { @Getter private final T handle; - ConfigWrapper(@NotNull final T handle) { + protected ConfigWrapper(@NotNull final T handle) { this.handle = handle; } diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/yaml/LoadableYamlConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/LoadableYamlConfig.java new file mode 100644 index 00000000..232b5181 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/LoadableYamlConfig.java @@ -0,0 +1,8 @@ +package com.willfp.eco.core.config.yaml; + +import com.willfp.eco.core.config.Config; +import com.willfp.eco.core.config.LoadableConfig; + +public interface LoadableYamlConfig extends Config, LoadableConfig { + +} 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/yaml/YamlBaseConfig.java similarity index 67% rename from eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java index 70c8977b..a97f4515 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/yaml/YamlBaseConfig.java @@ -1,13 +1,13 @@ -package com.willfp.eco.core.config; +package com.willfp.eco.core.config.yaml; 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.WrappedBukkitConfig; +import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper; +import com.willfp.eco.core.config.yaml.wrapper.WrappedYamlBukkitConfig; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; -public abstract class BaseConfig extends LoadableYamlConfigWrapper { +public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). @@ -19,10 +19,10 @@ public abstract class BaseConfig extends LoadableYamlConfigWrapper { * @param plugin The plugin. * @param updateBlacklist Substring of keys to not add/remove keys for. */ - protected BaseConfig(@NotNull final String configName, - final boolean removeUnused, - @NotNull final EcoPlugin plugin, - @NotNull final String... updateBlacklist) { + protected YamlBaseConfig(@NotNull final String configName, + final boolean removeUnused, + @NotNull final EcoPlugin plugin, + @NotNull final String... updateBlacklist) { super( Eco.getHandler().getConfigFactory().createUpdatableYamlConfig( configName, @@ -43,9 +43,9 @@ public abstract class BaseConfig extends LoadableYamlConfigWrapper { * @param removeUnused Whether keys not present in the default config should be removed on update. * @param plugin The plugin. */ - protected BaseConfig(@NotNull final String configName, - final boolean removeUnused, - @NotNull final EcoPlugin plugin) { + protected YamlBaseConfig(@NotNull final String configName, + final boolean removeUnused, + @NotNull final EcoPlugin plugin) { super( Eco.getHandler().getConfigFactory().createUpdatableYamlConfig( configName, @@ -59,6 +59,6 @@ public abstract class BaseConfig extends LoadableYamlConfigWrapper { @Override public YamlConfiguration getBukkitHandle() { - return (YamlConfiguration) ((WrappedBukkitConfig) this.getHandle()).getBukkitHandle(); + return (YamlConfiguration) ((WrappedYamlBukkitConfig) this.getHandle()).getBukkitHandle(); } } 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/yaml/YamlConfig.java similarity index 86% rename from eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlConfig.java index da5ebf19..ddc07170 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/yaml/YamlConfig.java @@ -1,7 +1,8 @@ -package com.willfp.eco.core.config; +package com.willfp.eco.core.config.yaml; import com.willfp.eco.core.Eco; -import com.willfp.eco.core.config.wrapper.YamlConfigWrapper; +import com.willfp.eco.core.config.Config; +import com.willfp.eco.core.config.yaml.wrapper.YamlConfigWrapper; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; 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/yaml/YamlExtendableConfig.java similarity index 61% rename from eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java index bcc3250d..6c3761a0 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/yaml/YamlExtendableConfig.java @@ -1,12 +1,11 @@ -package com.willfp.eco.core.config; +package com.willfp.eco.core.config.yaml; 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 com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper; import org.jetbrains.annotations.NotNull; -public abstract class ExtendableConfig extends LoadableYamlConfigWrapper { +public abstract class YamlExtendableConfig extends LoadableYamlConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). *

@@ -19,12 +18,12 @@ public abstract class ExtendableConfig extends LoadableYamlConfigWrapper { * @param subDirectoryPath The subdirectory path. * @param source The class that owns the resource. */ - protected ExtendableConfig(@NotNull final String configName, - final boolean removeUnused, - @NotNull final EcoPlugin plugin, - @NotNull final Class source, - @NotNull final String subDirectoryPath, - @NotNull final String... updateBlacklist) { + protected YamlExtendableConfig(@NotNull final String configName, + final boolean removeUnused, + @NotNull final EcoPlugin plugin, + @NotNull final Class source, + @NotNull final String subDirectoryPath, + @NotNull final String... updateBlacklist) { super( Eco.getHandler().getConfigFactory().createUpdatableYamlConfig( configName, 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/yaml/YamlStaticBaseConfig.java similarity index 57% rename from eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java index 34aed686..33f11b23 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/yaml/YamlStaticBaseConfig.java @@ -1,12 +1,11 @@ -package com.willfp.eco.core.config; +package com.willfp.eco.core.config.yaml; 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 com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper; import org.jetbrains.annotations.NotNull; -public abstract class StaticBaseConfig extends LoadableYamlConfigWrapper { +public abstract class YamlStaticBaseConfig extends LoadableYamlConfigWrapper { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). *

@@ -15,8 +14,8 @@ public abstract class StaticBaseConfig extends LoadableYamlConfigWrapper { * @param configName The name of the config * @param plugin The plugin. */ - protected StaticBaseConfig(@NotNull final String configName, - @NotNull final EcoPlugin plugin) { + protected YamlStaticBaseConfig(@NotNull final String configName, + @NotNull final EcoPlugin plugin) { super(Eco.getHandler().getConfigFactory().createLoadableYamlConfig(configName, plugin, "", plugin.getClass())); } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableYamlConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java similarity index 89% rename from eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableYamlConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java index 938f1c69..a2b4ee88 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/LoadableYamlConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/LoadableYamlConfigWrapper.java @@ -1,7 +1,7 @@ -package com.willfp.eco.core.config.wrapper; +package com.willfp.eco.core.config.yaml.wrapper; import com.willfp.eco.core.config.LoadableConfig; -import com.willfp.eco.core.config.LoadableYamlConfig; +import com.willfp.eco.core.config.yaml.LoadableYamlConfig; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/WrappedBukkitConfig.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/WrappedYamlBukkitConfig.java similarity index 58% rename from eco-api/src/main/java/com/willfp/eco/core/config/wrapper/WrappedBukkitConfig.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/WrappedYamlBukkitConfig.java index bea78cd5..c1153167 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/WrappedBukkitConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/WrappedYamlBukkitConfig.java @@ -1,8 +1,8 @@ -package com.willfp.eco.core.config.wrapper; +package com.willfp.eco.core.config.yaml.wrapper; import org.bukkit.configuration.ConfigurationSection; -public interface WrappedBukkitConfig { +public interface WrappedYamlBukkitConfig { /** * Get the ConfigurationSection handle. * diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/YamlConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java similarity index 67% rename from eco-api/src/main/java/com/willfp/eco/core/config/wrapper/YamlConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java index adda3485..7ff532c2 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/wrapper/YamlConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java @@ -1,10 +1,11 @@ -package com.willfp.eco.core.config.wrapper; +package com.willfp.eco.core.config.yaml.wrapper; import com.willfp.eco.core.config.Config; +import com.willfp.eco.core.config.wrapper.ConfigWrapper; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; -public abstract class YamlConfigWrapper extends ConfigWrapper implements WrappedBukkitConfig { +public abstract class YamlConfigWrapper extends ConfigWrapper implements WrappedYamlBukkitConfig { /** * Create a config wrapper. * diff --git a/eco-api/src/main/java/com/willfp/eco/core/data/Data.java b/eco-api/src/main/java/com/willfp/eco/core/data/Data.java index 236125dc..1ead7ec9 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/data/Data.java +++ b/eco-api/src/main/java/com/willfp/eco/core/data/Data.java @@ -3,8 +3,8 @@ package com.willfp.eco.core.data; import com.willfp.eco.core.Eco; 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.JsonStaticBaseConfig; +import com.willfp.eco.core.config.json.JSONConfig; +import com.willfp.eco.core.config.json.JsonStaticBaseConfig; import com.willfp.eco.core.config.LoadableConfig; import lombok.experimental.UtilityClass; import org.bukkit.OfflinePlayer; diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/EcoConfigFactory.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/EcoConfigFactory.java index 01d9b855..2fc647b2 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/EcoConfigFactory.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/EcoConfigFactory.java @@ -2,7 +2,7 @@ package com.willfp.eco.internal.config; 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.json.JSONConfig; import com.willfp.eco.core.config.wrapper.ConfigFactory; import com.willfp.eco.internal.config.json.JSONConfigSection; import com.willfp.eco.internal.config.json.LoadableJSONConfig; @@ -16,12 +16,12 @@ import java.util.Map; public class EcoConfigFactory implements ConfigFactory { @Override - public com.willfp.eco.core.config.LoadableYamlConfig createUpdatableYamlConfig(@NotNull final String configName, - @NotNull final EcoPlugin plugin, - @NotNull final String subDirectoryPath, - @NotNull final Class source, - final boolean removeUnused, - @NotNull final String... updateBlacklist) { + public com.willfp.eco.core.config.yaml.LoadableYamlConfig createUpdatableYamlConfig(@NotNull final String configName, + @NotNull final EcoPlugin plugin, + @NotNull final String subDirectoryPath, + @NotNull final Class source, + final boolean removeUnused, + @NotNull final String... updateBlacklist) { return new UpdatableYamlConfig( configName, plugin, @@ -33,10 +33,10 @@ public class EcoConfigFactory implements ConfigFactory { } @Override - public com.willfp.eco.core.config.LoadableJSONConfig createLoadableJSONConfig(@NotNull final String configName, - @NotNull final EcoPlugin plugin, - @NotNull final String subDirectoryPath, - @NotNull final Class source) { + public com.willfp.eco.core.config.json.LoadableJSONConfig createLoadableJSONConfig(@NotNull final String configName, + @NotNull final EcoPlugin plugin, + @NotNull final String subDirectoryPath, + @NotNull final Class source) { return new LoadableJSONConfig( configName, plugin, @@ -46,10 +46,10 @@ public class EcoConfigFactory implements ConfigFactory { } @Override - public com.willfp.eco.core.config.LoadableYamlConfig createLoadableYamlConfig(@NotNull final String configName, - @NotNull final EcoPlugin plugin, - @NotNull final String subDirectoryPath, - @NotNull final Class source) { + public com.willfp.eco.core.config.yaml.LoadableYamlConfig createLoadableYamlConfig(@NotNull final String configName, + @NotNull final EcoPlugin plugin, + @NotNull final String subDirectoryPath, + @NotNull final Class source) { return new LoadableYamlConfig( configName, plugin, diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java index e341199b..76cb3533 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java @@ -3,7 +3,7 @@ package com.willfp.eco.internal.config.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.willfp.eco.core.config.Config; -import com.willfp.eco.core.config.JSONConfig; +import com.willfp.eco.core.config.json.JSONConfig; import com.willfp.eco.util.StringUtils; import lombok.Getter; import org.apache.commons.lang.Validate; diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/LoadableJSONConfig.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/LoadableJSONConfig.java index d44e5c65..a46e2c07 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/LoadableJSONConfig.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/LoadableJSONConfig.java @@ -17,7 +17,7 @@ import java.nio.file.StandardOpenOption; import java.util.HashMap; @SuppressWarnings({"unchecked", "unused"}) -public class LoadableJSONConfig extends JSONConfigWrapper implements com.willfp.eco.core.config.LoadableJSONConfig { +public class LoadableJSONConfig extends JSONConfigWrapper implements com.willfp.eco.core.config.json.LoadableJSONConfig { /** * The physical config file, as stored on disk. */ diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/LoadableYamlConfig.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/LoadableYamlConfig.java index 94bf0f80..75612bb0 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/LoadableYamlConfig.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/LoadableYamlConfig.java @@ -1,7 +1,7 @@ package com.willfp.eco.internal.config.yaml; import com.willfp.eco.core.EcoPlugin; -import com.willfp.eco.core.config.wrapper.WrappedBukkitConfig; +import com.willfp.eco.core.config.yaml.wrapper.WrappedYamlBukkitConfig; import lombok.AccessLevel; import lombok.Getter; import org.bukkit.configuration.file.YamlConfiguration; @@ -13,7 +13,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -public class LoadableYamlConfig extends YamlConfigWrapper implements com.willfp.eco.core.config.LoadableYamlConfig, WrappedBukkitConfig { +public class LoadableYamlConfig extends YamlConfigWrapper implements com.willfp.eco.core.config.yaml.LoadableYamlConfig, WrappedYamlBukkitConfig { /** * The physical config file, as stored on disk. */ diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java index f32f0deb..aaf05d86 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java @@ -1,7 +1,7 @@ package com.willfp.eco.internal.config.yaml; import com.willfp.eco.core.config.Config; -import com.willfp.eco.core.config.wrapper.WrappedBukkitConfig; +import com.willfp.eco.core.config.yaml.wrapper.WrappedYamlBukkitConfig; import com.willfp.eco.util.StringUtils; import lombok.Getter; import org.apache.commons.lang.Validate; @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; @SuppressWarnings({"unchecked", "unused"}) -public class YamlConfigWrapper implements Config, WrappedBukkitConfig { +public class YamlConfigWrapper implements Config, WrappedYamlBukkitConfig { /** * The linked {@link ConfigurationSection} where values are physically stored. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/config/DataJson.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/config/DataJson.java index 1a799588..d265acac 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/config/DataJson.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/config/DataJson.java @@ -1,6 +1,6 @@ package com.willfp.eco.spigot.config; -import com.willfp.eco.core.config.JsonStaticBaseConfig; +import com.willfp.eco.core.config.json.JsonStaticBaseConfig; import com.willfp.eco.spigot.EcoSpigotPlugin; import org.jetbrains.annotations.NotNull; diff --git a/gradle.properties b/gradle.properties index aa4f1440..575c20aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 5.8.0 +version = 6.0.0 plugin-name = eco \ No newline at end of file