Fix missing tags in REI renderingupdate

3 files changed, 206 insertions, 200 deletions

diff --git a/src/main/kotlin/gui/entity/EntityRenderer.kt b/src/main/kotlin/gui/entity/EntityRenderer.kt
index ebff1a0..ddb862f 100644
--- a/src/main/kotlin/gui/entity/EntityRenderer.kt
+++ b/src/main/kotlin/gui/entity/EntityRenderer.kt
@@ -1,4 +1,3 @@
-
 package moe.nea.firmament.gui.entity
 
 import com.google.gson.Gson
@@ -15,6 +14,7 @@ import net.minecraft.entity.EntityType
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.SpawnReason
 import net.minecraft.util.Identifier
+import net.minecraft.world.World
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.assertNotNullOr
 import moe.nea.firmament.util.iterate
@@ -22,177 +22,177 @@ import moe.nea.firmament.util.openFirmamentResource
 import moe.nea.firmament.util.render.enableScissorWithTranslation
 
 object EntityRenderer {
-    val fakeWorld = FakeWorld()
-    private fun <T : Entity> t(entityType: EntityType<T>): () -> T {
-        return { entityType.create(fakeWorld, SpawnReason.LOAD)!! }
-    }
+	val fakeWorld: World get() = MC.lastWorld!!
+	private fun <T : Entity> t(entityType: EntityType<T>): () -> T {
+		return { entityType.create(fakeWorld, SpawnReason.LOAD)!! }
+	}
 
-    val entityIds: Map<String, () -> LivingEntity> = mapOf(
-        "Zombie" to t(EntityType.ZOMBIE),
-        "Chicken" to t(EntityType.CHICKEN),
-        "Slime" to t(EntityType.SLIME),
-        "Wolf" to t(EntityType.WOLF),
-        "Skeleton" to t(EntityType.SKELETON),
-        "Creeper" to t(EntityType.CREEPER),
-        "Ocelot" to t(EntityType.OCELOT),
-        "Blaze" to t(EntityType.BLAZE),
-        "Rabbit" to t(EntityType.RABBIT),
-        "Sheep" to t(EntityType.SHEEP),
-        "Horse" to t(EntityType.HORSE),
-        "Eisengolem" to t(EntityType.IRON_GOLEM),
-        "Silverfish" to t(EntityType.SILVERFISH),
-        "Witch" to t(EntityType.WITCH),
-        "Endermite" to t(EntityType.ENDERMITE),
-        "Snowman" to t(EntityType.SNOW_GOLEM),
-        "Villager" to t(EntityType.VILLAGER),
-        "Guardian" to t(EntityType.GUARDIAN),
-        "ArmorStand" to t(EntityType.ARMOR_STAND),
-        "Squid" to t(EntityType.SQUID),
-        "Bat" to t(EntityType.BAT),
-        "Spider" to t(EntityType.SPIDER),
-        "CaveSpider" to t(EntityType.CAVE_SPIDER),
-        "Pigman" to t(EntityType.ZOMBIFIED_PIGLIN),
-        "Ghast" to t(EntityType.GHAST),
-        "MagmaCube" to t(EntityType.MAGMA_CUBE),
-        "Wither" to t(EntityType.WITHER),
-        "Enderman" to t(EntityType.ENDERMAN),
-        "Mooshroom" to t(EntityType.MOOSHROOM),
-        "WitherSkeleton" to t(EntityType.WITHER_SKELETON),
-        "Cow" to t(EntityType.COW),
-        "Dragon" to t(EntityType.ENDER_DRAGON),
-        "Player" to { makeGuiPlayer(fakeWorld) },
-        "Pig" to t(EntityType.PIG),
-        "Giant" to t(EntityType.GIANT),
-    )
-    val entityModifiers: Map<String, EntityModifier> = mapOf(
-        "playerdata" to ModifyPlayerSkin,
-        "equipment" to ModifyEquipment,
-        "riding" to ModifyRiding,
-        "charged" to ModifyCharged,
-        "witherdata" to ModifyWither,
-        "invisible" to ModifyInvisible,
-        "age" to ModifyAge,
-        "horse" to ModifyHorse,
-        "name" to ModifyName,
-    )
+	val entityIds: Map<String, () -> LivingEntity> = mapOf(
+		"Zombie" to t(EntityType.ZOMBIE),
+		"Chicken" to t(EntityType.CHICKEN),
+		"Slime" to t(EntityType.SLIME),
+		"Wolf" to t(EntityType.WOLF),
+		"Skeleton" to t(EntityType.SKELETON),
+		"Creeper" to t(EntityType.CREEPER),
+		"Ocelot" to t(EntityType.OCELOT),
+		"Blaze" to t(EntityType.BLAZE),
+		"Rabbit" to t(EntityType.RABBIT),
+		"Sheep" to t(EntityType.SHEEP),
+		"Horse" to t(EntityType.HORSE),
+		"Eisengolem" to t(EntityType.IRON_GOLEM),
+		"Silverfish" to t(EntityType.SILVERFISH),
+		"Witch" to t(EntityType.WITCH),
+		"Endermite" to t(EntityType.ENDERMITE),
+		"Snowman" to t(EntityType.SNOW_GOLEM),
+		"Villager" to t(EntityType.VILLAGER),
+		"Guardian" to t(EntityType.GUARDIAN),
+		"ArmorStand" to t(EntityType.ARMOR_STAND),
+		"Squid" to t(EntityType.SQUID),
+		"Bat" to t(EntityType.BAT),
+		"Spider" to t(EntityType.SPIDER),
+		"CaveSpider" to t(EntityType.CAVE_SPIDER),
+		"Pigman" to t(EntityType.ZOMBIFIED_PIGLIN),
+		"Ghast" to t(EntityType.GHAST),
+		"MagmaCube" to t(EntityType.MAGMA_CUBE),
+		"Wither" to t(EntityType.WITHER),
+		"Enderman" to t(EntityType.ENDERMAN),
+		"Mooshroom" to t(EntityType.MOOSHROOM),
+		"WitherSkeleton" to t(EntityType.WITHER_SKELETON),
+		"Cow" to t(EntityType.COW),
+		"Dragon" to t(EntityType.ENDER_DRAGON),
+		"Player" to { makeGuiPlayer(fakeWorld) },
+		"Pig" to t(EntityType.PIG),
+		"Giant" to t(EntityType.GIANT),
+	)
+	val entityModifiers: Map<String, EntityModifier> = mapOf(
+		"playerdata" to ModifyPlayerSkin,
+		"equipment" to ModifyEquipment,
+		"riding" to ModifyRiding,
+		"charged" to ModifyCharged,
+		"witherdata" to ModifyWither,
+		"invisible" to ModifyInvisible,
+		"age" to ModifyAge,
+		"horse" to ModifyHorse,
+		"name" to ModifyName,
+	)
 
-    val logger = LogManager.getLogger("Firmament.Entity")
-    fun applyModifiers(entityId: String, modifiers: List<JsonObject>): LivingEntity? {
-        val entityType = assertNotNullOr(entityIds[entityId]) {
-            logger.error("Could not create entity with id $entityId")
-            return null
-        }
-        var entity = entityType()
-        for (modifierJson in modifiers) {
-            val modifier = assertNotNullOr(modifierJson["type"]?.asString?.let(entityModifiers::get)) {
-                logger.error("Unknown modifier $modifierJson")
-                return null
-            }
-            entity = modifier.apply(entity, modifierJson)
-        }
-        return entity
-    }
+	val logger = LogManager.getLogger("Firmament.Entity")
+	fun applyModifiers(entityId: String, modifiers: List<JsonObject>): LivingEntity? {
+		val entityType = assertNotNullOr(entityIds[entityId]) {
+			logger.error("Could not create entity with id $entityId")
+			return null
+		}
+		var entity = entityType()
+		for (modifierJson in modifiers) {
+			val modifier = assertNotNullOr(modifierJson["type"]?.asString?.let(entityModifiers::get)) {
+				logger.error("Unknown modifier $modifierJson")
+				return null
+			}
+			entity = modifier.apply(entity, modifierJson)
+		}
+		return entity
+	}
 
-    fun constructEntity(info: JsonObject): LivingEntity? {
-        val modifiers = (info["modifiers"] as JsonArray?)?.map { it.asJsonObject } ?: emptyList()
-        val entityType = assertNotNullOr(info["entity"]?.asString) {
-            logger.error("Missing entity type on entity object")
-            return null
-        }
-        return applyModifiers(entityType, modifiers)
-    }
+	fun constructEntity(info: JsonObject): LivingEntity? {
+		val modifiers = (info["modifiers"] as JsonArray?)?.map { it.asJsonObject } ?: emptyList()
+		val entityType = assertNotNullOr(info["entity"]?.asString) {
+			logger.error("Missing entity type on entity object")
+			return null
+		}
+		return applyModifiers(entityType, modifiers)
+	}
 
-    private val gson = Gson()
-    fun constructEntity(location: Identifier): LivingEntity? {
-        return constructEntity(
-            gson.fromJson(
-                location.openFirmamentResource().bufferedReader(), JsonObject::class.java
-            )
-        )
-    }
+	private val gson = Gson()
+	fun constructEntity(location: Identifier): LivingEntity? {
+		return constructEntity(
+			gson.fromJson(
+				location.openFirmamentResource().bufferedReader(), JsonObject::class.java
+			)
+		)
+	}
 
-    fun renderEntity(
-        entity: LivingEntity,
-        renderContext: DrawContext,
-        posX: Int,
-        posY: Int,
-        mouseX: Float,
-        mouseY: Float
-    ) {
-        var bottomOffset = 0.0F
-        var currentEntity = entity
-        val maxSize = entity.iterate { it.firstPassenger as? LivingEntity }
-            .map { it.height }
-            .sum()
-        while (true) {
-            currentEntity.age = MC.player?.age ?: 0
-            drawEntity(
-                renderContext,
-                posX,
-                posY,
-                posX + 50,
-                posY + 80,
-                minOf(2F / maxSize, 1F) * 30,
-                -bottomOffset,
-                mouseX,
-                mouseY,
-                currentEntity
-            )
-            val next = currentEntity.firstPassenger as? LivingEntity ?: break
-            bottomOffset += currentEntity.getPassengerRidingPos(next).y.toFloat() * 0.75F
-            currentEntity = next
-        }
-    }
+	fun renderEntity(
+		entity: LivingEntity,
+		renderContext: DrawContext,
+		posX: Int,
+		posY: Int,
+		mouseX: Float,
+		mouseY: Float
+	) {
+		var bottomOffset = 0.0F
+		var currentEntity = entity
+		val maxSize = entity.iterate { it.firstPassenger as? LivingEntity }
+			.map { it.height }
+			.sum()
+		while (true) {
+			currentEntity.age = MC.player?.age ?: 0
+			drawEntity(
+				renderContext,
+				posX,
+				posY,
+				posX + 50,
+				posY + 80,
+				minOf(2F / maxSize, 1F) * 30,
+				-bottomOffset,
+				mouseX,
+				mouseY,
+				currentEntity
+			)
+			val next = currentEntity.firstPassenger as? LivingEntity ?: break
+			bottomOffset += currentEntity.getPassengerRidingPos(next).y.toFloat() * 0.75F
+			currentEntity = next
+		}
+	}
 
 
-    fun drawEntity(
-        context: DrawContext,
-        x1: Int,
-        y1: Int,
-        x2: Int,
-        y2: Int,
-        size: Float,
-        bottomOffset: Float,
-        mouseX: Float,
-        mouseY: Float,
-        entity: LivingEntity
-    ) {
-        context.enableScissorWithTranslation(x1.toFloat(), y1.toFloat(), x2.toFloat(), y2.toFloat())
-        val centerX = (x1 + x2) / 2f
-        val centerY = (y1 + y2) / 2f
-        val targetYaw = atan(((centerX - mouseX) / 40.0f).toDouble()).toFloat()
-        val targetPitch = atan(((centerY - mouseY) / 40.0f).toDouble()).toFloat()
-        val rotateToFaceTheFront = Quaternionf().rotateZ(Math.PI.toFloat())
-        val rotateToFaceTheCamera = Quaternionf().rotateX(targetPitch * 20.0f * (Math.PI.toFloat() / 180))
-        rotateToFaceTheFront.mul(rotateToFaceTheCamera)
-        val oldBodyYaw = entity.bodyYaw
-        val oldYaw = entity.yaw
-        val oldPitch = entity.pitch
-        val oldPrevHeadYaw = entity.prevHeadYaw
-        val oldHeadYaw = entity.headYaw
-        entity.bodyYaw = 180.0f + targetYaw * 20.0f
-        entity.yaw = 180.0f + targetYaw * 40.0f
-        entity.pitch = -targetPitch * 20.0f
-        entity.headYaw = entity.yaw
-        entity.prevHeadYaw = entity.yaw
-        val vector3f = Vector3f(0.0f, entity.height / 2.0f + bottomOffset, 0.0f)
-        InventoryScreen.drawEntity(
-            context,
-            centerX,
-            centerY,
-            size,
-            vector3f,
-            rotateToFaceTheFront,
-            rotateToFaceTheCamera,
-            entity
-        )
-        entity.bodyYaw = oldBodyYaw
-        entity.yaw = oldYaw
-        entity.pitch = oldPitch
-        entity.prevHeadYaw = oldPrevHeadYaw
-        entity.headYaw = oldHeadYaw
-        context.disableScissor()
-    }
+	fun drawEntity(
+		context: DrawContext,
+		x1: Int,
+		y1: Int,
+		x2: Int,
+		y2: Int,
+		size: Float,
+		bottomOffset: Float,
+		mouseX: Float,
+		mouseY: Float,
+		entity: LivingEntity
+	) {
+		context.enableScissorWithTranslation(x1.toFloat(), y1.toFloat(), x2.toFloat(), y2.toFloat())
+		val centerX = (x1 + x2) / 2f
+		val centerY = (y1 + y2) / 2f
+		val targetYaw = atan(((centerX - mouseX) / 40.0f).toDouble()).toFloat()
+		val targetPitch = atan(((centerY - mouseY) / 40.0f).toDouble()).toFloat()
+		val rotateToFaceTheFront = Quaternionf().rotateZ(Math.PI.toFloat())
+		val rotateToFaceTheCamera = Quaternionf().rotateX(targetPitch * 20.0f * (Math.PI.toFloat() / 180))
+		rotateToFaceTheFront.mul(rotateToFaceTheCamera)
+		val oldBodyYaw = entity.bodyYaw
+		val oldYaw = entity.yaw
+		val oldPitch = entity.pitch
+		val oldPrevHeadYaw = entity.prevHeadYaw
+		val oldHeadYaw = entity.headYaw
+		entity.bodyYaw = 180.0f + targetYaw * 20.0f
+		entity.yaw = 180.0f + targetYaw * 40.0f
+		entity.pitch = -targetPitch * 20.0f
+		entity.headYaw = entity.yaw
+		entity.prevHeadYaw = entity.yaw
+		val vector3f = Vector3f(0.0f, entity.height / 2.0f + bottomOffset, 0.0f)
+		InventoryScreen.drawEntity(
+			context,
+			centerX,
+			centerY,
+			size,
+			vector3f,
+			rotateToFaceTheFront,
+			rotateToFaceTheCamera,
+			entity
+		)
+		entity.bodyYaw = oldBodyYaw
+		entity.yaw = oldYaw
+		entity.pitch = oldPitch
+		entity.prevHeadYaw = oldPrevHeadYaw
+		entity.headYaw = oldHeadYaw
+		context.disableScissor()
+	}
 
 
 }
