Merge branch 'develop'

MokokoMC · Oct 24, 2024 · 638f07b · 638f07b
2 parents ab93a50 + 6e514e0
commit 638f07b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "me.uni0305"
-version = "0.1.0"
+version = "0.1.1"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/me/uni0305/oraxen/OraxenExtrasPlugin.kt b/src/main/kotlin/me/uni0305/oraxen/OraxenExtrasPlugin.kt
@@ -1,6 +1,5 @@
 package me.uni0305.oraxen
 
-import me.uni0305.oraxen.config.ExternalPackImportConfig
 import me.uni0305.oraxen.service.ExternalPackImportService
 import org.bukkit.plugin.java.JavaPlugin
 
@@ -13,8 +12,7 @@ class OraxenExtrasPlugin : JavaPlugin() {
         saveDefaultConfig()
         reloadConfig()
 
-        val externalPackImportConfig = ExternalPackImportConfig(config)
-        externalPackImportService = ExternalPackImportService(externalPackImportConfig)
+        externalPackImportService = ExternalPackImportService(this)
         OraxenExtrasCommand(this)
     }
 

diff --git a/src/main/kotlin/me/uni0305/oraxen/service/ExternalPackImportService.kt b/src/main/kotlin/me/uni0305/oraxen/service/ExternalPackImportService.kt
@@ -2,10 +2,13 @@ package me.uni0305.oraxen.service
 
 import io.th0rgal.oraxen.api.OraxenPack
 import me.uni0305.oraxen.config.ExternalPackImportConfig
+import org.bukkit.plugin.java.JavaPlugin
 import org.slf4j.LoggerFactory
 
-class ExternalPackImportService(private val config: ExternalPackImportConfig) {
+class ExternalPackImportService(private val plugin: JavaPlugin) {
     private val logger = LoggerFactory.getLogger(this.javaClass)
+    private val config: ExternalPackImportConfig
+        get() = ExternalPackImportConfig(plugin.config)
 
     fun getPacks() = if (config.isEnabled()) config.getPacks() else emptyList()