3 files changed, 20 insertions, 4 deletions
diff --git a/src/main/kotlin/util/mc/ArmorUtil.kt b/src/main/kotlin/util/mc/ArmorUtil.kt
new file mode 100644
index 0000000..fd1867c
--- /dev/null
+++ b/src/main/kotlin/util/mc/ArmorUtil.kt
@@ -0,0 +1,8 @@
+package moe.nea.firmament.util.mc
+
+import net.minecraft.entity.EquipmentSlot
+import net.minecraft.entity.LivingEntity
+
+val LivingEntity.iterableArmorItems
+	get() = EquipmentSlot.entries.asSequence()
+		.map { it to getEquippedStack(it) }
diff --git a/src/main/kotlin/util/mc/PlayerUtil.kt b/src/main/kotlin/util/mc/PlayerUtil.kt
new file mode 100644
index 0000000..53ef1f4
--- /dev/null
+++ b/src/main/kotlin/util/mc/PlayerUtil.kt
@@ -0,0 +1,7 @@
+package moe.nea.firmament.util.mc
+
+import net.minecraft.entity.EquipmentSlot
+import net.minecraft.entity.player.PlayerEntity
+
+
+val PlayerEntity.mainHandStack get() = this.getEquippedStack(EquipmentSlot.MAINHAND)
diff --git a/src/main/kotlin/util/mc/SNbtFormatter.kt b/src/main/kotlin/util/mc/SNbtFormatter.kt
index e773927..e2c24f6 100644
--- a/src/main/kotlin/util/mc/SNbtFormatter.kt
+++ b/src/main/kotlin/util/mc/SNbtFormatter.kt
@@ -1,5 +1,6 @@
 package moe.nea.firmament.util.mc
 
+import net.minecraft.nbt.AbstractNbtList
 import net.minecraft.nbt.NbtByte
 import net.minecraft.nbt.NbtByteArray
 import net.minecraft.nbt.NbtCompound
@@ -38,7 +39,7 @@ class SNbtFormatter private constructor() : NbtElementVisitor {
 
 
 	override fun visitString(element: NbtString) {
-		result.append(NbtString.escape(element.asString()))
+		result.append(NbtString.escape(element.value))
 	}
 
 	override fun visitByte(element: NbtByte) {
@@ -65,18 +66,18 @@ class SNbtFormatter private constructor() : NbtElementVisitor {
 		result.append(element.doubleValue()).append("d")
 	}
 
-	private fun visitArrayContents(array: List<NbtElement>) {
+	private fun visitArrayContents(array: AbstractNbtList) {
 		array.forEachIndexed { index, element ->
 			writeIndent()
 			element.accept(this)
-			if (array.size != index + 1) {
+			if (array.size() != index + 1) {
 				result.append(",")
 			}
 			result.append("\n")
 		}
 	}
 
-	private fun writeArray(arrayTypeTag: String, array: List<NbtElement>) {
+	private fun writeArray(arrayTypeTag: String, array: AbstractNbtList) {
 		result.append("[").append(arrayTypeTag).append("\n")
 		pushIndent()
 		visitArrayContents(array)