#392 Fixed placeholder api resolving in gui. --snapshot

Shynixn · Jul 13, 2020 · bc13d77 · bc13d77
1 parent f99c545
commit bc13d77
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...rc/main/kotlin/com/github/shynixn/petblocks/core/logic/business/service/GUIServiceImpl.kt b/...rc/main/kotlin/com/github/shynixn/petblocks/core/logic/business/service/GUIServiceImpl.kt
@@ -2,6 +2,7 @@
 
 package com.github.shynixn.petblocks.core.logic.business.service
 
+import com.github.shynixn.petblocks.api.PetBlocksApi
 import com.github.shynixn.petblocks.api.business.enumeration.*
 import com.github.shynixn.petblocks.api.business.localization.Messages
 import com.github.shynixn.petblocks.api.business.service.*
@@ -55,11 +56,13 @@ class GUIServiceImpl @Inject constructor(
     private val headDatabaseService: DependencyHeadDatabaseService,
     private val messageService: MessageService,
     private val proxyService: ProxyService,
-    private val guiPetStorageService: GUIPetStorageService
+    private val guiPetStorageService: GUIPetStorageService,
+    private val dependencyService: DependencyService
 ) : GUIService {
 
     private val clickProtection = ArrayList<Any>()
     private val pageCache = HashMap<Any, GuiPlayerCache>()
+    private var placeHolderService: DependencyPlaceholderApiService? = null
 
     private var collectedMinecraftHeadsMessage = lazy {
         chatMessage {
@@ -206,6 +209,10 @@ class GUIServiceImpl @Inject constructor(
     override fun <P> open(player: P, pageName: String?) {
         require(player is Any)
 
+        if (placeHolderService == null && dependencyService.isInstalled(PluginDependency.PLACEHOLDERAPI)) {
+            placeHolderService = PetBlocksApi.resolve(DependencyPlaceholderApiService::class.java)
+        }
+
         proxyService.closeInventory(player)
         var page = pageName
 
@@ -343,6 +350,11 @@ class GUIServiceImpl @Inject constructor(
                     val guiIcon = GuiIconEntity()
                     guiIcon.displayName = petMeta.displayName
 
+                    if (placeHolderService != null) {
+                        guiIcon.displayName =
+                            placeHolderService!!.applyPlaceHolders(player, petMeta.displayName).translateChatColors()
+                    }
+
                     with(guiIcon.skin) {
                         typeName = petMeta.skin.typeName
                         dataValue = petMeta.skin.dataValue