Repo-Mirror/Talismans
9
0
Fork 0
Code Issues Releases 1 Activity

Updated to eco 3.6.0 config system

Browse Source
This commit is contained in:
Auxilor
2021-02-07 20:32:12 +00:00
parent 51feed0af6
commit 6aa4ccdfbd
2 changed files with 4 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -47,7 +47,7 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:3.3.0'
compileOnly 'com.willfp:eco:3.6.0'
compileOnly 'org.jetbrains:annotations:19.0.0'

254
eco-core/core-plugin/src/main/java/com/willfp/talismans/config/TalismanYamlConfig.java
View File

@@ -1,60 +1,11 @@
package com.willfp.talismans.config;
import com.willfp.eco.util.config.ValueGetter;
import com.willfp.eco.util.internal.PluginDependent;
import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.eco.util.config.ExtendableConfig;
import com.willfp.talismans.TalismansPlugin;
import com.willfp.talismans.talismans.meta.TalismanStrength;
import lombok.AccessLevel;
import lombok.Getter;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
public abstract class TalismanYamlConfig extends PluginDependent implements ValueGetter {
/**
* The name of the config.
*/
private final String name;
/**
* The internal config that stores the values.
*/
@Getter
private final YamlConfiguration config;
/**
* The physical file of the config.
*/
@Getter(AccessLevel.PROTECTED)
private final File configFile;
/**
* The directory that the config is in.
*/
private final File directory;
/**
* The provider of the config.
*/
private final Class<?> source;
/**
* The talisman strength.
*/
private final TalismanStrength strength;
public abstract class TalismanYamlConfig extends ExtendableConfig {
/**
* Create new talisman config yml.
*
@@ -65,205 +16,6 @@ public abstract class TalismanYamlConfig extends PluginDependent implements Valu
protected TalismanYamlConfig(@NotNull final String name,
@NotNull final TalismanStrength strength,
@NotNull final Class<?> source) {
super(TalismansPlugin.getInstance());
this.name = name;
this.source = source;
this.strength = strength;
File basedir = new File(this.getPlugin().getDataFolder(), "talismans/");
if (!basedir.exists()) {
basedir.mkdirs();
}
File dir = new File(basedir, strength.name().toLowerCase() + "/");
if (!dir.exists()) {
dir.mkdirs();
}
this.directory = dir;
if (!new File(directory, name + ".yml").exists()) {
createFile();
}
this.configFile = new File(directory, name + ".yml");
this.config = YamlConfiguration.loadConfiguration(configFile);
update();
}
private void saveResource() {
String resourcePath = "/talismans/" + strength.name().toLowerCase() + "/" + name + ".yml";
InputStream in = source.getResourceAsStream(resourcePath);
File outFile = new File(this.getPlugin().getDataFolder(), resourcePath);
int lastIndex = resourcePath.lastIndexOf('/');
File outDir = new File(this.getPlugin().getDataFolder(), resourcePath.substring(0, Math.max(lastIndex, 0)));
if (!outDir.exists()) {
outDir.mkdirs();
}
try {
if (!outFile.exists()) {
OutputStream out = new FileOutputStream(outFile);
byte[] buf = new byte[1024];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
}
out.close();
in.close();
}
} catch (IOException ignored) {
}
}
private void createFile() {
saveResource();
}
/**
* Update the config. Removes unneeded config keys and adds missing ones.
*/
public void update() {
try {
config.load(configFile);
String resourcePath = "/talismans/" + strength.name().toLowerCase() + "/" + name + ".yml";
InputStream newIn = source.getResourceAsStream(resourcePath);
BufferedReader reader = new BufferedReader(new InputStreamReader(newIn, StandardCharsets.UTF_8));
YamlConfiguration newConfig = new YamlConfiguration();
newConfig.load(reader);
if (newConfig.getKeys(true).equals(config.getKeys(true))) {
return;
}
newConfig.getKeys(true).forEach((s -> {
if (!config.getKeys(true).contains(s)) {
config.set(s, newConfig.get(s));
}
}));
config.getKeys(true).forEach((s -> {
if (!newConfig.getKeys(true).contains(s)) {
config.set(s, null);
}
}));
config.save(configFile);
} catch (IOException | InvalidConfigurationException e) {
e.printStackTrace();
}
}
/**
* Get an integer from config.
*
* @param path The key to fetch the value from.
* @return The found value, or 0 if not found.
*/
@Override
public int getInt(@NotNull final String path) {
return config.getInt(path, 0);
}
/**
* Get an integer from config with a specified default (not found) value.
*
* @param path The key to fetch the value from.
* @param def The value to default to if not found.
* @return The found value, or the default.
*/
@Override
public int getInt(@NotNull final String path,
final int def) {
return config.getInt(path, def);
}
/**
* Get a list of integers from config.
*
* @param path The key to fetch the value from.
* @return The found value, or a blank {@link java.util.ArrayList} if not found.
*/
@Override
@NotNull
public List<Integer> getInts(@NotNull final String path) {
return config.getIntegerList(path);
}
/**
* Get a boolean from config.
*
* @param path The key to fetch the value from.
* @return The found value, or false if not found.
*/
@Override
public boolean getBool(@NotNull final String path) {
return config.getBoolean(path, false);
}
/**
* Get a list of booleans from config.
*
* @param path The key to fetch the value from.
* @return The found value, or a blank {@link java.util.ArrayList} if not found.
*/
@Override
@NotNull
public List<Boolean> getBools(@NotNull final String path) {
return config.getBooleanList(path);
}
/**
* Get a string from config.
*
* @param path The key to fetch the value from.
* @return The found value, or an empty string if not found.
*/
@Override
@NotNull
public String getString(@NotNull final String path) {
return Objects.requireNonNull(config.getString(path, ""));
}
/**
* Get a list of strings from config.
*
* @param path The key to fetch the value from.
* @return The found value, or a blank {@link java.util.ArrayList} if not found.
*/
@Override
@NotNull
public List<String> getStrings(@NotNull final String path) {
return config.getStringList(path);
}
/**
* Get a decimal from config.
*
* @param path The key to fetch the value from.
* @return The found value, or 0 if not found.
*/
@Override
public double getDouble(@NotNull final String path) {
return config.getDouble(path, 0);
}
/**
* Get a list of decimals from config.
*
* @param path The key to fetch the value from.
* @return The found value, or a blank {@link java.util.ArrayList} if not found.
*/
@Override
@NotNull
public List<Double> getDoubles(@NotNull final String path) {
return config.getDoubleList(path);
super(name, true, TalismansPlugin.getInstance(), source, "talismans/" + strength.name().toLowerCase() + "/");
}
}