From 414e31de34ebbfa1245e4352ead2f7da3b245642 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Thu, 2 Jun 2022 23:54:01 +0200
Subject: [PATCH] eros: avatars: option to render hat above head

---
 .../profile/profiles/eros/general/GeneralC.kt |  6 +++++
 .../gui/eros/util/JavaFXAccountUtil.kt        | 22 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/general/GeneralC.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/general/GeneralC.kt
index fe637e99b..c77666a2b 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/general/GeneralC.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/general/GeneralC.kt
@@ -43,4 +43,10 @@ class GeneralC {
      * If profile is not set or not found, the global default profile is used
      */
     var profileOverrides: MutableMap<ResourceLocation, String> by mapDelegate()
+
+
+    /**
+     * Renders the skin overlay (hat) above the head (used for avatars)
+     */
+    var renderSkinOverlay by delegate(true)
 }
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXAccountUtil.kt b/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXAccountUtil.kt
index d229392c3..1c8a7fb66 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXAccountUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXAccountUtil.kt
@@ -13,13 +13,17 @@
 
 package de.bixilon.minosoft.gui.eros.util
 
+import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.data.accounts.Account
 import javafx.scene.image.Image
+import javafx.scene.image.PixelReader
+import javafx.scene.image.PixelWriter
 import javafx.scene.image.WritableImage
 import java.io.ByteArrayInputStream
 
 
 object JavaFXAccountUtil {
+    const val HEAD_SIZE = 8
 
     val Account.avatar: Image
         get() {
@@ -28,7 +32,23 @@ object JavaFXAccountUtil {
             }
             return this.properties?.textures?.skin?.read()?.let {
                 val image = Image(ByteArrayInputStream(it), 0.0, 0.0, true, false)
-                return@let WritableImage(image.pixelReader, 8, 8, 8, 8)
+                val written = WritableImage(image.pixelReader, HEAD_SIZE, HEAD_SIZE, 8, 8)
+                if (ErosProfileManager.selected.general.renderSkinOverlay) {
+                    written.pixelWriter.writeNonTransparent(0, 0, HEAD_SIZE, HEAD_SIZE, image.pixelReader, 40, 8)
+                }
+                return@let written
             } ?: JavaFXUtil.MINOSOFT_LOGO
         }
+
+    private fun PixelWriter.writeNonTransparent(dX: Int, dY: Int, width: Int, height: Int, reader: PixelReader, sX: Int, sY: Int) {
+        for (x in 0 until width) {
+            for (y in 0 until height) {
+                val color = reader.getArgb(sX + x, sY + y)
+                if (color ushr 24 == 0) {
+                    continue
+                }
+                setArgb(dX + x, dY + y, color)
+            }
+        }
+    }
 }