From 0896aa90b031fcb7c5820e885baa10f984991392 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sat, 13 Feb 2021 23:53:39 -0600
Subject: clean inventory items

---
 build/cleaners/skyblock/inventory.js | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/cleaners/skyblock/inventory.js b/build/cleaners/skyblock/inventory.js
index 16dcaec..28929bd 100644
--- a/build/cleaners/skyblock/inventory.js
+++ b/build/cleaners/skyblock/inventory.js
@@ -24,13 +24,40 @@ const nbt = __importStar(require("prismarine-nbt"));
 function base64decode(base64) {
     return Buffer.from(base64, 'base64');
 }
+function cleanItem(rawItem) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    const vanillaId = rawItem.id;
+    const itemCount = rawItem.Count;
+    const damageValue = rawItem.Damage;
+    const itemTag = rawItem.tag;
+    const extraAttributes = (_a = itemTag === null || itemTag === void 0 ? void 0 : itemTag.ExtraAttributes) !== null && _a !== void 0 ? _a : {};
+    return {
+        id: (_b = extraAttributes === null || extraAttributes === void 0 ? void 0 : extraAttributes.id) !== null && _b !== void 0 ? _b : null,
+        count: itemCount !== null && itemCount !== void 0 ? itemCount : 1,
+        vanillaId: damageValue ? `${vanillaId}:${damageValue}` : vanillaId,
+        display: {
+            name: (_d = (_c = itemTag === null || itemTag === void 0 ? void 0 : itemTag.display) === null || _c === void 0 ? void 0 : _c.Name) !== null && _d !== void 0 ? _d : 'null',
+            lore: (_f = (_e = itemTag === null || itemTag === void 0 ? void 0 : itemTag.display) === null || _e === void 0 ? void 0 : _e.Lore) !== null && _f !== void 0 ? _f : [],
+            // if it has an ench value in the tag, then it should have an enchant glint effect
+            glint: ((_g = itemTag === null || itemTag === void 0 ? void 0 : itemTag.ench) !== null && _g !== void 0 ? _g : []).length > 0
+        },
+        reforge: extraAttributes === null || extraAttributes === void 0 ? void 0 : extraAttributes.modifier,
+        enchantments: extraAttributes === null || extraAttributes === void 0 ? void 0 : extraAttributes.enchantments,
+        anvil_uses: extraAttributes === null || extraAttributes === void 0 ? void 0 : extraAttributes.anvil_uses,
+        timestamp: extraAttributes === null || extraAttributes === void 0 ? void 0 : extraAttributes.timestamp,
+        skull_owner: (_m = (_l = (_k = (_j = (_h = itemTag === null || itemTag === void 0 ? void 0 : itemTag.SkullOwner) === null || _h === void 0 ? void 0 : _h.Properties) === null || _j === void 0 ? void 0 : _j.textures) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.value) !== null && _m !== void 0 ? _m : undefined,
+    };
+}
+function cleanItems(rawItems) {
+    return rawItems.map(cleanItem);
+}
 function cleanInventory(encodedNbt) {
     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));
         });
     });
 }
@@ -48,7 +75,6 @@ exports.INVENTORIES = {
 };
 async function cleanInventories(data) {
     var _a;
-    console.log('cleanInventories', data.uuid);
     const cleanInventories = {};
     for (const cleanInventoryName in exports.INVENTORIES) {
         const hypixelInventoryName = exports.INVENTORIES[cleanInventoryName];
@@ -56,6 +82,9 @@ async function cleanInventories(data) {
         let inventoryContents;
         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;
-- 
cgit