WIP: Port some 1.21.5 thingsmc1.21.5

28 files changed, 188 insertions, 556 deletions

diff --git a/src/main/kotlin/features/chat/ChatLinks.kt b/src/main/kotlin/features/chat/ChatLinks.kt
index f85825b..a084234 100644
--- a/src/main/kotlin/features/chat/ChatLinks.kt
+++ b/src/main/kotlin/features/chat/ChatLinks.kt
@@ -3,6 +3,7 @@ package moe.nea.firmament.features.chat
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsChannel
 import io.ktor.utils.io.jvm.javaio.toInputStream
+import java.net.URI
 import java.net.URL
 import java.util.Collections
 import java.util.concurrent.atomic.AtomicInteger
@@ -78,7 +79,7 @@ object ChatLinks : FirmamentFeature {
 					val texId = Firmament.identifier("dynamic_image_preview${nextTexId.getAndIncrement()}")
 					MC.textureManager.registerTexture(
 						texId,
-						NativeImageBackedTexture(image)
+						NativeImageBackedTexture({ texId.path }, image)
 					)
 					Image(texId, image.width, image.height)
 				} else
@@ -102,8 +103,8 @@ object ChatLinks : FirmamentFeature {
 		if (it.screen !is ChatScreen) return
 		val hoveredComponent =
 			MC.inGameHud.chatHud.getTextStyleAt(it.mouseX.toDouble(), it.mouseY.toDouble()) ?: return
-		val hoverEvent = hoveredComponent.hoverEvent ?: return
-		val value = hoverEvent.getValue(HoverEvent.Action.SHOW_TEXT) ?: return
+		val hoverEvent = hoveredComponent.hoverEvent as? HoverEvent.ShowText ?: return
+		val value = hoverEvent.value
 		val url = urlRegex.matchEntire(value.unformattedString)?.groupValues?.get(0) ?: return
 		if (!isImageUrl(url)) return
 		val imageFuture = imageCache[url] ?: return
@@ -149,8 +150,8 @@ object ChatLinks : FirmamentFeature {
 					Text.literal(url).setStyle(
 						Style.EMPTY.withUnderline(true).withColor(
 							Formatting.AQUA
-						).withHoverEvent(HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(url)))
-							.withClickEvent(ClickEvent(ClickEvent.Action.OPEN_URL, url))
+						).withHoverEvent(HoverEvent.ShowText(Text.literal(url)))
+							.withClickEvent(ClickEvent.OpenUrl(URI(url)))
 					)
 				)
 				if (isImageUrl(url))
diff --git a/src/main/kotlin/features/debug/PowerUserTools.kt b/src/main/kotlin/features/debug/PowerUserTools.kt
index 8be5d5d..251fc8b 100644
--- a/src/main/kotlin/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/features/debug/PowerUserTools.kt
@@ -43,6 +43,7 @@ import moe.nea.firmament.util.mc.IntrospectableItemModelManager
 import moe.nea.firmament.util.mc.SNbtFormatter
 import moe.nea.firmament.util.mc.SNbtFormatter.Companion.toPrettyString
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
+import moe.nea.firmament.util.mc.iterableArmorItems
 import moe.nea.firmament.util.mc.loreAccordingToNbt
 import moe.nea.firmament.util.skyBlockId
 
