From d5ea196840db323f98df079bba2fb7785777bcf4 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 7 Mar 2019 22:57:54 -0800
Subject: [PATCH] added hocon configurate libs to maven

---
 pom.xml                                       |  6 ++++
 .../java/com/gmail/nossr50/config/Config.java | 33 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ce57ef23..ca288e137 100755
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
                             <include>org.apache.tomcat:tomcat-jdbc</include>
                             <include>org.apache.tomcat:tomcat-juli</include>
                             <include>org.bstats:bstats-bukkit</include>
+                            <include>org.spongepowered:configurate-hocon</include>
                             <include>org.spongepowered:configurate-yaml</include>
                             <include>org.spongepowered:configurate-core</include>
                             <!--<include>com.flowpowered:flow-math</include>-->
@@ -183,6 +184,11 @@
             <artifactId>configurate-yaml</artifactId>
             <version>3.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-hocon</artifactId>
+            <version>3.6</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.scm</groupId>
             <artifactId>maven-scm-provider-gitexe</artifactId>
diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
index 8bda926a8..addb48b7c 100644
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -3,7 +3,8 @@ package com.gmail.nossr50.config;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.io.Files;
 import com.google.common.reflect.TypeToken;
-import ninja.leaping.configurate.ConfigurationNode;
+import ninja.leaping.configurate.commented.CommentedConfigurationNode;
+import ninja.leaping.configurate.hocon.HoconConfigurationLoader;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
 import org.yaml.snakeyaml.DumperOptions;
@@ -32,11 +33,11 @@ public abstract class Config implements VersionedConfig, Unload {
 
     /* LOADERS */
 
-    private YAMLConfigurationLoader defaultCopyLoader;
-    private YAMLConfigurationLoader userCopyLoader;
+    private HoconConfigurationLoader defaultCopyLoader;
+    private HoconConfigurationLoader userCopyLoader;
 
-    //private ConfigurationLoader<CommentedConfigurationNode> defaultCopyLoader;
-    //private ConfigurationLoader<CommentedConfigurationNode> userCopyLoader;
+    //private ConfigurationLoader<CommentedCommentedConfigurationNode> defaultCopyLoader;
+    //private ConfigurationLoader<CommentedCommentedConfigurationNode> userCopyLoader;
 
     /* CONFIG FILES */
 
@@ -45,11 +46,11 @@ public abstract class Config implements VersionedConfig, Unload {
 
     /* ROOT NODES */
 
-    private ConfigurationNode userRootNode = null;
-    private ConfigurationNode defaultRootNode = null;
+    private CommentedConfigurationNode userRootNode = null;
+    private CommentedConfigurationNode defaultRootNode = null;
 
     /* CONFIG MANAGER */
-    //private ConfigurationLoader<CommentedConfigurationNode> configManager;
+    //private ConfigurationLoader<CommentedCommentedConfigurationNode> configManager;
 
     public Config(String pathToParentFolder, String relativePath, boolean mergeNewKeys, boolean copyDefaults, boolean removeOldKeys) {
         //TODO: Check if this works...
@@ -126,10 +127,10 @@ public abstract class Config implements VersionedConfig, Unload {
     private void loadConfig()
     {
         try {
-            final ConfigurationNode defaultConfig = this.defaultCopyLoader.load();
+            final CommentedConfigurationNode defaultConfig = this.defaultCopyLoader.load();
             defaultRootNode = defaultConfig;
 
-            final ConfigurationNode userConfig = this.userCopyLoader.load();
+            final CommentedConfigurationNode userConfig = this.userCopyLoader.load();
             userRootNode = userConfig;
 
         } catch (IOException e) {
@@ -138,12 +139,12 @@ public abstract class Config implements VersionedConfig, Unload {
     }
 
     /**
-     * Initializes the YAMLConfigurationLoaders for this config
+     * Initializes the Configuration Loaders for this config
      */
     private void initConfigLoaders()
     {
-        this.defaultCopyLoader = YAMLConfigurationLoader.builder().setPath(resourceConfigCopy.toPath()).setFlowStyle(DumperOptions.FlowStyle.BLOCK).build();
-        this.userCopyLoader = YAMLConfigurationLoader.builder().setPath(resourceUserCopy.toPath()).setFlowStyle(DumperOptions.FlowStyle.BLOCK).build();
+        this.defaultCopyLoader = HoconConfigurationLoader.builder().setPath(resourceConfigCopy.toPath()).build();
+        this.userCopyLoader = HoconConfigurationLoader.builder().setPath(resourceUserCopy.toPath()).build();
     }
 
     /**
@@ -313,7 +314,7 @@ public abstract class Config implements VersionedConfig, Unload {
         if(!removeOldKeys)
             return;
 
-        for(ConfigurationNode configurationNode : defaultRootNode.getChildrenList())
+        for(CommentedConfigurationNode CommentedConfigurationNode : defaultRootNode.getChildrenList())
         {
 
         }
@@ -342,7 +343,7 @@ public abstract class Config implements VersionedConfig, Unload {
      * Returns the root node of this config
      * @return the root node of this config
      */
-    protected ConfigurationNode getUserRootNode() {
+    protected CommentedConfigurationNode getUserRootNode() {
         return userRootNode;
     }
 
@@ -417,7 +418,7 @@ public abstract class Config implements VersionedConfig, Unload {
      * @param path the path to the parent node
      * @return the list of children for the target parent node
      */
-    public List<? extends ConfigurationNode> getChildren(String... path) {
+    public List<? extends CommentedConfigurationNode> getChildren(String... path) {
         return userRootNode.getNode(path).getChildrenList();
     }