Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some textures not being loaded to due being misaligned base64 data

Browse Source
This commit is contained in:
Linnea Gräf
2024-07-22 16:06:07 +02:00
parent d3895dd911
commit 4585a11434
3 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/kotlin/moe/nea/firmament/util/Base64Util.kt Normal file
View File

@@ -0,0 +1,15 @@
/*
* SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package moe.nea.firmament.util
object Base64Util {
fun String.padToValidBase64(): String {
val align = this.length % 4
if (align == 0) return this
return this + "=".repeat(4 - align)
}
}

6
src/main/kotlin/moe/nea/firmament/util/item/SkullItemData.kt
View File

@@ -23,6 +23,7 @@ import net.minecraft.component.type.ProfileComponent
import net.minecraft.item.ItemStack
import net.minecraft.item.Items
import moe.nea.firmament.Firmament
import moe.nea.firmament.util.Base64Util.padToValidBase64
import moe.nea.firmament.util.assertTrueOr
import moe.nea.firmament.util.json.DashlessUUIDSerializer
import moe.nea.firmament.util.json.InstantAsLongSerializer
@@ -49,14 +50,11 @@ fun GameProfile.setTextures(textures: MinecraftTexturesPayloadKt) {
}
private val propertyTextures = "textures"
fun String.padBase64(): String {
return this + "=".repeat((4 - (this.length % 4)) % 4)
}
fun ItemStack.setEncodedSkullOwner(uuid: UUID, encodedData: String) {
assert(this.item == Items.PLAYER_HEAD)
val gameProfile = GameProfile(uuid, "LameGuy123")
gameProfile.properties.put(propertyTextures, Property(propertyTextures, encodedData.padBase64()))
gameProfile.properties.put(propertyTextures, Property(propertyTextures, encodedData.padToValidBase64()))
this.set(DataComponentTypes.PROFILE, ProfileComponent(gameProfile))
}