diff --git a/src/app/(stats)/player/[ign]/_stats/bedwars/components.tsx b/src/app/(stats)/player/[ign]/_stats/bedwars/components.tsx index 82c55e2..3884258 100644 --- a/src/app/(stats)/player/[ign]/_stats/bedwars/components.tsx +++ b/src/app/(stats)/player/[ign]/_stats/bedwars/components.tsx @@ -1,5 +1,5 @@ import { formatNumber } from "@/lib/formatters" -import { bedwarsLevelColors, getBedwarsStar, getPrestigeName, getTextColor } from "@/lib/hypixel/bedwars/bedwars" +import { getBedwarsStar, getPrestige } from "@/lib/hypixel/bedwars/bedwars" import { getBWLevelForExp } from "@/lib/hypixel/bedwars/level" import { cn } from "@/lib/utils" import { GenericProgress } from "../../_components/GenericProgress" @@ -7,7 +7,7 @@ import Multicolored from "../../_components/Multicolored" export function BedwarsLevel({ xp }: { xp: number }) { const level = getBWLevelForExp(xp) - const color = bedwarsLevelColors(level) + const color = getPrestige(level).color const star = getBedwarsStar(level) const val = `[${level}${star}]` @@ -30,6 +30,8 @@ export function BedwarsProgress({ level, percent, currentXp, ceilingXp }: { leve } export function BedWarsPrestige({ level }: { level: number }) { + const pres = getPrestige(level) + const star = getBedwarsStar(level) if (level >= 1000 && level < 1100) { return ( - {`${getPrestigeName(level)} ${getBedwarsStar(level)}`} + {`${pres.name} ${star}`} ) } return ( - - {`${getPrestigeName(level)} ${getBedwarsStar(level)}`} + + {`${pres.name} ${star}`} ) } @@ -67,7 +69,7 @@ function LevelNumber({ level, className }: { level: number, className?: string } ) } - return

{level}

+ return

{level}

} function Progress({ level, percent, tooltipId, tooltipContent }: { level: number, percent: number, tooltipId: string, tooltipContent: string }) { @@ -75,5 +77,5 @@ function Progress({ level, percent, tooltipId, tooltipContent }: { level: number return } - return + return } diff --git a/src/lib/hypixel/bedwars/bedwars.ts b/src/lib/hypixel/bedwars/bedwars.ts index 8fcd650..d0a30ca 100644 --- a/src/lib/hypixel/bedwars/bedwars.ts +++ b/src/lib/hypixel/bedwars/bedwars.ts @@ -64,44 +64,38 @@ export function concatBedwarsStats(...stats: BedwarsModeStats[]) { ] } -export function getTextColor(level: number) { +export function getPrestige(level: number) { const floored = floorLevel(level, 100) if (level > 5000) { - return PRESTIGES[PRESTIGES.length - 1].color + const pres = PRESTIGES.at(-1)! + + return { + color: pres.color, + name: pres.name, + colormap: pres.colormap.split("").map(v => { + return getColorFromCode(v) + }) + } } - return PRESTIGES.find(l => l.level === floored)!.color -} - -export function bedwarsLevelColors(level: number) { - if (level < 0) return getColorFromCode() - - const floored = floorLevel(level, 100) - if (floored < 1000) { - return getColorFromCode(PRESTIGES.find(v => v.level === floored)!.colormap) + const pres = PRESTIGES.find(p => p.level === floored)! + return { + color: pres.color, + name: pres.name, + colormap: pres.colormap.split("").map(v => { + return getColorFromCode(v) + }) + } } - if (floored > 5000) { - return PRESTIGES[PRESTIGES.length - 1].colormap.split("").map(v => { - return getColorFromCode(v) - }) + const pres = PRESTIGES.find(l => l.level === floored)! + return { + color: pres.color, + name: pres.name, + colormap: getColorFromCode(pres.colormap) } - - return PRESTIGES.find(v => v.level === floored)!.colormap.split("").map(v => { - return getColorFromCode(v) - }) -} - -export function getPrestigeName(level: number) { - const floored = floorLevel(level, 100) - - if (level > 5000) { - return PRESTIGES[PRESTIGES.length - 1].name - } - - return PRESTIGES.find(p => p.level === floored)!.name } export function getWalletMax(name?: string) { diff --git a/src/middleware.ts b/src/middleware.ts deleted file mode 100644 index 0e23a7f..0000000 --- a/src/middleware.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NextRequest } from "next/server" - -export async function middleware(req: NextRequest) { - if (req.nextUrl.pathname.startsWith("/_next/")) return - if (req.nextUrl.pathname.startsWith("/favicon.ico")) return - - console.log(`[Middleware] ${req.method} ${req.nextUrl.pathname}`) -} - -export const config = { - matcher: "/(.*)" -}