1 files changed, 19 insertions, 45 deletions
diff --git a/build/cleaners/skyblock/inventory.js b/build/cleaners/skyblock/inventory.js
index 098b8d4..714a302 100644
--- a/build/cleaners/skyblock/inventory.js
+++ b/build/cleaners/skyblock/inventory.js
@@ -1,32 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanInventories = exports.INVENTORIES = exports.cleanInventory = void 0;
 // maybe todo?: create a fast replacement for prismarine-nbt
-const nbt = __importStar(require("prismarine-nbt"));
+import * as nbt from '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, _o;
     // if the item doesn't have an id, it isn't an item
     if (rawItem.id === undefined)
         return null;
@@ -34,13 +11,13 @@ function cleanItem(rawItem) {
     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 : {};
+    const extraAttributes = itemTag?.ExtraAttributes ?? {};
     let headId;
     if (vanillaId === 397) {
-        const headDataBase64 = (_e = (_d = (_c = (_b = itemTag === null || itemTag === void 0 ? void 0 : itemTag.SkullOwner) === null || _b === void 0 ? void 0 : _b.Properties) === null || _c === void 0 ? void 0 : _c.textures) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.Value;
+        const headDataBase64 = itemTag?.SkullOwner?.Properties?.textures?.[0]?.Value;
         if (headDataBase64) {
             const headData = JSON.parse(base64decode(headDataBase64).toString());
-            const headDataUrl = (_g = (_f = headData === null || headData === void 0 ? void 0 : headData.textures) === null || _f === void 0 ? void 0 : _f.SKIN) === null || _g === void 0 ? void 0 : _g.url;
+            const headDataUrl = headData?.textures?.SKIN?.url;
             if (headDataUrl) {
                 const splitUrl = headDataUrl.split('/');
                 headId = splitUrl[splitUrl.length - 1];
@@ -48,26 +25,26 @@ function cleanItem(rawItem) {
         }
     }
     return {
-        id: (_h = extraAttributes === null || extraAttributes === void 0 ? void 0 : extraAttributes.id) !== null && _h !== void 0 ? _h : null,
-        count: itemCount !== null && itemCount !== void 0 ? itemCount : 1,
+        id: extraAttributes?.id ?? null,
+        count: itemCount ?? 1,
         vanillaId: damageValue ? `${vanillaId}:${damageValue}` : vanillaId.toString(),
         display: {
-            name: (_k = (_j = itemTag === null || itemTag === void 0 ? void 0 : itemTag.display) === null || _j === void 0 ? void 0 : _j.Name) !== null && _k !== void 0 ? _k : 'null',
-            lore: (_m = (_l = itemTag === null || itemTag === void 0 ? void 0 : itemTag.display) === null || _l === void 0 ? void 0 : _l.Lore) !== null && _m !== void 0 ? _m : [],
+            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: ((_o = itemTag === null || itemTag === void 0 ? void 0 : itemTag.ench) !== null && _o !== void 0 ? _o : []).length > 0
+            glint: (itemTag?.ench ?? []).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,
+        reforge: extraAttributes?.modifier,
+        enchantments: extraAttributes?.enchantments,
+        anvil_uses: extraAttributes?.anvil_uses,
+        timestamp: extraAttributes?.timestamp,
         head_texture: headId,
     };
 }
 function cleanItems(rawItems) {
     return rawItems.map(cleanItem);
 }
-function cleanInventory(encodedNbt) {
+export function cleanInventory(encodedNbt) {
     return new Promise(resolve => {
         const base64Data = base64decode(encodedNbt);
         nbt.parse(base64Data, false, (err, value) => {
@@ -77,8 +54,7 @@ function cleanInventory(encodedNbt) {
         });
     });
 }
-exports.cleanInventory = cleanInventory;
-exports.INVENTORIES = {
+export const INVENTORIES = {
     armor: 'inv_armor',
     inventory: 'inv_contents',
     ender_chest: 'ender_chest_contents',
@@ -89,12 +65,11 @@ exports.INVENTORIES = {
     trick_or_treat_bag: 'candy_inventory_contents',
     wardrobe: 'wardrobe_contents'
 };
-async function cleanInventories(data) {
-    var _a;
+export async function cleanInventories(data) {
     const cleanInventories = {};
-    for (const cleanInventoryName in exports.INVENTORIES) {
-        const hypixelInventoryName = exports.INVENTORIES[cleanInventoryName];
-        const encodedInventoryContents = (_a = data[hypixelInventoryName]) === null || _a === void 0 ? void 0 : _a.data;
+    for (const cleanInventoryName in INVENTORIES) {
+        const hypixelInventoryName = INVENTORIES[cleanInventoryName];
+        const encodedInventoryContents = data[hypixelInventoryName]?.data;
         let inventoryContents;
         if (encodedInventoryContents) {
             inventoryContents = await cleanInventory(encodedInventoryContents);
@@ -106,4 +81,3 @@ async function cleanInventories(data) {
     }
     return cleanInventories;
 }
-exports.cleanInventories = cleanInventories;