diff --git a/src/main/java/com/alttd/afkdectector/config/AbstractConfig.java b/src/main/java/com/alttd/afkdectector/config/AbstractConfig.java deleted file mode 100644 index 705ff83..0000000 --- a/src/main/java/com/alttd/afkdectector/config/AbstractConfig.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.alttd.afkdectector.config; - -import com.alttd.VillagerUI; -import com.alttd.util.Logger; -import com.google.common.collect.ImmutableMap; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings({"unused", "SameParameterValue"}) -abstract class AbstractConfig { - File file; - YamlConfiguration yaml; - - AbstractConfig(String filename) { - init(new File(VillagerUI.getInstance().getDataFolder(), filename), filename); - } - - AbstractConfig(File file, String filename) { - init(new File(file.getPath() + File.separator + filename), filename); - } - - private void init(File file, String filename) { - this.file = file; - this.yaml = new YamlConfiguration(); - try { - yaml.load(file); - } catch (IOException ignore) { - } catch (InvalidConfigurationException ex) { - Logger.severe(String.format("Could not load %s, please correct your syntax errors", filename)); - throw new RuntimeException(ex); - } - yaml.options().copyDefaults(true); - } - - void readConfig(Class clazz, Object instance) { - for (Method method : clazz.getDeclaredMethods()) { - if (Modifier.isPrivate(method.getModifiers())) { - if (method.getParameterTypes().length == 0 && method.getReturnType() == Void.TYPE) { - try { - method.setAccessible(true); - method.invoke(instance); - } catch (InvocationTargetException ex) { - throw new RuntimeException(ex.getCause()); - } catch (Exception ex) { - Logger.severe("Error invoking %.", method.toString()); - ex.printStackTrace(); - } - } - } - } - - save(); - } - - private void save() { - try { - yaml.save(file); - } catch (IOException ex) { - Logger.severe("Could not save %.", file.toString()); - ex.printStackTrace(); - } - } - - void set(String path, Object val) { - yaml.addDefault(path, val); - yaml.set(path, val); - save(); - } - - String getString(String path, String def) { - yaml.addDefault(path, def); - return yaml.getString(path, yaml.getString(path)); - } - - boolean getBoolean(String path, boolean def) { - yaml.addDefault(path, def); - return yaml.getBoolean(path, yaml.getBoolean(path)); - } - - int getInt(String path, int def) { - yaml.addDefault(path, def); - return yaml.getInt(path, yaml.getInt(path)); - } - - double getDouble(String path, double def) { - yaml.addDefault(path, def); - return yaml.getDouble(path, yaml.getDouble(path)); - } - - List getList(String path, T def) { - yaml.addDefault(path, def); - return yaml.getList(path, yaml.getList(path)); - } - - List getStringList(String path, List def) { - yaml.addDefault(path, def); - return yaml.getStringList(path); - } - - @NonNull - Map getMap(final @NonNull String path, final @Nullable Map def) { - final ImmutableMap.Builder builder = ImmutableMap.builder(); - if (def != null && yaml.getConfigurationSection(path) == null) { - yaml.addDefault(path, def.isEmpty() ? new HashMap<>() : def); - return def; - } - final ConfigurationSection section = yaml.getConfigurationSection(path); - if (section != null) { - for (String key : section.getKeys(false)) { - @SuppressWarnings("unchecked") - final T val = (T) section.get(key); - if (val != null) { - builder.put(key, val); - } - } - } - return builder.build(); - } - - ConfigurationSection getConfigurationSection(String path) { - return yaml.getConfigurationSection(path); - } -} diff --git a/src/main/java/com/alttd/afkdectector/config/Config.java b/src/main/java/com/alttd/afkdectector/config/Config.java index e0396a0..b014af7 100644 --- a/src/main/java/com/alttd/afkdectector/config/Config.java +++ b/src/main/java/com/alttd/afkdectector/config/Config.java @@ -15,6 +15,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; @SuppressWarnings("unused") public class Config {