2 files changed, 68 insertions, 8 deletions

diff --git a/src/cleaners/skyblock/inventory.ts b/src/cleaners/skyblock/inventory.ts
index ea115e5..342ece6 100644
--- a/src/cleaners/skyblock/inventory.ts
+++ b/src/cleaners/skyblock/inventory.ts
@@ -4,13 +4,67 @@ function base64decode(base64: string): Buffer {
 	return Buffer.from(base64, 'base64')
 }
 
-export function cleanInventory(encodedNbt: string): Promise<any> {
+interface Item {
+	id: string
+	count: number
+	vanillaId: string
+
+	display: {
+		name: string
+		lore: string[]
+		glint: boolean
+	}
+
+	reforge?: string
+	anvil_uses?: number
+	timestamp?: string
+	enchantments?: { [ name: string ]: number }
+
+	skull_owner?: string
+
+}
+
+export type Inventory = Item[]
+
+function cleanItem(rawItem): Item {
+	const vanillaId = rawItem.id
+	const itemCount = rawItem.Count
+	const damageValue = rawItem.Damage
+	const itemTag = rawItem.tag
+	const extraAttributes = itemTag?.ExtraAttributes ?? {}
+	return {
+		id: extraAttributes?.id ?? null,
+		count: itemCount ?? 1,
+		vanillaId: damageValue ? `${vanillaId}:${damageValue}` : vanillaId,
+
+		display: {
+			name: itemTag?.display?.Name ?? 'null',
+			lore: itemTag?.display?.Lore ?? [],
+			// if it has an ench value in the tag, then it should have an enchant glint effect
+			glint: (itemTag?.ench ?? []).length > 0
+		},
+
+		reforge: extraAttributes?.modifier,
+		enchantments: extraAttributes?.enchantments,
+		anvil_uses: extraAttributes?.anvil_uses,
+		timestamp: extraAttributes?.timestamp,
+
+		skull_owner: itemTag?.SkullOwner?.Properties?.textures?.[0]?.value ?? undefined,
+
+	}
+}
+
+function cleanItems(rawItems): Inventory {
+	return rawItems.map(cleanItem)
+}
+
+export function cleanInventory(encodedNbt: string): Promise<Inventory> {
 	return new Promise(resolve => {
 		const base64Data = base64decode(encodedNbt)
 		nbt.parse(base64Data, false, (err, value) => {
 			const simplifiedNbt = nbt.simplify(value)
-			// .i because hypixel decided to do that
-			resolve(simplifiedNbt.i)
+			// do some basic cleaning on the items and return
+			resolve(cleanItems(simplifiedNbt.i))
 		})
 	})
 }
@@ -27,15 +81,21 @@ export const INVENTORIES = {
 	wardrobe: 'wardrobe_contents'
 }
 
-export async function cleanInventories(data: any): Promise<typeof INVENTORIES> {
-	console.log('cleanInventories', data.uuid)
+export type Inventories = { [name in keyof typeof INVENTORIES ]: Inventories }
+
+export async function cleanInventories(data: any): Promise<Inventories> {
 	const cleanInventories: any = {}
 	for (const cleanInventoryName in INVENTORIES) {
 		const hypixelInventoryName = INVENTORIES[cleanInventoryName]
 		const encodedInventoryContents = data[hypixelInventoryName]?.data
-		let inventoryContents
+		let inventoryContents: Inventory
 		if (encodedInventoryContents)
 			inventoryContents = await cleanInventory(encodedInventoryContents)
+
+		if (cleanInventoryName === 'armor')
+			// the armor is sent from boots to head, the opposite makes more sense
+			inventoryContents.reverse()
+
 		cleanInventories[cleanInventoryName] = inventoryContents
 	}
 	return cleanInventories
diff --git a/src/cleaners/skyblock/member.ts b/src/cleaners/skyblock/member.ts
index 796d524..6796f7d 100644
--- a/src/cleaners/skyblock/member.ts
+++ b/src/cleaners/skyblock/member.ts
@@ -1,5 +1,5 @@
 import { CleanProfileStats, cleanProfileStats } from './stats'
-import { cleanInventories, INVENTORIES } from './inventory'
+import { cleanInventories, Inventories, INVENTORIES } from './inventory'
 import { cleanFairySouls, FairySouls } from './fairysouls'
 import { cleanObjectives, Objective } from './objectives'
 import { CleanMinion, cleanMinions } from './minions'
@@ -22,7 +22,7 @@ export interface CleanMember extends CleanBasicMember {
     stats: CleanProfileStats
     minions: CleanMinion[]
 	fairy_souls: FairySouls
-    inventories: typeof INVENTORIES
+    inventories: Inventories
     objectives: Objective[]
     skills: Skill[]
 }