dynamic packs and bug fixes

3 files changed, 21 insertions, 12 deletions

diff --git a/src/lib/minecraft/Inventory.svelte b/src/lib/minecraft/Inventory.svelte
index 0a6a179..b3c464d 100644
--- a/src/lib/minecraft/Inventory.svelte
+++ b/src/lib/minecraft/Inventory.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
 	import type { Inventory, Item as APIItem } from '$lib/APITypes'
+	import type { MatcherFile } from 'skyblock-assets'
 
 	import Item from './Item.svelte'
 
 	export let items: Inventory
 	export let name = ''
-	export let pack = ''
+	export let pack: MatcherFile | undefined = undefined
 	export let groupLimit = 9
 
 	// each item group has 9 items
diff --git a/src/lib/minecraft/Item.svelte b/src/lib/minecraft/Item.svelte
index 13ca8c7..5553840 100644
--- a/src/lib/minecraft/Item.svelte
+++ b/src/lib/minecraft/Item.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
-	import MinecraftTooltip from './MinecraftTooltip.svelte'
 	import { formattingCodeToHtml, removeFormattingCode } from '$lib/utils'
+	import MinecraftTooltip from './MinecraftTooltip.svelte'
+	import type { MatcherFile } from 'skyblock-assets'
 	import { itemToUrl } from './inventory'
 
 	export let item: any | null
 	export let isslot = true
-	export let pack = ''
+	export let pack: MatcherFile | undefined = undefined
 
 	let itemLoreHtml: string | null
 	let itemNameHtml: string | null
diff --git a/src/lib/minecraft/inventory.ts b/src/lib/minecraft/inventory.ts
index 72d72ee..e9d840c 100644
--- a/src/lib/minecraft/inventory.ts
+++ b/src/lib/minecraft/inventory.ts
@@ -1,7 +1,6 @@
 import * as skyblockAssets from 'skyblock-assets'
 import vanilla from 'skyblock-assets/matchers/vanilla.json'
-import packshq from 'skyblock-assets/matchers/vanilla.json'
-import furfsky_reborn from 'skyblock-assets/matchers/furfsky_reborn.json'
+
 
 export interface Item {
     id?: string
@@ -36,7 +35,7 @@ const INVENTORIES = {
 
 export type Inventories = { [name in keyof typeof INVENTORIES]: Item[] }
 
-export function itemToUrl(item: Item, packName?: string): string {
+export function itemToUrl(item: Item, pack?: skyblockAssets.MatcherFile): string {
     const itemNbt: skyblockAssets.NBT = {
         display: {
             Name: item.display?.name
@@ -46,20 +45,28 @@ export function itemToUrl(item: Item, packName?: string): string {
         },
     }
     let textureUrl: string
-    if (item.head_texture)
-        textureUrl = `https://mc-heads.net/head/${item.head_texture}`
-    else
+    if (item.head_texture) {
+        // if it's a head, try without vanilla and if it fails just use the mc-heads url
+        textureUrl = skyblockAssets.getTextureUrl({
+            id: item.vanillaId,
+            nbt: itemNbt,
+            packs: pack ? [pack] : [],
+            noNullTexture: true
+        })
+        if (textureUrl === null)
+            textureUrl = `https://mc-heads.net/head/${item.head_texture}`
+    } else
         textureUrl = skyblockAssets.getTextureUrl({
             id: item.vanillaId,
             nbt: itemNbt,
-            packs: [furfsky_reborn, vanilla]
+            packs: pack ? [pack, vanilla as skyblockAssets.MatcherFile] : [vanilla as skyblockAssets.MatcherFile],
         })
     return textureUrl
 }
 
-export function skyblockItemToUrl(skyblockItem: string | Item) {
+export function skyblockItemToUrl(skyblockItem: string | Item, pack?: skyblockAssets.MatcherFile) {
     const item: Item = typeof skyblockItem === 'string' ? skyblockItemNameToItem(skyblockItem) : skyblockItem
-    const itemTextureUrl = itemToUrl(item, 'packshq')
+    const itemTextureUrl = itemToUrl(item, pack)
     return itemTextureUrl
 }