@@ -108,7 +109,7 @@ object PowerUserTools : FirmamentFeature {
 		MC.sendChat(Text.stringifiedTranslatable("firmament.poweruser.entity.position", target.pos))
 		if (target is LivingEntity) {
 			MC.sendChat(Text.translatable("firmament.poweruser.entity.armor"))
-			for (armorItem in target.armorItems) {
+			for ((slot, armorItem) in target.iterableArmorItems) {
 				MC.sendChat(Text.translatable("firmament.poweruser.entity.armor.item", debugFormat(armorItem)))
 			}
 		}
diff --git a/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt b/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt
index 1824225..cfc05cc 100644
--- a/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt
+++ b/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt
@@ -222,7 +222,7 @@ object MinesweeperHelper {
     fun onChat(event: ProcessChatEvent) {
         if (CarnivalFeatures.TConfig.displayTutorials && event.unformattedString == startGameQuestion) {
             MC.sendChat(Text.translatable("firmament.carnival.tutorial.minesweeper").styled {
-                it.withClickEvent(ClickEvent(ClickEvent.Action.RUN_COMMAND, "/firm minesweepertutorial"))
+                it.withClickEvent(ClickEvent.RunCommand("/firm minesweepertutorial"))
             })
         }
         if (!CarnivalFeatures.TConfig.enableBombSolver) {
@@ -259,7 +259,7 @@ object MinesweeperHelper {
         val boardPosition = BoardPosition.fromBlockPos(event.blockPos)
         log.log { "Breaking block at ${event.blockPos} ($boardPosition)" }
         gs.lastClickedPosition = boardPosition
-        gs.lastDowsingMode = DowsingMode.fromItem(event.player.inventory.mainHandStack)
+        gs.lastDowsingMode = DowsingMode.fromItem(event.player.mainHandStack)
     }
 
     @Subscribe
diff --git a/src/main/kotlin/features/inventory/REIDependencyWarner.kt b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
index 1e9b1b8..7d88dd1 100644
--- a/src/main/kotlin/features/inventory/REIDependencyWarner.kt
+++ b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
@@ -1,5 +1,6 @@
 package moe.nea.firmament.features.inventory
 
+import java.net.URI
 import net.fabricmc.loader.api.FabricLoader
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -38,7 +39,7 @@ object REIDependencyWarner {
 			.white()
 			.append(Text.literal("[").aqua())
 			.append(Text.translatable("firmament.download", modName)
-				        .styled { it.withClickEvent(ClickEvent(ClickEvent.Action.OPEN_URL, modrinthLink(slug))) }
+				        .styled { it.withClickEvent(ClickEvent.OpenUrl(URI (modrinthLink(slug)))) }
 				        .yellow()
 				        .also {
 					        if (alreadyDownloaded)
diff --git a/src/main/kotlin/features/inventory/SlotLocking.kt b/src/main/kotlin/features/inventory/SlotLocking.kt
index 0083c40..d3348a2 100644
--- a/src/main/kotlin/features/inventory/SlotLocking.kt
+++ b/src/main/kotlin/features/inventory/SlotLocking.kt
@@ -4,6 +4,7 @@ package moe.nea.firmament.features.inventory
 
 import java.util.UUID
 import org.lwjgl.glfw.GLFW
+import util.render.CustomRenderLayers
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -17,6 +18,9 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.int
 import kotlinx.serialization.serializer
 import net.minecraft.client.gui.screen.ingame.HandledScreen
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.client.render.RenderLayers
+import net.minecraft.client.render.TexturedRenderLayers
 import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.screen.GenericContainerScreenHandler
 import net.minecraft.screen.slot.Slot
@@ -45,7 +49,6 @@ import moe.nea.firmament.util.mc.ScreenUtil.getSlotByIndex
 import moe.nea.firmament.util.mc.SlotUtils.swapWithHotBar
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
 import moe.nea.firmament.util.mc.loreAccordingToNbt
-import moe.nea.firmament.util.render.GuiRenderLayers
 import moe.nea.firmament.util.render.drawLine
 import moe.nea.firmament.util.skyblock.DungeonUtil
 import moe.nea.firmament.util.skyblockUUID
@@ -445,7 +448,7 @@ object SlotLocking : FirmamentFeature {
 		val isUUIDLocked = (it.slot.stack?.skyblockUUID) in (lockedUUIDs ?: setOf())
 		if (isSlotLocked || isUUIDLocked) {
 			it.context.drawGuiTexture(
-				GuiRenderLayers.GUI_TEXTURED_NO_DEPTH,
+				RenderLayer::getGuiTexturedOverlay,
 				when {
 					isSlotLocked ->
 						(Identifier.of("firmament:slot_locked"))
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
index 63a2f54..22f4dab 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
@@ -218,7 +218,7 @@ class StorageOverlayScreen : Screen(Text.literal("")) {
 	}
 
 	fun drawPlayerInventory(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
-		val items = MC.player?.inventory?.main ?: return
+		val items = MC.player?.inventory?.mainStacks ?: return
 		items.withIndex().forEach { (index, item) ->
 			val (x, y) = getPlayerInventorySlotPosition(index)
 			context.drawItem(item, x, y, 0)
diff --git a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
index 3b86184..d99acd7 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
@@ -11,6 +11,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlin.jvm.optionals.getOrNull
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtIo
@@ -42,15 +43,15 @@ data class VirtualInventory(
 		override fun deserialize(decoder: Decoder): VirtualInventory {
 			val s = decoder.decodeString()
 			val n = NbtIo.readCompressed(ByteArrayInputStream(s.decodeBase64Bytes()), NbtSizeTracker.of(100_000_000))
-			val items = n.getList(INVENTORY, NbtCompound.COMPOUND_TYPE.toInt())
+			val items = n.getList(INVENTORY).getOrNull()
 			val ops = getOps()
-			return VirtualInventory(items.map {
+			return VirtualInventory(items?.map {
 				it as NbtCompound
 				if (it.isEmpty) ItemStack.EMPTY
 				else ErrorUtil.catch("Could not deserialize item") {
 					ItemStack.CODEC.parse(ops, it).orThrow
 				}.or { ItemStack.EMPTY }
-			})
+			} ?: listOf())
 		}
 
 		fun getOps() = TolerantRegistriesOps(NbtOps.INSTANCE, MC.currentOrDefaultRegistries)
diff --git a/src/main/kotlin/features/mining/PickaxeAbility.kt b/src/main/kotlin/features/mining/PickaxeAbility.kt
index 1737969..2e1c59d 100644
--- a/src/main/kotlin/features/mining/PickaxeAbility.kt
+++ b/src/main/kotlin/features/mining/PickaxeAbility.kt
@@ -1,6 +1,7 @@
 package moe.nea.firmament.features.mining
 
 import java.util.regex.Pattern
+import kotlin.jvm.optionals.getOrNull
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.item.ItemStack
@@ -140,8 +141,7 @@ object PickaxeAbility : FirmamentFeature {
 			}
 		} ?: return
 		val extra = it.item.extraAttributes
-		if (!extra.contains("drill_fuel")) return
-		val fuel = extra.getInt("drill_fuel")
+		val fuel = extra.getInt("drill_fuel").getOrNull() ?: return
 		val percentage = fuel / maxFuel.toFloat()
 		it.barOverride = DurabilityBarEvent.DurabilityBar(
 			lerp(
diff --git a/src/main/kotlin/gui/entity/EntityRenderer.kt b/src/main/kotlin/gui/entity/EntityRenderer.kt
index fd7a0c4..b4c1c7f 100644
--- a/src/main/kotlin/gui/entity/EntityRenderer.kt
+++ b/src/main/kotlin/gui/entity/EntityRenderer.kt
@@ -169,13 +169,13 @@ object EntityRenderer {
 		val oldBodyYaw = entity.bodyYaw
 		val oldYaw = entity.yaw
 		val oldPitch = entity.pitch
-		val oldPrevHeadYaw = entity.prevHeadYaw
+		val oldPrevHeadYaw = entity.lastHeadYaw
 		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
+		entity.lastHeadYaw = entity.yaw
 		val vector3f = Vector3f(0.0f, (entity.height / 2.0f + bottomOffset).toFloat(), 0.0f)
 		InventoryScreen.drawEntity(
 			context,
@@ -190,7 +190,7 @@ object EntityRenderer {
 		entity.bodyYaw = oldBodyYaw
 		entity.yaw = oldYaw
 		entity.pitch = oldPitch
-		entity.prevHeadYaw = oldPrevHeadYaw
+		entity.lastHeadYaw = oldPrevHeadYaw
 		entity.headYaw = oldHeadYaw
 		context.disableScissor()
 	}
diff --git a/src/main/kotlin/gui/entity/FakeWorld.kt b/src/main/kotlin/gui/entity/FakeWorld.kt
deleted file mode 100644
index ccf6b60..0000000
--- a/src/main/kotlin/gui/entity/FakeWorld.kt
+++ /dev/null
@@ -1,343 +0,0 @@
-package moe.nea.firmament.gui.entity
-
-import java.util.UUID
-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.boss.dragon.EnderDragonPart
-import net.minecraft.entity.damage.DamageSource
-import net.minecraft.entity.player.PlayerEntity
-import net.minecraft.fluid.Fluid
-import net.minecraft.item.FuelRegistry
-import net.minecraft.item.map.MapState
-import net.minecraft.particle.ParticleEffect
-import net.minecraft.recipe.BrewingRecipeRegistry
-import net.minecraft.recipe.RecipeManager
-import net.minecraft.recipe.RecipePropertySet
-import net.minecraft.recipe.StonecuttingRecipe
-import net.minecraft.recipe.display.CuttingRecipeDisplay
-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
-import net.minecraft.util.TypeFilter
-import net.minecraft.util.function.LazyIterationConsumer
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Box
-import net.minecraft.util.math.ChunkPos
-import net.minecraft.util.math.Direction
-import net.minecraft.util.math.Vec3d
-import net.minecraft.world.BlockView
-import net.minecraft.world.Difficulty
-import net.minecraft.world.MutableWorldProperties
-import net.minecraft.world.World
-import net.minecraft.world.biome.Biome
-import net.minecraft.world.biome.BiomeKeys
-import net.minecraft.world.chunk.Chunk
-import net.minecraft.world.chunk.ChunkManager
-import net.minecraft.world.chunk.ChunkStatus
-import net.minecraft.world.chunk.EmptyChunk
-import net.minecraft.world.chunk.light.LightingProvider
-import net.minecraft.world.entity.EntityLookup
-import net.minecraft.world.event.GameEvent
-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)
-}
-
-class FakeWorld(
-	registries: DynamicRegistryManager.Immutable = createDynamicRegistry(),
-) : World(
-	Properties,
-	RegistryKey.of(RegistryKeys.WORLD, Identifier.of("firmament", "fakeworld")),
-	registries,
-	MC.defaultRegistries.getOrThrow(RegistryKeys.DIMENSION_TYPE)
-		.getOrThrow(RegistryKey.of(RegistryKeys.DIMENSION_TYPE, Identifier.of("minecraft", "overworld"))),
-	true,
-	false,
-	0L,
-	0
-) {
-	object Properties : MutableWorldProperties {
-		override fun getSpawnPos(): BlockPos {
-			return BlockPos.ORIGIN
-		}
-
-		override fun getSpawnAngle(): Float {
-			return 0F
-		}
-
-		override fun getTime(): Long {
-			return 0
-		}
-
-		override fun getTimeOfDay(): Long {
-			return 0
-		}
-
-		override fun isThundering(): Boolean {
-			return false
-		}
-
-		override fun isRaining(): Boolean {
-			return false
-		}
-
-		override fun setRaining(raining: Boolean) {
-		}
-
-		override fun isHardcore(): Boolean {
-			return false
-		}
-
-		override fun getDifficulty(): Difficulty {
-			return Difficulty.HARD
-		}
-
-		override fun isDifficultyLocked(): Boolean {
-			return false
-		}
-
-		override fun setSpawnPos(pos: BlockPos?, angle: Float) {}
-	}
-
-	override fun getPlayers(): List<PlayerEntity> {
-		return emptyList()
-	}
-
-	override fun getBrightness(direction: Direction?, shaded: Boolean): Float {
-		return 1f
-	}
-
-	override fun getGeneratorStoredBiome(biomeX: Int, biomeY: Int, biomeZ: Int): RegistryEntry<Biome> {
-		return registryManager.getOptionalEntry(BiomeKeys.PLAINS).get()
-	}
-
-	override fun getSeaLevel(): Int {
-		return 0
-	}
-
-	override fun getEnabledFeatures(): FeatureSet {
-		return FeatureFlags.VANILLA_FEATURES
-	}
-
-	class FakeTickScheduler<T> : QueryableTickScheduler<T> {
-		override fun scheduleTick(orderedTick: OrderedTick<T>?) {
-		}
-
-		override fun isQueued(pos: BlockPos?, type: T): Boolean {
-			return true
-		}
-
-		override fun getTickCount(): Int {
-			return 0
-		}
-
-		override fun isTicking(pos: BlockPos?, type: T): Boolean {
-			return true
-		}
-
-	}
-
-	override fun getBlockTickScheduler(): QueryableTickScheduler<Block> {
-		return FakeTickScheduler()
-	}
-
-	override fun getFluidTickScheduler(): QueryableTickScheduler<Fluid> {
-		return FakeTickScheduler()
-	}
-
-
-	class FakeChunkManager(val world: FakeWorld) : ChunkManager() {
-		override fun getChunk(x: Int, z: Int, leastStatus: ChunkStatus?, create: Boolean): Chunk {
-			return EmptyChunk(
-				world,
-				ChunkPos(x, z),
-				world.registryManager.getOptionalEntry(BiomeKeys.PLAINS).get()
-			)
-		}
-
-		override fun getWorld(): BlockView {
-			return world
-		}
-
-		override fun tick(shouldKeepTicking: BooleanSupplier?, tickChunks: Boolean) {
-		}
-
-		override fun getDebugString(): String {
-			return "FakeChunkManager"
-		}
-
-		override fun getLoadedChunkCount(): Int {
-			return 0
-		}
-
-		override fun getLightingProvider(): LightingProvider {
-			return FakeLightingProvider(this)
-		}
-	}
-
-	class FakeLightingProvider(chunkManager: FakeChunkManager) : LightingProvider(chunkManager, false, false)
-
-	override fun getChunkManager(): ChunkManager {
-		return FakeChunkManager(this)
-	}
-
-	override fun playSound(
-		source: PlayerEntity?,
-		x: Double,
-		y: Double,
-		z: Double,
-		sound: RegistryEntry<SoundEvent>?,
-		category: SoundCategory?,
-		volume: Float,
-		pitch: Float,
-		seed: Long
-	) {
-	}
-
-	override fun syncWorldEvent(player: PlayerEntity?, eventId: Int, pos: BlockPos?, data: Int) {
-	}
-
-	override fun emitGameEvent(event: RegistryEntry<GameEvent>?, emitterPos: Vec3d?, emitter: GameEvent.Emitter?) {
-	}
-
-	override fun updateListeners(pos: BlockPos?, oldState: BlockState?, newState: BlockState?, flags: Int) {
-	}
-
-	override fun playSoundFromEntity(
-		source: PlayerEntity?,
-		entity: Entity?,
-		sound: RegistryEntry<SoundEvent>?,
-		category: SoundCategory?,
-		volume: Float,
-		pitch: Float,
-		seed: Long
-	) {
-	}
-
-	override fun createExplosion(
-		entity: Entity?,
-		damageSource: DamageSource?,
-		behavior: ExplosionBehavior?,
-		x: Double,
-		y: Double,
-		z: Double,
-		power: Float,
-		createFire: Boolean,
-		explosionSourceType: ExplosionSourceType?,
-		smallParticle: ParticleEffect?,
-		largeParticle: ParticleEffect?,
-		soundEvent: RegistryEntry<SoundEvent>?
-	) {
-		TODO("Not yet implemented")
-	}
-
-	override fun asString(): String {
-		return "FakeWorld"
-	}
-
-	override fun getEntityById(id: Int): Entity? {
-		return null
-	}
-
-	override fun getEnderDragonParts(): MutableCollection<EnderDragonPart> {
-		return mutableListOf()
-	}
-
-	override fun getTickManager(): TickManager {
-		return TickManager()
-	}
-
-	override fun getMapState(id: MapIdComponent?): MapState? {
-		return null
-	}
-
-	override fun putMapState(id: MapIdComponent?, state: MapState?) {
-	}
-
-	override fun increaseAndGetMapId(): MapIdComponent {
-		return MapIdComponent(0)
-	}
-
-	override fun setBlockBreakingInfo(entityId: Int, pos: BlockPos?, progress: Int) {
-	}
-
-	override fun getScoreboard(): Scoreboard {
-		return Scoreboard()
-	}
-
-	override fun getRecipeManager(): RecipeManager {
-		return object : RecipeManager {
-			override fun getPropertySet(key: RegistryKey<RecipePropertySet>?): RecipePropertySet {
-				return RecipePropertySet.EMPTY
-			}
-
-			override fun getStonecutterRecipes(): CuttingRecipeDisplay.Grouping<StonecuttingRecipe> {
-				return CuttingRecipeDisplay.Grouping.empty()
-			}
-		}
-	}
-
-	object FakeEntityLookup : EntityLookup<Entity> {
-		override fun get(id: Int): Entity? {
-			return null
-		}
-
-		override fun get(uuid: UUID?): Entity? {
-			return null
-		}
-
-		override fun iterate(): MutableIterable<Entity> {
-			return mutableListOf()
-		}
-
-		override fun <U : Entity?> forEachIntersects(
-			filter: TypeFilter<Entity, U>?,
-			box: Box?,
-			consumer: LazyIterationConsumer<U>?
-		) {
-		}
-
-		override fun forEachIntersects(box: Box?, action: Consumer<Entity>?) {
-		}
-
-		override fun <U : Entity?> forEach(filter: TypeFilter<Entity, U>?, consumer: LazyIterationConsumer<U>?) {
-		}
-
-	}
-
-	override fun getEntityLookup(): EntityLookup<Entity> {
-		return FakeEntityLookup
-	}
-
-	override fun getBrewingRecipeRegistry(): BrewingRecipeRegistry {
-		return BrewingRecipeRegistry.EMPTY
-	}
-
-	override fun getFuelRegistry(): FuelRegistry {
-		TODO("Not yet implemented")
-	}
-}
diff --git a/src/main/kotlin/gui/entity/ModifyEquipment.kt b/src/main/kotlin/gui/entity/ModifyEquipment.kt
index a558936..712f5ca 100644
--- a/src/main/kotlin/gui/entity/ModifyEquipment.kt
+++ b/src/main/kotlin/gui/entity/ModifyEquipment.kt
@@ -47,7 +47,7 @@ object ModifyEquipment : EntityModifier {
 
 	private fun coloredLeatherArmor(leatherArmor: Item, data: String): ItemStack {
 		val stack = ItemStack(leatherArmor)
-		stack.set(DataComponentTypes.DYED_COLOR, DyedColorComponent(data.toInt(16), false))
+		stack.set(DataComponentTypes.DYED_COLOR, DyedColorComponent(data.toInt(16)))
 		return stack
 	}
 }
diff --git a/src/main/kotlin/gui/entity/ModifyHorse.kt b/src/main/kotlin/gui/entity/ModifyHorse.kt
index f094ca4..7c8baa7 100644
--- a/src/main/kotlin/gui/entity/ModifyHorse.kt
+++ b/src/main/kotlin/gui/entity/ModifyHorse.kt
@@ -1,4 +1,3 @@
-
 package moe.nea.firmament.gui.entity
 
 import com.google.gson.JsonNull
@@ -7,6 +6,7 @@ import kotlin.experimental.and
 import kotlin.experimental.inv
 import kotlin.experimental.or
 import net.minecraft.entity.EntityType
+import net.minecraft.entity.EquipmentSlot
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.SpawnReason
 import net.minecraft.entity.passive.AbstractHorseEntity
@@ -15,48 +15,45 @@ import net.minecraft.item.Items
 import moe.nea.firmament.gui.entity.EntityRenderer.fakeWorld
 
 object ModifyHorse : EntityModifier {
-    override fun apply(entity: LivingEntity, info: JsonObject): LivingEntity {
-        require(entity is AbstractHorseEntity)
-        var entity: AbstractHorseEntity = entity
-        info["kind"]?.let {
-            entity = when (it.asString) {
-                "skeleton" -> EntityType.SKELETON_HORSE.create(fakeWorld, SpawnReason.LOAD)!!
-                "zombie" -> EntityType.ZOMBIE_HORSE.create(fakeWorld, SpawnReason.LOAD)!!
-                "mule" -> EntityType.MULE.create(fakeWorld, SpawnReason.LOAD)!!
-                "donkey" -> EntityType.DONKEY.create(fakeWorld, SpawnReason.LOAD)!!
-                "horse" -> EntityType.HORSE.create(fakeWorld, SpawnReason.LOAD)!!
-                else -> error("Unknown horse kind $it")
-            }
-        }
-        info["armor"]?.let {
-            if (it is JsonNull) {
-                entity.setHorseArmor(ItemStack.EMPTY)
-            } else {
-                when (it.asString) {
-                    "iron" -> entity.setHorseArmor(ItemStack(Items.IRON_HORSE_ARMOR))
-                    "golden" -> entity.setHorseArmor(ItemStack(Items.GOLDEN_HORSE_ARMOR))
-                    "diamond" -> entity.setHorseArmor(ItemStack(Items.DIAMOND_HORSE_ARMOR))
-                    else -> error("Unknown horse armor $it")
-                }
-            }
-        }
-        info["saddled"]?.let {
-            entity.setIsSaddled(it.asBoolean)
-        }
-        return entity
-    }
+	override fun apply(entity: LivingEntity, info: JsonObject): LivingEntity {
+		require(entity is AbstractHorseEntity)
+		var entity: AbstractHorseEntity = entity
+		info["kind"]?.let {
+			entity = when (it.asString) {
+				"skeleton" -> EntityType.SKELETON_HORSE.create(fakeWorld, SpawnReason.LOAD)!!
+				"zombie" -> EntityType.ZOMBIE_HORSE.create(fakeWorld, SpawnReason.LOAD)!!
+				"mule" -> EntityType.MULE.create(fakeWorld, SpawnReason.LOAD)!!
+				"donkey" -> EntityType.DONKEY.create(fakeWorld, SpawnReason.LOAD)!!
+				"horse" -> EntityType.HORSE.create(fakeWorld, SpawnReason.LOAD)!!
+				else -> error("Unknown horse kind $it")
+			}
+		}
+		info["armor"]?.let {
+			if (it is JsonNull) {
+				entity.setHorseArmor(ItemStack.EMPTY)
+			} else {
+				when (it.asString) {
+					"iron" -> entity.setHorseArmor(ItemStack(Items.IRON_HORSE_ARMOR))
+					"golden" -> entity.setHorseArmor(ItemStack(Items.GOLDEN_HORSE_ARMOR))
+					"diamond" -> entity.setHorseArmor(ItemStack(Items.DIAMOND_HORSE_ARMOR))
+					else -> error("Unknown horse armor $it")
+				}
+			}
+		}
+		info["saddled"]?.let {
+			entity.setIsSaddled(it.asBoolean)
+		}
+		return entity
+	}
 
 }
 
 fun AbstractHorseEntity.setIsSaddled(shouldBeSaddled: Boolean) {
-    val oldFlag = dataTracker.get(AbstractHorseEntity.HORSE_FLAGS)
-    dataTracker.set(
-        AbstractHorseEntity.HORSE_FLAGS,
-        if (shouldBeSaddled) oldFlag or AbstractHorseEntity.SADDLED_FLAG.toByte()
-        else oldFlag and AbstractHorseEntity.SADDLED_FLAG.toByte().inv()
-    )
+	this.equipStack(EquipmentSlot.SADDLE,
+	                if (shouldBeSaddled) ItemStack(Items.SADDLE)
+	                else ItemStack.EMPTY)
 }
 
 fun AbstractHorseEntity.setHorseArmor(itemStack: ItemStack) {
-    items.setStack(1, itemStack)
+	this.equipBodyArmor(itemStack)
 }
diff --git a/src/main/kotlin/repo/ItemCache.kt b/src/main/kotlin/repo/ItemCache.kt
index 0967ad1..09eedac 100644
--- a/src/main/kotlin/repo/ItemCache.kt
+++ b/src/main/kotlin/repo/ItemCache.kt
@@ -4,7 +4,6 @@ import com.mojang.serialization.Dynamic
 import io.github.moulberry.repo.IReloadable
 import io.github.moulberry.repo.NEURepository
 import io.github.moulberry.repo.data.NEUItem
-import io.github.notenoughupdates.moulconfig.xml.Bind
 import java.text.NumberFormat
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -13,7 +12,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlin.jvm.optionals.getOrNull
 import net.minecraft.SharedConstants
-import net.minecraft.client.resource.language.I18n
 import net.minecraft.component.DataComponentTypes
 import net.minecraft.component.type.NbtComponent
 import net.minecraft.datafixer.Schemas
@@ -28,9 +26,6 @@ import net.minecraft.text.MutableText
 import net.minecraft.text.Style
 import net.minecraft.text.Text
 import moe.nea.firmament.Firmament
-import moe.nea.firmament.gui.config.HudMeta
-import moe.nea.firmament.gui.config.HudPosition
-import moe.nea.firmament.gui.hud.MoulConfigHud
 import moe.nea.firmament.repo.RepoManager.initialize
 import moe.nea.firmament.util.LegacyFormattingCode
 import moe.nea.firmament.util.LegacyTagParser
@@ -140,7 +135,8 @@ object ItemCache : IReloadable {
 				ItemStack.fromNbt(MC.defaultRegistr