Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle.kts
#	src/main/java/com/alttd/afkdectector/MessageTimer.java
#	src/main/java/com/alttd/afkdectector/config/Config.java
#	src/main/java/com/alttd/afkdectector/config/MessagesConfig.java

build.gradle.kts

@@ -39,8 +39,13 @@ tasks {
 }
 
 dependencies {
-    compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT")
+    compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") {
+        isChanging = true
+    }
     compileOnly("de.keyle:mypet:3.11-SNAPSHOT")
+    compileOnly("com.alttd:VillagerShopUI:1.1-SNAPSHOT") {
+        isChanging = true
+    }
 }
 
 fun gitCommit(): String {
@@ -51,4 +56,4 @@ fun gitCommit(): String {
         standardOutput = os
     }
     return String(os.toByteArray()).trim()
-}
+}

settings.gradle.kts

@@ -1,9 +1,20 @@
+import org.gradle.kotlin.dsl.maven
+
 rootProject.name = "AFKDetector"
 
 dependencyResolutionManagement {
     repositories {
         mavenCentral()
         maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
+        maven("https://repo.alttd.com/repository/alttd-snapshot/")
+        maven {
+            name = "nexus"
+            url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
+            credentials {
+                username = providers.gradleProperty("alttdSnapshotUsername").get()
+                password = providers.gradleProperty("alttdSnapshotPassword").get()
+            }
+        }
     }
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 }

src/main/java/com/alttd/afkdectector/config/AbstractConfig.java

@@ -0,0 +1,135 @@
+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));
+    }
+
+    <T> List<?> getList(String path, T def) {
+        yaml.addDefault(path, def);
+        return yaml.getList(path, yaml.getList(path));
+    }
+
+    List<String> getStringList(String path, List<String> def) {
+        yaml.addDefault(path, def);
+        return yaml.getStringList(path);
+    }
+
+    @NonNull
+    <T> Map<String, T> getMap(final @NonNull String path, final @Nullable Map<String, T> def) {
+        final ImmutableMap.Builder<String, T> 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);
+    }
+}

src/main/java/com/alttd/afkdectector/config/Config.java

@@ -15,7 +15,6 @@ 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 {