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

Even more config parity fixes

Browse Source
This commit is contained in:
Auxilor
2021-12-12 13:58:53 +00:00
parent abcc13685f
commit 7684e431f5
10 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eco-api/src/main/java/com/willfp/eco/core/config/LoadableConfigWrapper.java
View File

@@ -2,7 +2,9 @@ package com.willfp.eco.core.config;
import com.willfp.eco.core.config.interfaces.LoadableConfig;
import com.willfp.eco.core.config.wrapper.ConfigWrapper;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -44,4 +46,9 @@ public abstract class LoadableConfigWrapper extends ConfigWrapper<LoadableConfig
public String getName() {
return this.getHandle().getName();
}
@Override
public @Nullable YamlConfiguration getBukkitHandle() {
return this.getHandle().getBukkitHandle();
}
}

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

@@ -2,7 +2,6 @@ package com.willfp.eco.core.config.interfaces;
import com.willfp.eco.core.config.ConfigType;
import com.willfp.eco.util.StringUtils;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -544,14 +543,6 @@ public interface Config extends Cloneable {
@Nullable
List<? extends Config> getSubsectionsOrNull(@NotNull String path);
/**
* Get bukkit {@link YamlConfiguration}.
*
* @return The config, or null if config is not yaml-based.
*/
@Nullable
YamlConfiguration getBukkitHandle();
/**
* Get config type.
*

11
eco-api/src/main/java/com/willfp/eco/core/config/interfaces/LoadableConfig.java
View File

@@ -1,5 +1,8 @@
package com.willfp.eco.core.config.interfaces;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -39,4 +42,12 @@ public interface LoadableConfig extends Config {
* @return The name.
*/
String getName();
/**
* Get bukkit {@link YamlConfiguration}.
*
* @return The config, or null if config is not yaml-based.
*/
@Nullable
YamlConfiguration getBukkitHandle();
}

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

@@ -3,7 +3,9 @@ package com.willfp.eco.core.config.json.wrapper;
import com.willfp.eco.core.config.interfaces.JSONConfig;
import com.willfp.eco.core.config.interfaces.LoadableConfig;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -51,4 +53,9 @@ public abstract class LoadableJSONConfigWrapper extends JSONConfigWrapper implem
public String getName() {
return ((LoadableConfig) this.getHandle()).getName();
}
@Override
public @Nullable YamlConfiguration getBukkitHandle() {
return null;
}
}

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

@@ -190,11 +190,6 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
return handle.clone();
}
@Override
public @Nullable YamlConfiguration getBukkitHandle() {
return handle.getBukkitHandle();
}
@Override
public @NotNull ConfigType getType() {
return handle.getType();

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

@@ -3,7 +3,9 @@ package com.willfp.eco.core.config.yaml.wrapper;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.interfaces.LoadableConfig;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -51,4 +53,9 @@ public abstract class LoadableYamlConfigWrapper extends YamlConfigWrapper implem
public String getName() {
return ((LoadableConfig) this.getHandle()).getName();
}
@Override
public @Nullable YamlConfiguration getBukkitHandle() {
return ((LoadableConfig) this.getHandle()).getBukkitHandle();
}
}