API: No longer to add .yml to LoaderSettings

Author: Rothes

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/config/BukkitEsuLocale.kt

@@ -1,8 +1,8 @@
 package io.github.rothes.esu.bukkit.config
 
-import io.github.rothes.esu.core.config.EsuLocale
 import io.github.rothes.esu.bukkit.config.BukkitEsuLocale.BukkitLocaleData
 import io.github.rothes.esu.core.EsuCore
+import io.github.rothes.esu.core.config.EsuLocale
 import io.github.rothes.esu.core.configuration.ConfigLoader
 import io.github.rothes.esu.core.configuration.MultiLocaleConfiguration
 import io.github.rothes.esu.lib.configurate.objectmapping.meta.PostProcess
@@ -18,7 +18,7 @@ object BukkitEsuLocale: EsuLocale<BukkitLocaleData>() {
     }
 
     override fun load(): MultiLocaleConfiguration<BukkitLocaleData> = ConfigLoader.loadMulti(
-        EsuCore.instance.baseConfigPath().resolve("lang"), "en_us.yml"
+        EsuCore.instance.baseConfigPath().resolve("lang"), "en_us"
     )
 
     class BukkitLocaleData: BaseEsuLocaleData() {

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/SocialFilterModule.kt

@@ -45,7 +45,7 @@ object SocialFilterModule: BukkitModule<BaseModuleConfiguration, SocialFilterMod
         filters = ConfigLoader.loadMulti(
             moduleFolder.resolve("filters"),
             ConfigLoader.LoaderSettingsMulti<Filter>(
-                createKeys = listOf("example.yml")
+                createKeys = listOf("example")
             )
         )
     }

bungeecord/src/main/kotlin/io/github/rothes/esu/bungee/config/BungeeEsuLocale.kt

@@ -17,7 +17,7 @@ object BungeeEsuLocale: EsuLocale<BungeeLocaleData>() {
     }
 
     override fun load(): MultiLocaleConfiguration<BungeeLocaleData> = ConfigLoader.loadMulti(
-        EsuCore.instance.baseConfigPath().resolve("lang"), "en_us.yml"
+        EsuCore.instance.baseConfigPath().resolve("lang"), "en_us"
     )
 
     class BungeeLocaleData: BaseEsuLocaleData() {

core/src/main/kotlin/io/github/rothes/esu/core/colorscheme/ColorSchemes.kt

@@ -1,7 +1,7 @@
 package io.github.rothes.esu.core.colorscheme
 
-import io.github.rothes.esu.core.config.EsuConfig
 import io.github.rothes.esu.core.EsuCore
+import io.github.rothes.esu.core.config.EsuConfig
 import io.github.rothes.esu.core.configuration.ConfigLoader
 
 object ColorSchemes {
@@ -17,7 +17,7 @@ object ColorSchemes {
         return ConfigLoader.loadMulti<MultiColorSchemeConfiguration, ColorScheme>(
             EsuCore.instance.baseConfigPath().resolve("color_schemes"),
             ConfigLoader.LoaderSettingsMulti(
-                "${EsuConfig.get().defaultColorScheme}.yml",
+                EsuConfig.get().defaultColorScheme,
                 yamlLoader = {
                     it.defaultOptions {
                         it.header("""

core/src/main/kotlin/io/github/rothes/esu/core/configuration/ConfigLoader.kt

@@ -126,9 +126,9 @@ object ConfigLoader {
         }
         return configClass.getConstructor(Map::class.java).newInstance(
             buildMap {
-                val files = settings.forceLoad?.map { path.resolve(it) }?.toMutableSet() ?: mutableSetOf()
+                val files = settings.forceLoad?.map { path.resolve("$it.yml") }?.toMutableSet() ?: mutableSetOf()
                 if (settings.createKeys?.isNotEmpty() == true && path.notExists()) {
-                    files.addAll(settings.createKeys.map { path.resolve(it) })
+                    files.addAll(settings.createKeys.map { path.resolve("$it.yml") })
                 }
 
                 if (path.isDirectory()) {

core/src/main/kotlin/io/github/rothes/esu/core/module/CommonModule.kt

@@ -65,7 +65,7 @@ abstract class CommonModule<C: ConfigurationPart, L: ConfigurationPart> : Module
 
     override fun reloadConfig() {
         config = ConfigLoader.load(configPath, configClass, ConfigLoader.LoaderSettings(yamlLoader = configLoader))
-        locale = ConfigLoader.loadMulti(localePath, localeClass, ConfigLoader.LoaderSettingsMulti("en_us.yml", yamlLoader = localeLoader))
+        locale = ConfigLoader.loadMulti(localePath, localeClass, ConfigLoader.LoaderSettingsMulti("en_us", yamlLoader = localeLoader))
     }
 
     fun User.hasPerm(shortPerm: String): Boolean {

velocity/src/main/kotlin/io/github/rothes/esu/velocity/config/VelocityEsuLocale.kt

@@ -1,7 +1,7 @@
 package io.github.rothes.esu.velocity.config
 
-import io.github.rothes.esu.core.config.EsuLocale
 import io.github.rothes.esu.core.EsuCore
+import io.github.rothes.esu.core.config.EsuLocale
 import io.github.rothes.esu.core.configuration.ConfigLoader
 import io.github.rothes.esu.core.configuration.MultiLocaleConfiguration
 import io.github.rothes.esu.lib.configurate.objectmapping.meta.PostProcess
@@ -17,7 +17,7 @@ object VelocityEsuLocale: EsuLocale<VelocityLocaleData>() {
     }
 
     override fun load(): MultiLocaleConfiguration<VelocityLocaleData> = ConfigLoader.loadMulti(
-        EsuCore.instance.baseConfigPath().resolve("lang"), "en_us.yml"
+        EsuCore.instance.baseConfigPath().resolve("lang"), "en_us"
     )
 
     class VelocityLocaleData: BaseEsuLocaleData() {