From a6cff35351d418272d137013cd536c26e978b6f6 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 17 Feb 2022 00:19:51 -0600 Subject: move some stuff and change how constants are done --- src/lib/Header.svelte | 2 +- src/lib/Username.svelte | 51 -------------------------- src/lib/heads/Head2d.svelte | 30 --------------- src/lib/heads/Head3d.svelte | 27 -------------- src/lib/minecraft/Inventory.svelte | 45 +++++++++++++++++++++++ src/lib/minecraft/Item.svelte | 32 ++++++++++++++++ src/lib/minecraft/Username.svelte | 51 ++++++++++++++++++++++++++ src/lib/minecraft/heads/Head2d.svelte | 30 +++++++++++++++ src/lib/minecraft/heads/Head3d.svelte | 27 ++++++++++++++ src/lib/profile.ts | 6 +-- src/lib/sections/Armor.svelte | 7 ++++ src/lib/sections/Infobox.svelte | 3 +- src/lib/utils.ts | 3 +- src/routes/constants.json.ts | 18 --------- src/routes/player/[player]/[profile].svelte | 57 ++++++++++++++++++++++------- src/routes/player/[player]/index.svelte | 6 --- 16 files changed, 243 insertions(+), 152 deletions(-) delete mode 100644 src/lib/Username.svelte delete mode 100644 src/lib/heads/Head2d.svelte delete mode 100644 src/lib/heads/Head3d.svelte create mode 100644 src/lib/minecraft/Inventory.svelte create mode 100644 src/lib/minecraft/Item.svelte create mode 100644 src/lib/minecraft/Username.svelte create mode 100644 src/lib/minecraft/heads/Head2d.svelte create mode 100644 src/lib/minecraft/heads/Head3d.svelte create mode 100644 src/lib/sections/Armor.svelte delete mode 100644 src/routes/constants.json.ts (limited to 'src') diff --git a/src/lib/Header.svelte b/src/lib/Header.svelte index a5ec702..48f5167 100644 --- a/src/lib/Header.svelte +++ b/src/lib/Header.svelte @@ -6,7 +6,7 @@
- + diff --git a/src/lib/Username.svelte b/src/lib/Username.svelte deleted file mode 100644 index d415511..0000000 --- a/src/lib/Username.svelte +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - {#if headType == '3d'} - - {:else if headType == '2d'} - - {/if} - {#if prefix} - - {@html formattingCodeToHtml(player.rank.colored)} - - {/if} - {player.username} - - - diff --git a/src/lib/heads/Head2d.svelte b/src/lib/heads/Head2d.svelte deleted file mode 100644 index d4e9ca8..0000000 --- a/src/lib/heads/Head2d.svelte +++ /dev/null @@ -1,30 +0,0 @@ - - -{player.username}'s face - - diff --git a/src/lib/heads/Head3d.svelte b/src/lib/heads/Head3d.svelte deleted file mode 100644 index f8d2657..0000000 --- a/src/lib/heads/Head3d.svelte +++ /dev/null @@ -1,27 +0,0 @@ - - -{player.username}'s head - - diff --git a/src/lib/minecraft/Inventory.svelte b/src/lib/minecraft/Inventory.svelte new file mode 100644 index 0000000..3d3b9c0 --- /dev/null +++ b/src/lib/minecraft/Inventory.svelte @@ -0,0 +1,45 @@ + + +
+ {#each itemGroups as itemGroup, groupIndex} +
+ {#each itemGroup as item} + + {/each} +
+ {/each} +
+ + diff --git a/src/lib/minecraft/Item.svelte b/src/lib/minecraft/Item.svelte new file mode 100644 index 0000000..86bd8f1 --- /dev/null +++ b/src/lib/minecraft/Item.svelte @@ -0,0 +1,32 @@ + + + + + diff --git a/src/lib/minecraft/Username.svelte b/src/lib/minecraft/Username.svelte new file mode 100644 index 0000000..d415511 --- /dev/null +++ b/src/lib/minecraft/Username.svelte @@ -0,0 +1,51 @@ + + + + + + {#if headType == '3d'} + + {:else if headType == '2d'} + + {/if} + {#if prefix} + + {@html formattingCodeToHtml(player.rank.colored)} + + {/if} + {player.username} + + + diff --git a/src/lib/minecraft/heads/Head2d.svelte b/src/lib/minecraft/heads/Head2d.svelte new file mode 100644 index 0000000..d4e9ca8 --- /dev/null +++ b/src/lib/minecraft/heads/Head2d.svelte @@ -0,0 +1,30 @@ + + +{player.username}'s face + + diff --git a/src/lib/minecraft/heads/Head3d.svelte b/src/lib/minecraft/heads/Head3d.svelte new file mode 100644 index 0000000..f8d2657 --- /dev/null +++ b/src/lib/minecraft/heads/Head3d.svelte @@ -0,0 +1,27 @@ + + +{player.username}'s head + + diff --git a/src/lib/profile.ts b/src/lib/profile.ts index 973a6da..320a5dc 100644 --- a/src/lib/profile.ts +++ b/src/lib/profile.ts @@ -10,16 +10,16 @@ export function prettyTimestamp(ms: number) { return timeAsString } -export function generateInfobox(data, constants, opts: { meta: boolean }): string[] { +export function generateInfobox(data, opts: { meta: boolean }): string[] { const result: string[] = [] result.push(`💾 Last save: ${prettyTimestamp(data.member.last_save * 1000)}`) result.push(`🚶 Profile created: ${prettyTimestamp(data.member.first_join * 1000)}`) - result.push(`✨ Fairy souls: ${data.member.fairy_souls.total}/${constants.max_fairy_souls}`) + result.push(`✨ Fairy souls: ${data.member.fairy_souls.total}/${data.member.fairy_souls.max}`) - if (data.profile.minion_count >= constants.max_minions) + if (data.profile.minion_count >= data.profile.maxUniqueMinions) result.push(`🤖 Minion count: ${data.profile.minion_count}`) let mostSignificantKillsStat = null diff --git a/src/lib/sections/Armor.svelte b/src/lib/sections/Armor.svelte new file mode 100644 index 0000000..c4e7950 --- /dev/null +++ b/src/lib/sections/Armor.svelte @@ -0,0 +1,7 @@ + + + diff --git a/src/lib/sections/Infobox.svelte b/src/lib/sections/Infobox.svelte index eda7d22..c5c3454 100644 --- a/src/lib/sections/Infobox.svelte +++ b/src/lib/sections/Infobox.svelte @@ -4,7 +4,6 @@ import Emoji from '$lib/Emoji.svelte' export let data - export let constants + +
+ +
+
+ {#if data.member.inventories.armor} +
+

Armor

+ +
+ {/if} + +
+
diff --git a/src/routes/player/[player]/index.svelte b/src/routes/player/[player]/index.svelte index 8704b09..7252a80 100644 --- a/src/routes/player/[player]/index.svelte +++ b/src/routes/player/[player]/index.svelte @@ -11,11 +11,6 @@ return { fallthrough: true } as unknown } - // this should happen instantly - // const constants = await fetch('/_constants.json').then(r => r.json()) - - // console.log('constants', constants) - if (data.player.username !== player) { return { redirect: `/player/${data.player.username}`, @@ -37,7 +32,6 @@ import Head from '$lib/Head.svelte' export let data - // export let constants let activeProfile = null let activeProfileLastSave: number = 0 -- cgit