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

Updated to eco 6.0.0 and continued config changes

Browse Source
This commit is contained in:
Auxilor
2021-07-14 13:39:58 +02:00
committed by Auxilor
parent 119b5742fb
commit 22c62e45be
27 changed files with 93 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eco-api/src/main/java/com/willfp/eco/core/config/LoadableJSONConfig.java
View File

@@ -1,5 +0,0 @@
package com.willfp.eco.core.config;
public interface LoadableJSONConfig extends JSONConfig, LoadableConfig {
}

5
eco-api/src/main/java/com/willfp/eco/core/config/LoadableYamlConfig.java
View File

@@ -1,5 +0,0 @@
package com.willfp.eco.core.config;
public interface LoadableYamlConfig extends Config, LoadableConfig {
}

4
eco-api/src/main/java/com/willfp/eco/core/config/base/ConfigYml.java
View File

@@ -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.
*

4
eco-api/src/main/java/com/willfp/eco/core/config/base/LangYml.java
View File

@@ -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.
*

3
eco-api/src/main/java/com/willfp/eco/core/config/JSONConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/json/JSONConfig.java
View File

@@ -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;

5
eco-api/src/main/java/com/willfp/eco/core/config/JsonStaticBaseConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/json/JsonStaticBaseConfig.java
View File

@@ -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 {

7
eco-api/src/main/java/com/willfp/eco/core/config/json/LoadableJSONConfig.java Normal file
View File

@@ -0,0 +1,7 @@
package com.willfp.eco.core.config.json;
import com.willfp.eco.core.config.LoadableConfig;
public interface LoadableJSONConfig extends JSONConfig, LoadableConfig {
}

5
eco-api/src/main/java/com/willfp/eco/core/config/wrapper/JSONConfigWrapper.java → eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java
View File

@@ -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;

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

@@ -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;

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

@@ -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;

2
eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java
View File

@@ -14,7 +14,7 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
@Getter
private final T handle;
ConfigWrapper(@NotNull final T handle) {
protected ConfigWrapper(@NotNull final T handle) {
this.handle = handle;
}

8
eco-api/src/main/java/com/willfp/eco/core/config/yaml/LoadableYamlConfig.java Normal file
View File

@@ -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 {
}

24
eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlBaseConfig.java
View File

@@ -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();
}
}

5
eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlConfig.java
View File

@@ -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;

19
eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlExtendableConfig.java
View File

@@ -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).
* <p>
@@ -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,

11
eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/yaml/YamlStaticBaseConfig.java
View File

@@ -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).
* <p>
@@ -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()));
}
}

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

@@ -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;

4
eco-api/src/main/java/com/willfp/eco/core/config/wrapper/WrappedBukkitConfig.java → eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/WrappedYamlBukkitConfig.java
View File

@@ -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<T extends ConfigurationSection> {
public interface WrappedYamlBukkitConfig<T extends ConfigurationSection> {
/**
* Get the ConfigurationSection handle.
*

5
eco-api/src/main/java/com/willfp/eco/core/config/wrapper/YamlConfigWrapper.java → eco-api/src/main/java/com/willfp/eco/core/config/yaml/wrapper/YamlConfigWrapper.java
View File

@@ -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<T extends Config> extends ConfigWrapper<T> implements WrappedBukkitConfig<YamlConfiguration> {
public abstract class YamlConfigWrapper<T extends Config> extends ConfigWrapper<T> implements WrappedYamlBukkitConfig<YamlConfiguration> {
/**
* Create a config wrapper.
*

4
eco-api/src/main/java/com/willfp/eco/core/data/Data.java
View File

@@ -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;