From b653c179b7ac5d510f0e26cc4bdd25f7b2e8692a Mon Sep 17 00:00:00 2001
From: Alex Zenla <alex@fork.run>
Date: Sat, 28 Jan 2023 22:09:07 -0800
Subject: [PATCH] Fix main classes and authors.

---
 .../src/main/resources/plugin.yml             |  3 +-
 .../src/main/resources/plugin.yml             |  3 +-
 foundation-core/src/main/resources/plugin.yml |  3 +-
 foundation-heimdall/build.gradle.kts          |  1 +
 .../heimdall/plugin/HeimdallPlugin.kt         | 32 ++-----------------
 .../src/main/resources/plugin.yml             | 10 +++---
 tool-gjallarhorn/build.gradle.kts             |  2 +-
 7 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/foundation-bifrost/src/main/resources/plugin.yml b/foundation-bifrost/src/main/resources/plugin.yml
index d60396f..a8af31f 100644
--- a/foundation-bifrost/src/main/resources/plugin.yml
+++ b/foundation-bifrost/src/main/resources/plugin.yml
@@ -7,4 +7,5 @@ load: STARTUP
 depend:
   - Foundation
 authors:
-  - kubelet
+  - kubeliv
+  - azenla
diff --git a/foundation-chaos/src/main/resources/plugin.yml b/foundation-chaos/src/main/resources/plugin.yml
index bafb4d8..22fda02 100644
--- a/foundation-chaos/src/main/resources/plugin.yml
+++ b/foundation-chaos/src/main/resources/plugin.yml
@@ -7,7 +7,8 @@ load: STARTUP
 depend:
   - Foundation
 authors:
-  - kubelet
+  - kubeliv
+  - azenla
 commands:
   chaos:
     description: Chaos Toggle
diff --git a/foundation-core/src/main/resources/plugin.yml b/foundation-core/src/main/resources/plugin.yml
index 83a2240..ea1a4f6 100644
--- a/foundation-core/src/main/resources/plugin.yml
+++ b/foundation-core/src/main/resources/plugin.yml
@@ -5,7 +5,8 @@ api-version: 1.18
 prefix: Foundation
 load: STARTUP
 authors:
-  - kubelet
+  - kubeliv
+  - azenla
 commands:
   fbackup:
     description: Back the server up now
diff --git a/foundation-heimdall/build.gradle.kts b/foundation-heimdall/build.gradle.kts
index 0d25b36..f4add7c 100644
--- a/foundation-heimdall/build.gradle.kts
+++ b/foundation-heimdall/build.gradle.kts
@@ -4,4 +4,5 @@ plugins {
 
 dependencies {
   api(project(":common-heimdall"))
+  compileOnly(project(":foundation-core"))
 }
diff --git a/foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/HeimdallPlugin.kt b/foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/HeimdallPlugin.kt
index 8438992..2e88484 100644
--- a/foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/HeimdallPlugin.kt
+++ b/foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/HeimdallPlugin.kt
@@ -8,6 +8,7 @@ import gay.pizza.foundation.heimdall.plugin.export.ExportChunksCommand
 import com.charleskorn.kaml.Yaml
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
+import gay.pizza.foundation.core.Util
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
@@ -46,7 +47,7 @@ class HeimdallPlugin : JavaPlugin(), Listener {
     val pluginDataPath = dataFolder.toPath()
     pluginDataPath.toFile().mkdir()
 
-    val configPath = copyDefaultConfig<HeimdallPlugin>(
+    val configPath = Util.copyDefaultConfig<HeimdallPlugin>(
       slF4JLogger,
       pluginDataPath,
       "heimdall.yaml"
@@ -169,33 +170,4 @@ class HeimdallPlugin : JavaPlugin(), Listener {
     }
     bufferFlushThread.flush()
   }
-
-  private inline fun <reified T> copyDefaultConfig(log: Logger, targetPath: Path, resourceName: String): Path {
-    if (resourceName.startsWith("/")) {
-      throw IllegalArgumentException("resourceName starts with slash")
-    }
-
-    if (!targetPath.toFile().exists()) {
-      throw Exception("Configuration output path does not exist!")
-    }
-    val outPath = targetPath.resolve(resourceName)
-    val outFile = outPath.toFile()
-    if (outFile.exists()) {
-      log.debug("Configuration file already exists.")
-      return outPath
-    }
-
-    val resourceStream = T::class.java.getResourceAsStream("/$resourceName")
-      ?: throw Exception("Configuration resource does not exist!")
-    val outputStream = outFile.outputStream()
-
-    resourceStream.use {
-      outputStream.use {
-        log.info("Copied default configuration to $outPath")
-        resourceStream.copyTo(outputStream)
-      }
-    }
-
-    return outPath
-  }
 }
diff --git a/foundation-heimdall/src/main/resources/plugin.yml b/foundation-heimdall/src/main/resources/plugin.yml
index a298d0c..8e91eb5 100644
--- a/foundation-heimdall/src/main/resources/plugin.yml
+++ b/foundation-heimdall/src/main/resources/plugin.yml
@@ -1,11 +1,13 @@
-name: Heimdall
+name: Foundation-Heimdall
 version: '${version}'
-main: io.kexec.heimdall.plugin.HeimdallPlugin
+main: gay.pizza.foundation.heimdall.plugin.HeimdallPlugin
 api-version: 1.18
-prefix: Heimdall
+prefix: Foundation-Heimdall
 load: STARTUP
+depend:
+  - Foundation
 authors:
-  - kendfinger
+  - azenla
 commands:
   export_all_chunks:
     description: Export All Chunks
diff --git a/tool-gjallarhorn/build.gradle.kts b/tool-gjallarhorn/build.gradle.kts
index 46ba1d9..bd1e932 100644
--- a/tool-gjallarhorn/build.gradle.kts
+++ b/tool-gjallarhorn/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 
 tasks.jar {
   manifest.attributes(
-    "Main-Class" to "io.kexec.heimdall.tool.MainKt"
+    "Main-Class" to "gay.pizza.foundation.heimdall.tool.MainKt"
   )
 }