From cf2e5148430a10c00d6eaa3abe3938863b29e466 Mon Sep 17 00:00:00 2001
From: DaMachinator <damachinator@gmail.com>
Date: Wed, 14 Feb 2018 12:18:57 -0500
Subject: [PATCH] Refactor BaseConfig.reload()

---
 1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt  | 4 ++++
 1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt  | 4 ++++
 1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt  | 4 ++++
 core/src/main/kotlin/matterlink/command/CommandCore.kt | 3 ++-
 core/src/main/kotlin/matterlink/config/BaseConfig.kt   | 3 +++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt b/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
index 25b1269..41dcc33 100644
--- a/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
+++ b/1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
@@ -23,4 +23,8 @@ class MatterLinkConfig(file: File) : BaseConfig(file) {
 
         cfg = this
     }
+
+    override fun reload(file: File) {
+        MatterLinkConfig(file)
+    }
 }
\ No newline at end of file
diff --git a/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt b/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
index 25b1269..41dcc33 100644
--- a/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
+++ b/1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
@@ -23,4 +23,8 @@ class MatterLinkConfig(file: File) : BaseConfig(file) {
 
         cfg = this
     }
+
+    override fun reload(file: File) {
+        MatterLinkConfig(file)
+    }
 }
\ No newline at end of file
diff --git a/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt b/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
index 1d2ef25..ea4525d 100644
--- a/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
+++ b/1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt
@@ -21,4 +21,8 @@ class MatterLinkConfig(file: File) : BaseConfig(file) {
         if (config.hasChanged()) config.save()
         cfg = this
     }
+
+    override fun reload(file: File) {
+        MatterLinkConfig(file)
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/matterlink/command/CommandCore.kt b/core/src/main/kotlin/matterlink/command/CommandCore.kt
index dc053af..4c92b9a 100644
--- a/core/src/main/kotlin/matterlink/command/CommandCore.kt
+++ b/core/src/main/kotlin/matterlink/command/CommandCore.kt
@@ -2,6 +2,7 @@ package matterlink.command
 
 import matterlink.bridge.MessageHandler
 import matterlink.config.BaseConfig
+import matterlink.config.cfg
 import matterlink.instance
 
 object CommandCore {
@@ -23,7 +24,7 @@ object CommandCore {
             }
             "reload" -> {
                 if (MessageHandler.connected) instance.disconnect()
-                BaseConfig.reload()
+                cfg!!.reload(cfg!!.file)
                 if (!MessageHandler.connected) instance.connect()
                 "Bridge config reloaded!"
             }
diff --git a/core/src/main/kotlin/matterlink/config/BaseConfig.kt b/core/src/main/kotlin/matterlink/config/BaseConfig.kt
index c568f16..47e269b 100644
--- a/core/src/main/kotlin/matterlink/config/BaseConfig.kt
+++ b/core/src/main/kotlin/matterlink/config/BaseConfig.kt
@@ -14,6 +14,7 @@ abstract class BaseConfig(val file : File) {
         private val CATEGORY_COMMAND = "command"
         private val CATEGORY_DEATH = "death"
 
+        @Deprecated("Use BaseConfig.loadConfig(file : File) instead")
         fun reload() {
             cfg = cfg!!.javaClass.getConstructor(cfg!!.file.javaClass).newInstance(cfg!!.file)
         }
@@ -257,4 +258,6 @@ abstract class BaseConfig(val file : File) {
                 }
         )
     }
+
+    abstract fun reload(file : File)
 }
\ No newline at end of file