3 files changed, 74 insertions, 1 deletions
diff --git a/src/main/kotlin/features/debug/AnimatedClothingScanner.kt b/src/main/kotlin/features/debug/AnimatedClothingScanner.kt
new file mode 100644
index 0000000..11b47a9
--- /dev/null
+++ b/src/main/kotlin/features/debug/AnimatedClothingScanner.kt
@@ -0,0 +1,51 @@
+package moe.nea.firmament.features.debug
+
+import net.minecraft.component.DataComponentTypes
+import net.minecraft.entity.Entity
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.commands.thenExecute
+import moe.nea.firmament.commands.thenLiteral
+import moe.nea.firmament.events.CommandEvent
+import moe.nea.firmament.events.EntityUpdateEvent
+import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.skyBlockId
+import moe.nea.firmament.util.tr
+
+object AnimatedClothingScanner {
+
+	var observedEntity: Entity? = null
+
+	@OptIn(ExperimentalStdlibApi::class)
+	@Subscribe
+	fun onUpdate(event: EntityUpdateEvent) {
+		if (event.entity != observedEntity) return
+		if (event is EntityUpdateEvent.EquipmentUpdate) {
+			event.newEquipment.forEach {
+				val id = it.second.skyBlockId?.neuItem
+				val colour = it.second.get(DataComponentTypes.DYED_COLOR)
+					?.rgb?.toHexString(HexFormat.UpperCase)
+					?.let { " #$it" } ?: ""
+				MC.sendChat(tr("firmament.fitstealer.update",
+				               "[FIT CHECK][${MC.currentTick}] ${it.first.asString()} => ${id}${colour}"))
+			}
+		}
+	}
+
+	@Subscribe
+	fun onSubCommand(event: CommandEvent.SubCommand) {
+		event.subcommand("dev") {
+			thenLiteral("stealthisfit") {
+				thenExecute {
+					observedEntity =
+						if (observedEntity == null) MC.instance.targetedEntity else null
+
+					MC.sendChat(
+						observedEntity?.let {
+							tr("firmament.fitstealer.targeted", "Observing the equipment of ${it.name}.")
+						} ?: tr("firmament.fitstealer.targetlost", "No longer logging equipment."),
+					)
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/kotlin/features/debug/DebugLogger.kt b/src/main/kotlin/features/debug/DebugLogger.kt
index 2c6b962..9115956 100644
--- a/src/main/kotlin/features/debug/DebugLogger.kt
+++ b/src/main/kotlin/features/debug/DebugLogger.kt
@@ -10,6 +10,7 @@ class DebugLogger(val tag: String) {
 	companion object {
 		val allInstances = InstanceList<DebugLogger>("DebugLogger")
 	}
+
 	object EnabledLogs : DataHolder<MutableSet<String>>(serializer(), "DebugLogs", ::mutableSetOf)
 
 	init {
@@ -17,6 +18,7 @@ class DebugLogger(val tag: String) {
 	}
 
 	fun isEnabled() = DeveloperFeatures.isEnabled && EnabledLogs.data.contains(tag)
+	fun log(text: String) = log { text }
 	fun log(text: () -> String) {
 		if (!isEnabled()) return
 		MC.sendChat(Text.literal(text()))
diff --git a/src/main/kotlin/features/debug/PowerUserTools.kt b/src/main/kotlin/features/debug/PowerUserTools.kt
index 225bc13..8be5d5d 100644
--- a/src/main/kotlin/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/features/debug/PowerUserTools.kt
@@ -1,22 +1,31 @@
 package moe.nea.firmament.features.debug
 
+import com.mojang.serialization.Codec
+import com.mojang.serialization.DynamicOps
 import com.mojang.serialization.JsonOps
+import com.mojang.serialization.codecs.RecordCodecBuilder
 import kotlin.jvm.optionals.getOrNull
 import net.minecraft.block.SkullBlock
 import net.minecraft.block.entity.SkullBlockEntity
 import net.minecraft.component.DataComponentTypes
 import net.minecraft.component.type.ProfileComponent
 import net.minecraft.entity.Entity
+import net.minecraft.entity.EntityType
 import net.minecraft.entity.LivingEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.item.Items
+import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtOps
+import net.minecraft.nbt.NbtString
+import net.minecraft.predicate.NbtPredicate
 import net.minecraft.text.Text
 import net.minecraft.text.TextCodecs
 import net.minecraft.util.Identifier
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.hit.EntityHitResult
 import net.minecraft.util.hit.HitResult
+import net.minecraft.util.math.Position
+import net.minecraft.util.math.Vec3d
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.CustomItemModelEvent
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
@@ -30,6 +39,8 @@ import moe.nea.firmament.mixins.accessor.AccessorHandledScreen
 import moe.nea.firmament.util.ClipboardUtils
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.focusedItemStack
+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.loreAccordingToNbt
@@ -87,6 +98,11 @@ object PowerUserTools : FirmamentFeature {
 	}
 
 	fun showEntity(target: Entity) {
+		val nbt = NbtPredicate.entityToNbt(target)
+		nbt.remove("Inventory")
+		nbt.put("StyledName", TextCodecs.CODEC.encodeStart(NbtOps.INSTANCE, target.styledDisplayName).orThrow)
+		println(SNbtFormatter.prettify(nbt))
+		ClipboardUtils.setTextContent(SNbtFormatter.prettify(nbt))
 		MC.sendChat(Text.translatable("firmament.poweruser.entity.type", target.type))
 		MC.sendChat(Text.translatable("firmament.poweruser.entity.name", target.name))
 		MC.sendChat(Text.stringifiedTranslatable("firmament.poweruser.entity.position", target.pos))
@@ -119,7 +135,11 @@ object PowerUserTools : FirmamentFeature {
 			lastCopiedStack =
 				Pair(item, Text.stringifiedTranslatable("firmament.tooltip.copied.skyblockid", sbId.neuItem))
 		} else if (it.matches(TConfig.copyTexturePackId)) {
-			val model = CustomItemModelEvent.getModelIdentifier(item) // TODO: remove global texture overrides, maybe
+			val model = CustomItemModelEvent.getModelIdentifier0(item, object : IntrospectableItemModelManager {
+				override fun hasModel_firmament(identifier: Identifier): Boolean {
+					return true
+				}
+			}).getOrNull() // TODO: remove global texture overrides, maybe
 			if (model == null) {
 				lastCopiedStack = Pair(item, Text.translatable("firmament.tooltip.copied.modelid.fail"))
 				return