Protects name collision.

toxicity188 · toxicity188 · commit b769ff451705 · 2024-04-22T01:32:11.000+09:00
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/background/HudBackground.kt b/dist/src/main/kotlin/kr/toxicity/hud/background/HudBackground.kt
@@ -1,14 +1,16 @@
 package kr.toxicity.hud.background
 
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.image.ImageLocation
 import kr.toxicity.hud.image.LoadedImage
 
 class HudBackground(
+    override val path: String,
     val name: String,
 
     val left: LoadedImage,
     val right: LoadedImage,
     val body: LoadedImage,
 
     val location: ImageLocation,
-)
+): HudConfiguration
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/configuration/HudConfiguration.kt b/dist/src/main/kotlin/kr/toxicity/hud/configuration/HudConfiguration.kt
@@ -0,0 +1,5 @@
+package kr.toxicity.hud.configuration
+
+interface HudConfiguration {
+    val path: String
+}
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/hud/HudImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/hud/HudImpl.kt
@@ -6,6 +6,7 @@ import kr.toxicity.hud.api.component.WidthComponent
 import kr.toxicity.hud.api.hud.Hud
 import kr.toxicity.hud.api.player.HudPlayer
 import kr.toxicity.hud.api.update.UpdateEvent
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.image.ImageLocation
 import kr.toxicity.hud.layout.LayoutAnimationType
 import kr.toxicity.hud.manager.ConfigManager
@@ -18,7 +19,12 @@ import kr.toxicity.hud.util.*
 import net.kyori.adventure.key.Key
 import org.bukkit.configuration.ConfigurationSection
 
