Move config resolve to main

LXGaming · May 15, 2018 · d8af47a · d8af47a
1 parent 896513c
commit d8af47a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/io/github/lxgaming/sledgehammer/Sledgehammer.java b/src/main/java/io/github/lxgaming/sledgehammer/Sledgehammer.java
@@ -34,7 +34,7 @@ public class Sledgehammer {
 
     private static Sledgehammer instance;
     private final Logger logger = LoggerFactory.getLogger(Reference.PLUGIN_NAME);
-    private final Configuration configuration = new Configuration(SpongeLaunch.getConfigDir());
+    private final Configuration configuration = new Configuration(SpongeLaunch.getConfigDir().resolve(Reference.PLUGIN_ID + ".conf"));
     private final Map<String, Function<MixinCategory, Boolean>> mixinMappings = Toolbox.newHashMap();
     private PluginContainer pluginContainer;
 

diff --git a/src/main/java/io/github/lxgaming/sledgehammer/configuration/Configuration.java b/src/main/java/io/github/lxgaming/sledgehammer/configuration/Configuration.java
@@ -17,7 +17,6 @@
 package io.github.lxgaming.sledgehammer.configuration;
 
 import io.github.lxgaming.sledgehammer.Sledgehammer;
-import io.github.lxgaming.sledgehammer.util.Reference;
 import ninja.leaping.configurate.ConfigurationOptions;
 import ninja.leaping.configurate.commented.CommentedConfigurationNode;
 import ninja.leaping.configurate.hocon.HoconConfigurationLoader;
@@ -38,7 +37,7 @@ public class Configuration {
 
     public Configuration(Path path) {
         try {
-            this.configurationLoader = HoconConfigurationLoader.builder().setPath(path.resolve(Reference.PLUGIN_ID + ".conf")).build();
+            this.configurationLoader = HoconConfigurationLoader.builder().setPath(path).build();
             this.objectMapper = ObjectMapper.forClass(Config.class).bindToNew();
         } catch (Exception ex) {
             Sledgehammer.getInstance().getLogger().error("Encountered an error initializing {}", getClass().getSimpleName(), ex);