@@ -109,16 +115,31 @@
- {
- await navigator.share({
- url: location.href,
- title: `Stats for ${profile.username} on Hypixel`
- });
- }}>
-
+
+
+
+
+
+
+
Plancke
- navigator.clipboard.writeText(profile.uuid)}>Copy UUID
+
+
+
+
+
+
+
{#each Object.entries(profile.social) as [key, value]}
{#if key === "DISCORD"}
diff --git a/src/lib/sections/stats/Armor.svelte b/src/lib/sections/stats/Armor.svelte
index 412fb55f2..0f750906e 100644
--- a/src/lib/sections/stats/Armor.svelte
+++ b/src/lib/sections/stats/Armor.svelte
@@ -6,6 +6,7 @@
import Items from "$lib/layouts/stats/Items.svelte";
import { getRarityClass } from "$lib/shared/helper";
import { cn } from "$lib/shared/utils";
+ import { ScrollArea } from "bits-ui";
const { profile } = getProfileCtx();
@@ -38,7 +39,24 @@
- {#each firstWardrobeItems as _, i}
-
diff --git a/src/lib/sections/stats/Inventory.svelte b/src/lib/sections/stats/Inventory.svelte
index 65dad0ea4..f07b1f7bb 100644
--- a/src/lib/sections/stats/Inventory.svelte
+++ b/src/lib/sections/stats/Inventory.svelte
@@ -82,7 +82,15 @@
].filter((tab) => tab.items.length > 0)
);
- const openStorageTab = writable("0");
+ let openStorageTab = writable("0");
+ $effect(() => {
+ console.log($openTab);
+ if ($openTab === "storage") {
+ openStorageTab.set("0");
+ } else if ($openTab === "museum") {
+ openStorageTab.set("19");
+ }
+ });
const [send, receive] = crossfade({
duration: 300,
@@ -125,7 +133,7 @@
{#each tabs as tab}
{#if $openTab === tab.id}
- {#if tab.id === "storage"}
+ {#if tab.id === "storage" || tab.id === "museum"}
@@ -146,8 +154,8 @@
{/each}
- {#if tab.items[Number($openStorageTab)].containsItems}
- {@const containedItems = tab.items[Number($openStorageTab)].containsItems as ProcessedSkyBlockItem[]}
+ {#if tab.items[Number($openStorageTab)]?.containsItems}
+ {@const containedItems = (tab.items[Number($openStorageTab)].containsItems as ProcessedSkyBlockItem[]) || []}
-
+
Copied!
+ {:else} +Copy URL
+ {/if} +Copied!
+ {:else} +Copy UUID
+ {/if} +
+
+
+
+
+
+
+
+
+
+
+ {#each firstWardrobeItems as _, i}
+
+
+
+ {/each}
+
{#each containedItems as containedItem, index}
diff --git a/src/lib/sections/stats/Pets.svelte b/src/lib/sections/stats/Pets.svelte
index 720070170..13cce0952 100644
--- a/src/lib/sections/stats/Pets.svelte
+++ b/src/lib/sections/stats/Pets.svelte
@@ -52,7 +52,7 @@
-
{(activePet.rarity ?? "common").toLowerCase()} {activePet.display_name.toLowerCase()}
+{(activePet.rarity ?? "common").toLowerCase()} {activePet.type.toLowerCase()}
Level {activePet.level}
-
{#each profile.items.weapons.weapons as weapon}
diff --git a/src/lib/sections/stats/skills/farming.svelte b/src/lib/sections/stats/skills/farming.svelte
index 56bda6bff..8daf9144b 100644
--- a/src/lib/sections/stats/skills/farming.svelte
+++ b/src/lib/sections/stats/skills/farming.svelte
@@ -5,8 +5,7 @@
import Item from "$lib/components/Item.svelte";
import SectionSubtitle from "$lib/components/SectionSubtitle.svelte";
import Items from "$lib/layouts/stats/Items.svelte";
- import { formatNumber, getRarityClass } from "$lib/shared/helper";
- import { cn } from "$lib/shared/utils";
+ import { formatNumber, renderLore } from "$lib/shared/helper";
import { Collapsible } from "bits-ui";
import ChevronDown from "lucide-svelte/icons/chevron-down";
@@ -59,7 +58,7 @@
{#if highestPriorityFarmingTool}
+ Active Weapon: + {@html renderLore(profile.items.weapons.highest_priority_weapon.display_name)} +
Active Tool: - {highestPriorityFarmingTool.display_name} + {@html renderLore(highestPriorityFarmingTool.display_name)}
{/if} diff --git a/src/lib/sections/stats/skills/fishing.svelte b/src/lib/sections/stats/skills/fishing.svelte index c88ad4ee4..7aa151b5a 100644 --- a/src/lib/sections/stats/skills/fishing.svelte +++ b/src/lib/sections/stats/skills/fishing.svelte @@ -5,8 +5,7 @@ import Item from "$lib/components/Item.svelte"; import SectionSubtitle from "$lib/components/SectionSubtitle.svelte"; import Items from "$lib/layouts/stats/Items.svelte"; - import { getRarityClass, renderLore } from "$lib/shared/helper"; - import { cn } from "$lib/shared/utils"; + import { renderLore } from "$lib/shared/helper"; import { Avatar, Collapsible } from "bits-ui"; import ChevronDown from "lucide-svelte/icons/chevron-down"; import Image from "lucide-svelte/icons/image"; @@ -37,7 +36,7 @@ {#if highestPriorityFishingTool}Active Rod: - {highestPriorityFishingTool.display_name} + {@html renderLore(highestPriorityFishingTool.display_name)}
{/if} diff --git a/src/lib/sections/stats/skills/mining.svelte b/src/lib/sections/stats/skills/mining.svelte index 5c8abb5d2..0b38980ea 100644 --- a/src/lib/sections/stats/skills/mining.svelte +++ b/src/lib/sections/stats/skills/mining.svelte @@ -4,7 +4,7 @@ import Item from "$lib/components/Item.svelte"; import SectionSubtitle from "$lib/components/SectionSubtitle.svelte"; import Items from "$lib/layouts/stats/Items.svelte"; - import { getRarityClass } from "$lib/shared/helper"; + import { renderLore } from "$lib/shared/helper"; import { cn } from "$lib/shared/utils"; import { formatDate, formatDistanceToNowStrict } from "date-fns"; import { format } from "numerable"; @@ -22,7 +22,7 @@ {#if highestPriorityMiningTool}Active Tool: - {highestPriorityMiningTool.display_name} + {@html renderLore(highestPriorityMiningTool.display_name)}
{/if} diff --git a/src/lib/server/constants/mining.ts b/src/lib/server/constants/mining.ts index e99025a30..708d18ab3 100644 --- a/src/lib/server/constants/mining.ts +++ b/src/lib/server/constants/mining.ts @@ -323,12 +323,22 @@ class HotM { }; return { - id: parseInt(data[this.status].split(":")[0], 10), - Damage: parseInt(data[this.status].split(":")[1], 10), + id: parseInt(data[this.status].split(":")[0]), + damage: parseInt(data[this.status].split(":")[1]), glowing: false }; } + get texture_path() { + const data = { + locked: "STAINED_GLASS_PANE:14", + next: "STAINED_GLASS_PANE:4", + unlocked: "STAINED_GLASS_PANE:5" + }; + + return `/api/item/${data[this.status]}`; + } + get position10x9() { return 9 * (HOTM.tiers - this.tier) + 1; } @@ -401,7 +411,7 @@ class Node { return { id: parseInt(data[this.nodeType][this.status].split(":")[0], 10), - Damage: parseInt(data[this.nodeType][this.status].split(":")[1], 10), + damage: parseInt(data[this.nodeType][this.status].split(":")[1], 10), glowing: this.selectedPickaxeAbility === this.id }; } @@ -1616,14 +1626,16 @@ class MineshaftMayhem extends Node { class HotmItem { position: number; displayName: string; - itemData: { id: number; Damage: number; glowing: boolean; texture_path: string; skyblock_id?: string }; + texture_path: string; + itemData: { id: number; damage: number; glowing: boolean; skyblock_id?: string }; resources: { token_of_the_mountain: number; mithril_powder: number; gemstone_powder: number }; last_reset: number; rarity: string; constructor() { this.position = 0; this.displayName = ""; - this.itemData = { id: 0, Damage: 0, glowing: false, texture_path: "", skyblock_id: "" }; + this.texture_path = ""; + this.itemData = { id: 0, damage: 0, glowing: false, skyblock_id: "" }; this.resources = { token_of_the_mountain: 0, mithril_powder: 0, gemstone_powder: 0 }; this.last_reset = 0; this.rarity = "special"; @@ -1638,13 +1650,13 @@ class HotmStats extends HotmItem { constructor(data: HotmItemData) { super(); this.displayName = "ยง5Heart of the Mountain"; + this.texture_path = "/api/head/86f06eaa3004aeed09b3d5b45d976de584e691c0e9cade133635de93d23b9edb"; this.rarity = "epic"; this.position = 1; this.itemData = { id: 397, - Damage: 3, - glowing: false, - texture_path: "/api/head/86f06eaa3004aeed09b3d5b45d976de584e691c0e9cade133635de93d23b9edb" + damage: 3, + glowing: false }; this.resources = { token_of_the_mountain: data.resources.token_of_the_mountain || 0, @@ -1663,14 +1675,13 @@ class CrystalHollowsCrystals extends HotmItem { constructor(data: HotmItemData) { super(); this.displayName = "ยง5Crystal Hollows Crystals"; + this.texture_path = "/api/head/ef7835fc9e6daf632160e9b7ff378788a408064cc75ebf9f5158e615bdd59603"; this.rarity = "epic"; this.position = 2; this.itemData = { id: 397, - Damage: 3, - glowing: false, - texture_path: "/api/head/ef7835fc9e6daf632160e9b7ff378788a408064cc75ebf9f5158e615bdd59603", - skyblock_id: "hotm_crystal" + damage: 3, + glowing: false }; this.crystals = data.crystals ?? {}; } @@ -1717,13 +1728,13 @@ class HotmReset extends HotmItem { constructor(data: HotmItemData) { super(); this.displayName = "ยงcReset Heart of the Mountain"; + this.texture_path = "/api/head/6448e275313532f54c4ba21894809a23dce52af01ddd1e89fc7689481fab737e"; this.rarity = "special"; this.position = 3; this.itemData = { id: 397, - Damage: 3, + damage: 3, glowing: false, - texture_path: "/api/head/6448e275313532f54c4ba21894809a23dce52af01ddd1e89fc7689481fab737e", skyblock_id: "hotm_reset" }; this.last_reset = data.last_reset; diff --git a/src/lib/server/constants/museum.ts b/src/lib/server/constants/museum.ts index 9ebe56503..1579b1b98 100644 --- a/src/lib/server/constants/museum.ts +++ b/src/lib/server/constants/museum.ts @@ -69,42 +69,6 @@ async function retrieveMuseumItems() { console.log(`[MUSEUM] Updated museum items in ${Date.now() - timeNow}ms`); } -const categoryInventory = [ - { - display_name: "Go Back", - texture_path: "/api/item/ARROW", - rarity: "uncommon", - tag: { - display: { - Lore: [] - } - }, - position: 48 - }, - { - display_name: "Close", - texture_path: "/api/item/BARRIER", - rarity: "special", - tag: { - display: { - Lore: [] - } - }, - position: 49 - }, - { - display_name: "Next Page", - texture_path: "/api/item/ARROW", - rarity: "uncommon", - tag: { - display: { - Lore: [] - } - }, - position: 53 - } -]; - const MUSEUM: MuseumConstants = { armor_to_id: {}, armor_sets: {}, @@ -141,19 +105,7 @@ export const MUSEUM_INVENTORY = { } }, inventoryType: "weapons", - containsItems: [ - { - display_name: "Weapons", - rarity: "uncommon", - tag: { - display: { - Lore: ["ยง7View all of the ยง6Weapons ยง7that", "ยง7you have donated to the", "ยง7ยง9Museumยง7!", ""] - } - }, - position: 4 - }, - ...categoryInventory - ], + containsItems: [], position: 19, progressType: "weapons" }, @@ -168,19 +120,7 @@ export const MUSEUM_INVENTORY = { }, position: 21, inventoryType: "armor", - containsItems: [ - { - display_name: "Armor Sets", - rarity: "uncommon", - tag: { - display: { - Lore: ["ยง7View all of the ยง9Armor Sets", "ยง9ยง7that you have donated to the", "ยง7ยง9Museumยง7!", ""] - } - }, - position: 4 - }, - ...categoryInventory - ], + containsItems: [], progressType: "armor" }, { @@ -194,20 +134,7 @@ export const MUSEUM_INVENTORY = { }, position: 23, inventoryType: "rarities", - containsItems: [ - { - display: "Rarities", - rarity: "uncommon", - texture_path: "/api/head/86addbd5dedad40999473be4a7f48f6236a79a0dce971b5dbd7372014ae394d", - tag: { - display: { - Lore: ["ยง7View all of the ยง5Rarities", "ยง5ยง7that you have donated to the", "ยง7ยง9Museumยง7!", ""] - } - }, - position: 4 - }, - ...categoryInventory - ], + containsItems: [], progressType: "rarities" }, { @@ -221,19 +148,7 @@ export const MUSEUM_INVENTORY = { }, position: 25, inventoryType: "special", - containsItems: [ - { - display_name: "Special Items", - rarity: "uncommon", - tag: { - display: { - Lore: ["ยง7View all of the ยงdSpecial Items", "ยงdยง7that you have donated to the", "ยง7ยง9Museumยง7!", "", "ยง7These items don't count towards", "ยง7Museum progress and rewards, but", "ยง7are cool nonetheless. Items that", "ยง7are ยง9rare ยง7and ยง6prestigious", "ยง6ยง7fit into this category, and", "ยง7can be displayed in the Main", "ยง7room of the Museum.", ""] - } - }, - position: 4 - }, - ...categoryInventory - ], + containsItems: [], progressType: "special" }, { @@ -286,6 +201,7 @@ export const MUSEUM_INVENTORY = { missing_item: { weapons: { display_name: null, + texture_path: "/api/item/INK_SACK:8", rarity: "special", tag: { display: { @@ -295,6 +211,7 @@ export const MUSEUM_INVENTORY = { }, armor: { display_name: null, + texture_path: "/api/item/INK_SACK:8", rarity: "special", tag: { display: { @@ -304,6 +221,7 @@ export const MUSEUM_INVENTORY = { }, rarities: { display_name: null, + texture_path: "/api/item/INK_SACK:8", rarity: "special", tag: { display: { @@ -315,6 +233,7 @@ export const MUSEUM_INVENTORY = { }, higher_tier_donated: { display_name: null, + texture_path: "/api/item/INK_SACK:10", rarity: "special", tag: { display: { diff --git a/src/lib/server/custom_resources.ts b/src/lib/server/custom_resources.ts index 7bddb15cd..aa2c5f9de 100644 --- a/src/lib/server/custom_resources.ts +++ b/src/lib/server/custom_resources.ts @@ -1,3 +1,4 @@ +import { dev } from "$app/environment"; import { createCanvas, loadImage, type Canvas } from "@napi-rs/canvas"; import fs from "fs-extra"; import _ from "lodash"; @@ -25,7 +26,7 @@ import { format } from "numerable"; const execFile = util.promisify(child_process.execFile); const NORMALIZED_SIZE = 128; -const RESOURCE_CACHING = process.env.NODE_ENV === "development"; +const RESOURCE_CACHING = dev; const FOLDER_PATH = getFolderPath(); const RESOURCE_PACK_FOLDER = path.resolve(getFolderPath(), "static", "resourcepacks"); @@ -166,6 +167,9 @@ async function loadPackConfigs() { } async function loadResourcePacks() { + if (resourcesReady === true) { + return; + } resourcePacks = resourcePacks.sort((a, b) => a.config.priority - b.config.priority); for (const pack of resourcePacks) { @@ -586,7 +590,7 @@ const timeoutId = setTimeout(async () => { const damage = texture.damage ?? 0; if (itemId !== undefined) { // Skip PLAYER_SKULL, but keep MOB SKULLS (Skeleton, Zombie, etc.) - if (itemId !== 397 || (itemId === 397 && [0, 1, 2, 4, 5].includes(damage))) { + if (itemId !== 397 || itemId === 397) { const key = `${pack.config.id}:${itemId}:${damage}`; const data = itemIdTextureMap.get(key) ?? []; diff --git a/src/lib/server/helper.ts b/src/lib/server/helper.ts index 94cee2084..c86fa8086 100644 --- a/src/lib/server/helper.ts +++ b/src/lib/server/helper.ts @@ -182,12 +182,51 @@ export function addToItemLore(item: Partial