diff --git a/src/main/kotlin/gui/entity/FakeWorld.kt b/src/main/kotlin/gui/entity/FakeWorld.kt
index c17f2ad..7ec385c 100644
--- a/src/main/kotlin/gui/entity/FakeWorld.kt
+++ b/src/main/kotlin/gui/entity/FakeWorld.kt
@@ -5,6 +5,7 @@ import java.util.function.BooleanSupplier
 import java.util.function.Consumer
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
+import net.minecraft.client.gui.screen.world.SelectWorldScreen
 import net.minecraft.component.type.MapIdComponent
 import net.minecraft.entity.Entity
 import net.minecraft.entity.damage.DamageSource
@@ -22,10 +23,15 @@ import net.minecraft.registry.DynamicRegistryManager
 import net.minecraft.registry.Registries
 import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.RegistryKeys
+import net.minecraft.registry.ServerDynamicRegistryType
 import net.minecraft.registry.entry.RegistryEntry
+import net.minecraft.resource.DataConfiguration
+import net.minecraft.resource.ResourcePackManager
 import net.minecraft.resource.featuretoggle.FeatureFlags
 import net.minecraft.resource.featuretoggle.FeatureSet
 import net.minecraft.scoreboard.Scoreboard
+import net.minecraft.server.SaveLoading
+import net.minecraft.server.command.CommandManager
 import net.minecraft.sound.SoundCategory
 import net.minecraft.sound.SoundEvent
 import net.minecraft.util.Identifier
