AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

eros: avatars: option to render hat above head

Browse Source
This commit is contained in:
Bixilon 2022-06-02 23:54:01 +02:00
parent 180afd16ba
commit 414e31de34
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/general/GeneralC.kt
View File

@ -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)
}

22
src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXAccountUtil.kt
View File

@ -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)
}
}
}
}