From e9c6812b92d5a252f485fbaef1afa8ea5b019ddd Mon Sep 17 00:00:00 2001
From: Flemmli97 <Flemmli97@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:34:16 +0200
Subject: [PATCH] move configs to "./config" folder

---
 Changelog.txt                                           | 4 ++++
 gradle.properties                                       | 2 +-
 src/main/java/com/flemmli97/flan/config/Config.java     | 6 +++++-
 src/main/java/com/flemmli97/flan/config/LangConfig.java | 4 +++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 9ca2bf9..3112ad8 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,7 @@
+Flan 1.0.5
+======================
+- Moved the config files to the run/server root folder. (The place where all other mods configs are too)
+
 Flan 1.0.4
 ======================
 - BisUmTo: Add addClaim command to create claims via commands
diff --git a/gradle.properties b/gradle.properties
index 9272d73..92b653f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G
 	loader_version=0.9.1+build.205
 
 # Mod Properties
-	mod_version = 1.0.4
+	mod_version = 1.0.5
 	maven_group = com.flemmli97.flan
 	archives_base_name = flan
 
diff --git a/src/main/java/com/flemmli97/flan/config/Config.java b/src/main/java/com/flemmli97/flan/config/Config.java
index 69adf88..86d269c 100644
--- a/src/main/java/com/flemmli97/flan/config/Config.java
+++ b/src/main/java/com/flemmli97/flan/config/Config.java
@@ -2,6 +2,7 @@ package com.flemmli97.flan.config;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.server.MinecraftServer;
@@ -13,6 +14,8 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public class Config {
 
@@ -34,7 +37,8 @@ public class Config {
     public int permissionLevel = 2;
 
     public Config(MinecraftServer server) {
-        File configDir = server.getSavePath(WorldSavePath.ROOT).resolve("config/claimConfigs").toFile();
+        File configDir = FabricLoader.getInstance().getConfigDir().resolve("flan").toFile();
+        //.getSavePath(WorldSavePath.ROOT).resolve("config/claimConfigs").toFile();
         try {
             if (!configDir.exists())
                 configDir.mkdirs();
diff --git a/src/main/java/com/flemmli97/flan/config/LangConfig.java b/src/main/java/com/flemmli97/flan/config/LangConfig.java
index 0f165c2..8176e8f 100644
--- a/src/main/java/com/flemmli97/flan/config/LangConfig.java
+++ b/src/main/java/com/flemmli97/flan/config/LangConfig.java
@@ -1,6 +1,7 @@
 package com.flemmli97.flan.config;
 
 import com.google.gson.JsonObject;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.WorldSavePath;
 
@@ -76,7 +77,8 @@ public class LangConfig {
     public String claimGroupPlayers = "    Players: %s";
 
     public LangConfig(MinecraftServer server) {
-        File configDir = server.getSavePath(WorldSavePath.ROOT).resolve("config/claimConfigs").toFile();
+        File configDir = FabricLoader.getInstance().getConfigDir().resolve("flan").toFile();
+        //server.getSavePath(WorldSavePath.ROOT).resolve("config/claimConfigs").toFile();
         try {
             if (!configDir.exists())
                 configDir.mkdirs();