-class HudImpl(private val internalName: String, file: List<String>, section: ConfigurationSection) : Hud {
+class HudImpl(
+    override val path: String,
+    private val internalName: String,
+    file: List<String>,
+    section: ConfigurationSection
+): Hud, HudConfiguration {
     companion object {
         const val DEFAULT_BIT = 13
         const val MAX_BIT = 23 - DEFAULT_BIT
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/image/HudImage.kt b/dist/src/main/kotlin/kr/toxicity/hud/image/HudImage.kt
@@ -1,15 +1,17 @@
 package kr.toxicity.hud.image
 
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.manager.ListenerManagerImpl
 import kr.toxicity.hud.util.toConditions
 import org.bukkit.configuration.ConfigurationSection
 
 class HudImage(
+    override val path: String,
     val name: String,
     val image: List<NamedLoadedImage>,
     val type: ImageType,
     setting: ConfigurationSection
-) {
+): HudConfiguration {
     val conditions = setting.toConditions()
     val listener = setting.getConfigurationSection("listener")?.let {
         ListenerManagerImpl.getListener(it)
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/layout/LayoutGroup.kt b/dist/src/main/kotlin/kr/toxicity/hud/layout/LayoutGroup.kt
@@ -1,5 +1,6 @@
 package kr.toxicity.hud.layout
 
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.equation.AnimationLocation
 import kr.toxicity.hud.equation.TEquation
 import kr.toxicity.hud.image.ImageLocation
@@ -9,7 +10,10 @@ import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.configuration.ConfigurationSection
 import java.text.DecimalFormat
 
-class LayoutGroup(section: ConfigurationSection) {
+class LayoutGroup(
+    override val path: String,
+    section: ConfigurationSection
+): HudConfiguration {
 
     private val loc = ImageLocation(section)
 
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/BackgroundManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/BackgroundManager.kt
@@ -43,8 +43,9 @@ object BackgroundManager: BetterHudManager {
                                 image.toByteArray()
                             }
                         }
-                    backgroundMap.putSync(name) {
+                    backgroundMap.putSync("background", name) {
                         HudBackground(
+                            it.path,
                             name,
                             getImage("left"),
                             getImage("right"),
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/HudManagerImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/HudManagerImpl.kt
@@ -24,8 +24,8 @@ object HudManagerImpl: BetterHudManager, HudManager {
         }
         DATA_FOLDER.subFolder("huds").forEachAllYamlAsync({ file, s, configurationSection ->
             runCatching {
-                hudMap.putSync(s) {
-                    HudImpl(s, hudFolder, configurationSection)
+                hudMap.putSync("hud", s) {
+                    HudImpl(file.path, s, hudFolder, configurationSection)
                 }
             }.onFailure { e ->
                 warn("Unable to load this hud: $s in ${file.name}")
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/ImageManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/ImageManager.kt
@@ -33,6 +33,7 @@ object ImageManager: BetterHudManager {
                 val image = when (val type = ImageType.valueOf(configurationSection.getString("type").ifNull("type value not set.").uppercase())) {
                     ImageType.SINGLE -> {
                         HudImage(
+                            file.path,
                             s,
                             listOf(NamedLoadedImage(
                                 "$s.png",
@@ -52,6 +53,7 @@ object ImageManager: BetterHudManager {
                             }.getOrNull()
                         } ?: SplitType.LEFT)
                         HudImage(
+                            file.path,
                             s,
                             splitType.split(s, File(assets, configurationSection.getString("file").ifNull("file value not set."))
                                 .toImage()
@@ -63,6 +65,7 @@ object ImageManager: BetterHudManager {
                     }
                     ImageType.SEQUENCE -> {
                         HudImage(
+                            file.path,
                             s,
                             configurationSection.getStringList("files").ifEmpty {
                                 warn("files is empty.")
@@ -79,7 +82,7 @@ object ImageManager: BetterHudManager {
                         )
                     }
                 }
-                imageMap.putSync(s) {
+                imageMap.putSync("image", s) {
                     image
                 }
             }.onFailure { e ->
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/LayoutManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/LayoutManager.kt
@@ -23,8 +23,8 @@ object LayoutManager: BetterHudManager {
         }
         DATA_FOLDER.subFolder("layouts").forEachAllYamlAsync({ file, s, configurationSection ->
             runCatching {
-                layoutMap.putSync(s) {
-                    LayoutGroup(configurationSection)
+                layoutMap.putSync("layout", s) {
+                    LayoutGroup(file.path, configurationSection)
                 }
             }.onFailure { e ->
                 warn("Unable to load this layout: $s in ${file.name}")
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/PlayerHeadManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/PlayerHeadManager.kt
@@ -45,21 +45,21 @@ object PlayerHeadManager: BetterHudManager {
         }
         DATA_FOLDER.subFolder("heads").forEachAllYamlAsync({ file, s, configurationSection ->
             runCatching {
-                val head = HudHead(s , configurationSection)
-                val pixel = head.pixel
-                val targetFile = ArrayList(saveLocation).apply {
-                    add("pixel_$pixel.png")
-                }
-                PackGenerator.addTask(targetFile) {
-                    BufferedImage(pixel, pixel, BufferedImage.TYPE_INT_ARGB).apply {
-                        createGraphics().run {
-                            color = Color.WHITE
-                            fillRect(0, 0, pixel, pixel)
-                            dispose()
-                        }
-                    }.toByteArray()
-                }
-                headMap.putSync(head.name) {
+                headMap.putSync("head", s) {
+                    val head = HudHead(file.path, s, configurationSection)
+                    val pixel = head.pixel
+                    val targetFile = ArrayList(saveLocation).apply {
+                        add("pixel_$pixel.png")
+                    }
+                    PackGenerator.addTask(targetFile) {
+                        BufferedImage(pixel, pixel, BufferedImage.TYPE_INT_ARGB).apply {
+                            createGraphics().run {
+                                color = Color.WHITE
+                                fillRect(0, 0, pixel, pixel)
+                                dispose()
+                            }
+                        }.toByteArray()
+                    }
                     head
                 }
             }.onFailure { e ->
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/PopupManagerImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/PopupManagerImpl.kt
@@ -22,8 +22,8 @@ object PopupManagerImpl: BetterHudManager, PopupManager {
         }
         DATA_FOLDER.subFolder("popups").forEachAllYamlAsync({ file, s, configurationSection ->
             runCatching {
-                popupMap.putSync(s) {
-                    PopupImpl(save, s, configurationSection)
+                popupMap.putSync("popup", s) {
+                    PopupImpl(file.path, save, s, configurationSection)
                 }
             }.onFailure { e ->
                 warn("Unable to load this popup: $s in ${file.name}")
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/TextManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/TextManager.kt
@@ -68,8 +68,8 @@ object TextManager: BetterHudManager {
                     Font.createFont(Font.TRUETYPE_FONT, it)
                 } ?: BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics().font).deriveFont(scale.toFloat())
                 val saveName = "${fontTarget?.nameWithoutExtension ?: s}_$scale"
-                textMap.putSync(s) {
-                    parseFont(s, saveName, fontFile, scale, globalSaveFolder, HashMap<String, LocatedImage>().apply {
+                textMap.putSync("text", s) {
+                    parseFont(file.path, s, saveName, fontFile, scale, globalSaveFolder, HashMap<String, LocatedImage>().apply {
                         section.getConfigurationSection("images")?.forEachSubConfiguration { key, configurationSection ->
                             put(key, LocatedImage(
                                 File(assetsFolder, configurationSection.getString("name").ifNull("image does not set: $key"))
@@ -111,7 +111,7 @@ object TextManager: BetterHudManager {
                     }
                 }.getOrNull() else null) ?: BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics().font
             }.deriveFont(configScale.toFloat())
-            val parseDefault = parseFont("default", "default", defaultFont, configScale, ArrayList(resource.textures).apply {
+            val parseDefault = parseFont("", "default", "default", defaultFont, configScale, ArrayList(resource.textures).apply {
                 add("font")
             }, emptyMap(),  ConditionBuilder.alwaysTrue, fontConfig.getBoolean("merge-default-bitmap", true))
             val heightMultiply = configHeight.toDouble() / parseDefault.height.toDouble()
@@ -181,6 +181,7 @@ object TextManager: BetterHudManager {
     }
 
     private fun parseFont(
+        path: String,
         s: String,
         saveName: String,
         fontFile: Font,
@@ -263,7 +264,7 @@ object TextManager: BetterHudManager {
                 }
             }
         }
-        return HudText(s, saveName, height, textList, images, charWidthMap, condition)
+        return HudText(path, s, saveName, height, textList, images, charWidthMap, condition)
     }
 
     override fun end() {
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/pack/PackGenerator.kt b/dist/src/main/kotlin/kr/toxicity/hud/pack/PackGenerator.kt
@@ -16,6 +16,7 @@ import java.util.zip.ZipOutputStream
 
 object PackGenerator {
     private val tasks = TreeMap<String, PackFile>()
+
     @Volatile
     private var beforeByte = 0L
     private val decimal = DecimalFormat("#,###.###")
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/player/HudHead.kt b/dist/src/main/kotlin/kr/toxicity/hud/player/HudHead.kt
@@ -1,9 +1,14 @@
 package kr.toxicity.hud.player
 
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.util.toConditions
 import org.bukkit.configuration.ConfigurationSection
 
-class HudHead(val name: String, section: ConfigurationSection) {
+class HudHead(
+    override val path: String,
+    val name: String,
+    section: ConfigurationSection
+): HudConfiguration {
     val pixel = section.getInt("pixel", 1).coerceAtLeast(1)
     val conditions = section.toConditions()
 }
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/popup/PopupImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/popup/PopupImpl.kt
@@ -6,6 +6,7 @@ import kr.toxicity.hud.api.popup.Popup
 import kr.toxicity.hud.api.popup.PopupSortType
 import kr.toxicity.hud.api.popup.PopupUpdater
 import kr.toxicity.hud.api.update.UpdateEvent
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.equation.EquationPairLocation
 import kr.toxicity.hud.image.ImageLocation
 import kr.toxicity.hud.manager.*
@@ -16,10 +17,11 @@ import java.util.*
 import kotlin.collections.ArrayList
 
 class PopupImpl(
+    override val path: String,
     file: List<String>,
     val internalName: String,
     section: ConfigurationSection
-): Popup {
+): Popup, HudConfiguration {
     val gui = GuiLocation(section)
     val move = section.getConfigurationSection("move")?.let {
         EquationPairLocation(it)
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/text/HudText.kt b/dist/src/main/kotlin/kr/toxicity/hud/text/HudText.kt
@@ -1,14 +1,16 @@
 package kr.toxicity.hud.text
 
+import kr.toxicity.hud.configuration.HudConfiguration
 import kr.toxicity.hud.image.LocatedImage
 import kr.toxicity.hud.placeholder.ConditionBuilder
 
 class HudText(
+    override val path: String,
     val name: String,
     val fontName: String,
     val height: Int,
     val array: List<HudTextArray>,
     val images: Map<String, LocatedImage>,
     val charWidth: Map<Char, Int>,
     val conditions: ConditionBuilder
-)
+): HudConfiguration
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/util/Maps.kt b/dist/src/main/kotlin/kr/toxicity/hud/util/Maps.kt
@@ -1,8 +1,39 @@
 package kr.toxicity.hud.util
 
-fun <K, V> MutableMap<K, V>.putSync(k: K, v: () -> V) {
-    val get = v()
-    synchronized(this) {
-        put(k, get)
+import kr.toxicity.hud.configuration.HudConfiguration
+import java.util.Collections
+import java.util.HashSet
+import java.util.concurrent.ConcurrentHashMap
+
+private val CACHE_MAP = ConcurrentHashMap<String, MutableSet<String>>()
+
+private fun getCache(name: String) = CACHE_MAP.computeIfAbsent(name) {
+    Collections.synchronizedSet(HashSet())
+}
+
+fun <V: HudConfiguration> MutableMap<String, V>.putSync(name: String, k: String, v: () -> V) {
+    val cache = getCache(name)
+    fun warn() = warn("Name collision found: $k in $name")
+    fun remove() {
+        cache.remove(k)
+        if (cache.isEmpty()) CACHE_MAP.remove(name)
+    }
+    if (!cache.add(k)) return warn()
+    runCatching {
+        synchronized(this) {
+            get(k)
+        }?.let {
+            warn()
+            return remove()
+        }
+        val get = v()
+        synchronized(this) {
+            putIfAbsent(k, get)?.let {
+                warn("Error has been occurred: ${it.path} and ${get.path}")
+            }
+            remove()
+        }
+    }.onFailure {
+        remove()
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ object BackgroundManager: BetterHudManager {`
`43`	`43`	`image.toByteArray()`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`- backgroundMap.putSync(name) {`
	`46`	`+ backgroundMap.putSync("background", name) {`
`47`	`47`	`HudBackground(`
	`48`	`+ it.path,`
`48`	`49`	`name,`
`49`	`50`	`getImage("left"),`
`50`	`51`	`getImage("right"),`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ object HudManagerImpl: BetterHudManager, HudManager {`
`24`	`24`	`}`
`25`	`25`	`DATA_FOLDER.subFolder("huds").forEachAllYamlAsync({ file, s, configurationSection ->`
`26`	`26`	`runCatching {`
`27`		`- hudMap.putSync(s) {`
`28`		`- HudImpl(s, hudFolder, configurationSection)`
	`27`	`+ hudMap.putSync("hud", s) {`
	`28`	`+ HudImpl(file.path, s, hudFolder, configurationSection)`
`29`	`29`	`}`
`30`	`30`	`}.onFailure { e ->`
`31`	`31`	`warn("Unable to load this hud: $s in ${file.name}")`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ object LayoutManager: BetterHudManager {`
`23`	`23`	`}`
`24`	`24`	`DATA_FOLDER.subFolder("layouts").forEachAllYamlAsync({ file, s, configurationSection ->`
`25`	`25`	`runCatching {`
`26`		`- layoutMap.putSync(s) {`
`27`		`- LayoutGroup(configurationSection)`
	`26`	`+ layoutMap.putSync("layout", s) {`
	`27`	`+ LayoutGroup(file.path, configurationSection)`
`28`	`28`	`}`
`29`	`29`	`}.onFailure { e ->`
`30`	`30`	`warn("Unable to load this layout: $s in ${file.name}")`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ object PopupManagerImpl: BetterHudManager, PopupManager {`
`22`	`22`	`}`
`23`	`23`	`DATA_FOLDER.subFolder("popups").forEachAllYamlAsync({ file, s, configurationSection ->`
`24`	`24`	`runCatching {`
`25`		`- popupMap.putSync(s) {`
`26`		`- PopupImpl(save, s, configurationSection)`
	`25`	`+ popupMap.putSync("popup", s) {`
	`26`	`+ PopupImpl(file.path, save, s, configurationSection)`
`27`	`27`	`}`
`28`	`28`	`}.onFailure { e ->`
`29`	`29`	`warn("Unable to load this popup: $s in ${file.name}")`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ object TextManager: BetterHudManager {`
`68`	`68`	`Font.createFont(Font.TRUETYPE_FONT, it)`
`69`	`69`	`} ?: BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics().font).deriveFont(scale.toFloat())`
`70`	`70`	`val saveName = "${fontTarget?.nameWithoutExtension ?: s}_$scale"`
`71`		`- textMap.putSync(s) {`
`72`		`- parseFont(s, saveName, fontFile, scale, globalSaveFolder, HashMap<String, LocatedImage>().apply {`
	`71`	`+ textMap.putSync("text", s) {`
	`72`	`+ parseFont(file.path, s, saveName, fontFile, scale, globalSaveFolder, HashMap<String, LocatedImage>().apply {`
`73`	`73`	`section.getConfigurationSection("images")?.forEachSubConfiguration { key, configurationSection ->`
`74`	`74`	`put(key, LocatedImage(`
`75`	`75`	`File(assetsFolder, configurationSection.getString("name").ifNull("image does not set: $key"))`
`@@ -111,7 +111,7 @@ object TextManager: BetterHudManager {`
`111`	`111`	`}`
`112`	`112`	`}.getOrNull() else null) ?: BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics().font`
`113`	`113`	`}.deriveFont(configScale.toFloat())`
`114`		`- val parseDefault = parseFont("default", "default", defaultFont, configScale, ArrayList(resource.textures).apply {`
	`114`	`+ val parseDefault = parseFont("", "default", "default", defaultFont, configScale, ArrayList(resource.textures).apply {`
`115`	`115`	`add("font")`
`116`	`116`	`}, emptyMap(), ConditionBuilder.alwaysTrue, fontConfig.getBoolean("merge-default-bitmap", true))`
`117`	`117`	`val heightMultiply = configHeight.toDouble() / parseDefault.height.toDouble()`
`@@ -181,6 +181,7 @@ object TextManager: BetterHudManager {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`private fun parseFont(`
	`184`	`+ path: String,`
`184`	`185`	`s: String,`
`185`	`186`	`saveName: String,`
`186`	`187`	`fontFile: Font,`
`@@ -263,7 +264,7 @@ object TextManager: BetterHudManager {`
`263`	`264`	`}`
`264`	`265`	`}`
`265`	`266`	`}`
`266`		`- return HudText(s, saveName, height, textList, images, charWidthMap, condition)`
	`267`	`+ return HudText(path, s, saveName, height, textList, images, charWidthMap, condition)`
`267`	`268`	`}`
`268`	`269`
`269`	`270`	`override fun end() {`