1 files changed, 13 insertions, 47 deletions
diff --git a/src/main/kotlin/gui/entity/GuiPlayer.kt b/src/main/kotlin/gui/entity/GuiPlayer.kt
index f728dbf..b53f68c 100644
--- a/src/main/kotlin/gui/entity/GuiPlayer.kt
+++ b/src/main/kotlin/gui/entity/GuiPlayer.kt
@@ -1,62 +1,28 @@
 package moe.nea.firmament.gui.entity
 
-import com.mojang.authlib.GameProfile
-import java.util.UUID
-import net.minecraft.client.network.AbstractClientPlayerEntity
-import net.minecraft.client.util.DefaultSkinHelper
-import net.minecraft.client.util.SkinTextures
-import net.minecraft.client.util.SkinTextures.Model
-import net.minecraft.client.world.ClientWorld
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Vec3d
-import net.minecraft.world.World
+import net.minecraft.client.entity.ClientMannequin
+import net.minecraft.client.resources.DefaultPlayerSkin
+import net.minecraft.client.multiplayer.ClientLevel
+import net.minecraft.world.entity.player.PlayerSkin
+import net.minecraft.world.level.Level
+import moe.nea.firmament.util.MC
 
-/**
- * @see moe.nea.firmament.init.EarlyRiser
- */
-fun makeGuiPlayer(world: World): GuiPlayer {
-	val constructor = GuiPlayer::class.java.getDeclaredConstructor(
-		World::class.java,
-		BlockPos::class.java,
-		Float::class.javaPrimitiveType,
-		GameProfile::class.java
-	)
-	val player = constructor.newInstance(world, BlockPos.ORIGIN, 0F, GameProfile(UUID.randomUUID(), "Linnea"))
-	player.postInit()
+fun makeGuiPlayer(world: Level): GuiPlayer {
+	val player = GuiPlayer(MC.instance.level!!)
 	return player
 }
 
-class GuiPlayer(world: ClientWorld?, profile: GameProfile?) : AbstractClientPlayerEntity(world, profile) {
+class GuiPlayer(world: ClientLevel?) : ClientMannequin(world, MC.instance.playerSkinRenderCache()) {
 	override fun isSpectator(): Boolean {
 		return false
 	}
 
-	fun postInit() {
-		skinTexture = DefaultSkinHelper.getSkinTextures(this.getUuid()).texture
-		lastVelocity = Vec3d.ZERO
-		model = Model.WIDE
-	}
-
-	override fun isCreative(): Boolean {
-		return false
-	}
-
-	override fun shouldRenderName(): Boolean {
+	override fun shouldShowName(): Boolean {
 		return false
 	}
 
-	lateinit var skinTexture: Identifier
-	var capeTexture: Identifier? = null
-	var model: Model = Model.WIDE
-	override fun getSkinTextures(): SkinTextures {
-		return SkinTextures(
-			skinTexture,
-			null,
-			capeTexture,
-			null,
-			model,
-			true
-		)
+	var skinTextures: PlayerSkin = DefaultPlayerSkin.get(this.uuid) // TODO: 1.21.10
+	override fun getSkin(): PlayerSkin {
+		return skinTextures
 	}
 }