code cleanup, and used SkyHanni framework at more spots

1 files changed, 18 insertions, 23 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/SkyhanniPlayersWhenTheySeeUngiftedPlayers.kt b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportnitiesFeatures.kt
index e720e3e30..6679f402c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/SkyhanniPlayersWhenTheySeeUngiftedPlayers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportnitiesFeatures.kt
@@ -6,49 +6,45 @@ import at.hannibal2.skyhanni.events.EntityCustomNameUpdateEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RenderMobColoredEvent
 import at.hannibal2.skyhanni.events.withAlpha
+import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.EntityUtils.isNPC
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
+import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.getLorenzVec
-import net.minecraft.client.Minecraft
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraftforge.event.entity.EntityJoinWorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
-object SkyhanniPlayersWhenTheySeeUngiftedPlayers {
-    val playerList: MutableSet<String>?
+object UniqueGiftingOpportnitiesFeatures {
+    private val playerList: MutableSet<String>?
         get() = ProfileStorageData.playerSpecific?.playersThatHaveBeenGifted
 
-    val pattern = "§6\\+1 Unique Gift given! To ([^§]+)§r§6!".toPattern()
-    fun hasGiftedPlayer(player: EntityPlayer): Boolean =
-        playerList?.contains(player.name) == true
+    private val pattern = "§6\\+1 Unique Gift given! To ([^§]+)§r§6!".toPattern()
 
-    fun addGiftedPlayer(playerName: String): Unit {
+    private fun hasGiftedPlayer(player: EntityPlayer) = playerList?.contains(player.name) == true
+
+    private fun addGiftedPlayer(playerName: String) {
         playerList?.add(playerName)
     }
 
-    val config get() = SkyHanniMod.feature.event.winter.giftingOpportunities
+    private val config get() = SkyHanniMod.feature.event.winter.giftingOpportunities
 
-    fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && config.highlightSpecialNeedsPlayers &&
-            (Minecraft.getMinecraft().thePlayer?.heldItem?.getInternalName()?.endsWith("_GIFT") == true
-                || (!config.highlighWithGiftOnly))
-    }
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled &&
+        (InventoryUtils.itemInHandId.endsWith("_GIFT")
+            || !config.highlighWithGiftOnly)
 
-    val hasNotGiftedNametag = "§a§lꤥ"
-    val hasGiftedNametag = "§c§lꤥ"
+    private val hasNotGiftedNametag = "§a§lꤥ"
+    private val hasGiftedNametag = "§c§lꤥ"
 
-    fun analyzeArmorStand(entity: EntityArmorStand) {
+    private fun analyzeArmorStand(entity: EntityArmorStand) {
         if (!config.useArmorStandDetection) return
-        val world = Minecraft.getMinecraft().theWorld ?: return
         if (entity.name != hasGiftedNametag) return
-        val matchedPlayer =
-            world.playerEntities.singleOrNull {
-                !it.isNPC() && it.getLorenzVec().distance(entity.getLorenzVec()) < 2
-            } ?: return
+
+        val matchedPlayer = EntityUtils.getEntitiesNearby<EntityPlayer>(entity.getLorenzVec(), 2.0)
+            .singleOrNull { !it.isNPC() } ?: return
         addGiftedPlayer(matchedPlayer.name)
 
     }
@@ -73,7 +69,6 @@ object SkyhanniPlayersWhenTheySeeUngiftedPlayers {
             event.color = LorenzColor.DARK_GREEN.toColor().withAlpha(127)
     }
 
-
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         pattern.matchMatcher(event.message) {