Disable auto-merge with pack-type is not 'none'

toxicity188 · Dec 18, 2024 · 9247bbe · 9247bbe
1 parent 8ca91d2
commit 9247bbe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/dist/src/main/kotlin/kr/toxicity/healthbar/BetterHealthBarImpl.kt b/dist/src/main/kotlin/kr/toxicity/healthbar/BetterHealthBarImpl.kt
@@ -5,6 +5,7 @@ import kr.toxicity.healthbar.api.bedrock.BedrockAdapter
 import kr.toxicity.healthbar.api.manager.*
 import kr.toxicity.healthbar.api.modelengine.ModelEngineAdapter
 import kr.toxicity.healthbar.api.nms.NMS
+import kr.toxicity.healthbar.api.pack.PackType
 import kr.toxicity.healthbar.api.plugin.ReloadState
 import kr.toxicity.healthbar.api.scheduler.WrappedScheduler
 import kr.toxicity.healthbar.bedrock.FloodgateAdapter
@@ -132,7 +133,7 @@ class BetterHealthBarImpl : BetterHealthBar() {
                 it.start()
             }
             log.add("Plugin enabled.")
-            if (!CompatibilityManager.usePackTypeNone) scheduler.task {
+            if (!CompatibilityManager.usePackTypeNone || ConfigManagerImpl.packType() != PackType.NONE) scheduler.task {
                 when (reload()) {
                     is ReloadState.Success -> info(*log.toTypedArray())
                     else -> {

diff --git a/dist/src/main/kotlin/kr/toxicity/healthbar/compatibility/NexoCompatibility.kt b/dist/src/main/kotlin/kr/toxicity/healthbar/compatibility/NexoCompatibility.kt
@@ -1,10 +1,12 @@
 package kr.toxicity.healthbar.compatibility
 
 import com.nexomc.nexo.api.events.resourcepack.NexoPrePackGenerateEvent
+import kr.toxicity.healthbar.api.pack.PackType
 import kr.toxicity.healthbar.api.plugin.ReloadState.Failure
 import kr.toxicity.healthbar.api.plugin.ReloadState.OnReload
 import kr.toxicity.healthbar.api.plugin.ReloadState.Success
 import kr.toxicity.healthbar.manager.CompatibilityManager
+import kr.toxicity.healthbar.manager.ConfigManagerImpl
 import kr.toxicity.healthbar.util.*
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
@@ -15,7 +17,8 @@ class NexoCompatibility : Compatibility {
         registerListeners(object : Listener {
             @EventHandler
             fun NexoPrePackGenerateEvent.generate() {
-                when (val reload = PLUGIN.reload()) {
+                ConfigManagerImpl.preReload()
+                if (ConfigManagerImpl.packType() == PackType.NONE) when (val reload = PLUGIN.reload()) {
                     is Success -> {
                         reload.resourcePack.forEach { (key, value) ->
                             addUnknownFile(key, value)

diff --git a/dist/src/main/kotlin/kr/toxicity/healthbar/compatibility/OraxenCompatibility.kt b/dist/src/main/kotlin/kr/toxicity/healthbar/compatibility/OraxenCompatibility.kt
@@ -2,8 +2,10 @@ package kr.toxicity.healthbar.compatibility
 
 import io.th0rgal.oraxen.api.events.OraxenPackGeneratedEvent
 import io.th0rgal.oraxen.utils.VirtualFile
+import kr.toxicity.healthbar.api.pack.PackType
 import kr.toxicity.healthbar.api.plugin.ReloadState.*
 import kr.toxicity.healthbar.manager.CompatibilityManager
+import kr.toxicity.healthbar.manager.ConfigManagerImpl
 import kr.toxicity.healthbar.util.*
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
@@ -15,7 +17,8 @@ class OraxenCompatibility : Compatibility {
         registerListeners(object : Listener {
             @EventHandler
             fun OraxenPackGeneratedEvent.generate() {
-                when (val reload = PLUGIN.reload()) {
+                ConfigManagerImpl.preReload()
+                if (ConfigManagerImpl.packType() == PackType.NONE) when (val reload = PLUGIN.reload()) {
                     is Success -> {
                         reload.resourcePack.forEach { (key, value) ->
                             output.add(

diff --git a/dist/src/main/kotlin/kr/toxicity/healthbar/manager/ConfigManagerImpl.kt b/dist/src/main/kotlin/kr/toxicity/healthbar/manager/ConfigManagerImpl.kt
@@ -41,13 +41,17 @@ object ConfigManagerImpl : ConfigManager, BetterHealthBerManager {
 
     private var bstats: Metrics? = null
 
+    override fun start() {
+        preReload()
+    }
+
     override fun preReload() {
         runWithHandleException("Unable to load config.yml") {
             val config = PluginConfiguration.CONFIG.create()
             debug = config.getBoolean("debug")
             resourcePackObfuscation = config.getBoolean("resource-pack-obfuscation", false)
 
-            packType = if (CompatibilityManager.usePackTypeNone) PackType.NONE else config.getString("pack-type")?.let {
+            packType = config.getString("pack-type")?.let {
                 runCatching {
                     PackType.valueOf(it.uppercase())
                 }.getOrElse {

diff --git a/...ne/current/src/main/kotlin/kr/toxicity/healthbar/modelengine/CurrentModelEngineAdapter.kt b/...ne/current/src/main/kotlin/kr/toxicity/healthbar/modelengine/CurrentModelEngineAdapter.kt
@@ -12,7 +12,7 @@ class CurrentModelEngineAdapter : ModelEngineAdapter {
 
     private val blueprintCache = ExpiringMap.builder()
         .maxSize(256)
-        .expirationPolicy(ExpirationPolicy.CREATED)
+        .expirationPolicy(ExpirationPolicy.ACCESSED)
         .expiration(1, TimeUnit.MINUTES)
         .build<String, Double>()