@@ -53,8 +59,10 @@ import net.minecraft.world.explosion.ExplosionBehavior
 import net.minecraft.world.tick.OrderedTick
 import net.minecraft.world.tick.QueryableTickScheduler
 import net.minecraft.world.tick.TickManager
+import moe.nea.firmament.util.MC
 
 fun createDynamicRegistry(): DynamicRegistryManager.Immutable {
+	// TODO: use SaveLoading.load() to properly load a full registry
 	return DynamicRegistryManager.of(Registries.REGISTRIES)
 }
 
@@ -64,9 +72,8 @@ class FakeWorld(
 	Properties,
 	RegistryKey.of(RegistryKeys.WORLD, Identifier.of("firmament", "fakeworld")),
 	registries,
-	registries.getOrThrow(RegistryKeys.DIMENSION_TYPE).getEntry(
-		Identifier.of("minecraft", "overworld")
-	).get(),
+	MC.defaultRegistries.getOrThrow(RegistryKeys.DIMENSION_TYPE)
+		.getOrThrow(RegistryKey.of(RegistryKeys.DIMENSION_TYPE, Identifier.of("minecraft", "overworld"))),
 	true,
 	false,
 	0L,
diff --git a/src/main/kotlin/gui/entity/GuiPlayer.kt b/src/main/kotlin/gui/entity/GuiPlayer.kt
index d00b44d..aa0bea8 100644
--- a/src/main/kotlin/gui/entity/GuiPlayer.kt
+++ b/src/main/kotlin/gui/entity/GuiPlayer.kt
@@ -1,8 +1,7 @@
-
 package moe.nea.firmament.gui.entity
 
 import com.mojang.authlib.GameProfile
-import java.util.*
+import java.util.UUID
 import net.minecraft.client.network.AbstractClientPlayerEntity
 import net.minecraft.client.util.DefaultSkinHelper
 import net.minecraft.client.util.SkinTextures
@@ -15,40 +14,40 @@ import net.minecraft.world.World
 /**
  * @see moe.nea.firmament.init.EarlyRiser
  */
-fun makeGuiPlayer(world: FakeWorld): GuiPlayer {
-    val constructor = GuiPlayer::class.java.getDeclaredConstructor(
-        World::class.java,
-        BlockPos::class.java,
-        Float::class.javaPrimitiveType,
-        GameProfile::class.java
-    )
-    return constructor.newInstance(world, BlockPos.ORIGIN, 0F, GameProfile(UUID.randomUUID(), "Linnea"))
+fun makeGuiPlayer(world: World): GuiPlayer {
+	val constructor = GuiPlayer::class.java.getDeclaredConstructor(
+		World::class.java,
+		BlockPos::class.java,
+		Float::class.javaPrimitiveType,
+		GameProfile::class.java
+	)
+	return constructor.newInstance(world, BlockPos.ORIGIN, 0F, GameProfile(UUID.randomUUID(), "Linnea"))
 }
 
 class GuiPlayer(world: ClientWorld?, profile: GameProfile?) : AbstractClientPlayerEntity(world, profile) {
-    override fun isSpectator(): Boolean {
-        return false
-    }
+	override fun isSpectator(): Boolean {
+		return false
+	}
 
-    override fun isCreative(): Boolean {
-        return false
-    }
+	override fun isCreative(): Boolean {
+		return false
+	}
 
-    override fun shouldRenderName(): Boolean {
-        return false
-    }
+	override fun shouldRenderName(): Boolean {
+		return false
+	}
 
-    var skinTexture: Identifier = DefaultSkinHelper.getSkinTextures(this.getUuid()).texture
-    var capeTexture: Identifier? = null
-    var model: Model = Model.WIDE
-    override fun getSkinTextures(): SkinTextures {
-        return SkinTextures(
-            skinTexture,
-            null,
-            capeTexture,
-            null,
-            model,
-            true
-        )
-    }
+	var skinTexture: Identifier = DefaultSkinHelper.getSkinTextures(this.getUuid()).texture
+	var capeTexture: Identifier? = null
+	var model: Model = Model.WIDE
+	override fun getSkinTextures(): SkinTextures {
+		return SkinTextures(
+			skinTexture,
+			null,
+			capeTexture,
+			null,
+			model,
+			true
+		)
+	}
 }