Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

2 files changed, 40 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
index 9dca6d59b..5559ba14a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
@@ -12,7 +12,7 @@ class DungeonChatFilter {
     fun onChatMessage(event: LorenzChatEvent) {
         if (!LorenzUtils.onHypixel) return
 
-        // Workaround since the potion message gets always sent in that moment when skyblock is set as false
+        // Workaround since the potion message gets always sent at that moment when SkyBlock is set as false
         if (!LorenzUtils.inSkyBlock && !event.message.startsWith("§aYour active Potion Effects")) return
         if (!SkyHanniMod.feature.chat.dungeonMessages) return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonTeammateOutlines.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonTeammateOutlines.kt
new file mode 100644
index 000000000..de2ca07e2
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonTeammateOutlines.kt
@@ -0,0 +1,39 @@
+package at.hannibal2.skyhanni.features.dungeon

+

+import at.hannibal2.skyhanni.SkyHanniMod

+import at.hannibal2.skyhanni.events.RenderEntityOutlineEvent

+import at.hannibal2.skyhanni.utils.LorenzUtils

+import net.minecraft.client.Minecraft

+import net.minecraft.client.entity.EntityOtherPlayerMP

+import net.minecraft.client.gui.FontRenderer

+import net.minecraft.entity.Entity

+import net.minecraft.scoreboard.ScorePlayerTeam

+import net.minecraft.scoreboard.Team

+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent

+

+class DungeonTeammateOutlines {

+    private val config get() = SkyHanniMod.feature.dungeon

+

+    @SubscribeEvent

+    fun onRenderEntityOutlines(event: RenderEntityOutlineEvent) {

+        if (isEnabled() && event.type === RenderEntityOutlineEvent.Type.XRAY) {

+            event.queueEntitiesToOutline { entity -> getEntityOutlineColor(entity) }

+        }

+    }

+

+    private fun isEnabled() = LorenzUtils.inSkyBlock && LorenzUtils.inDungeons && config.highlightTeammates

+

+    private fun getEntityOutlineColor(entity: Entity): Int? {

+        if (entity !is EntityOtherPlayerMP || entity.team == null) return null

+

+        // Must be visible on the scoreboard

+        val team = entity.team as ScorePlayerTeam

+        if (team.nameTagVisibility == Team.EnumVisible.NEVER) return null

+

+        val colorFormat = FontRenderer.getFormatFromString(team.colorPrefix)

+        return if (colorFormat.length >= 2)

+            Minecraft.getMinecraft().fontRendererObj.getColorCode(colorFormat[1]);

+        else null

+    }

+

+}
\ No newline at end of file