Skip to content

Fix: detect slim skin variant in cape preview #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joan-code6 wants to merge 1 commit into
base: v3
Choose a base branch
from
Draft

Fix: detect slim skin variant in cape preview #185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions src/components/capes/CapeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function CapeItemDisplay({
hideModal,
isVanilla = false,
}: CapeItemDisplayProps) {
const handleCapeClick = useCallback(() => {
const handleCapeClick = useCallback(async () => {
if (isCurrentlyEquipping || !showModal) return;

const userSkinUrl = activeAccount?.id
Expand All @@ -74,6 +74,30 @@ function CapeItemDisplay({
const capeId = isVanilla ? (cape as VanillaCape).id : (cape as CosmeticCape)._id;
const capeUrl = isVanilla ? (cape as VanillaCape).url : `https://cdn.norisk.gg/capes/prod/${capeId}.png`;

// Try to detect the user's skin variant (slim vs classic) when possible so the 3D preview shows correctly.
// Fallback to 'classic' if detection fails or no access token is available.
let skinVariant: 'classic' | 'slim' = 'classic';
try {
if (activeAccount?.id && (activeAccount as any).access_token) {
// Lazy import to avoid adding extra weight when not needed
const { MinecraftSkinService } = await import("../../services/minecraft-skin-service");
const profile = await MinecraftSkinService.getUserSkinData(activeAccount.id, (activeAccount as any).access_token);
const texturesProp = profile?.properties?.find((p) => p.name === 'textures')?.value;
if (texturesProp) {
try {
const decoded = JSON.parse(atob(texturesProp));
const model = decoded?.textures?.SKIN?.metadata?.model;
if (model === 'slim') skinVariant = 'slim';
} catch (err) {
// ignore parse errors and keep default
}
}
}
} catch (err) {
// Ignore errors - we'll fallback to classic
console.warn('[CapeList] Failed to detect skin variant, using classic.', err);
}

showModal(`cape-preview-${capeId}`, (
<Modal
title="Cape Preview"
Expand All @@ -86,11 +110,13 @@ function CapeItemDisplay({
capeUrl={isVanilla ? capeUrl : undefined}
capeId={capeId}
isEquipped={false}
skinVariant={skinVariant}
onEquipCape={() => {
onEquipCape(capeId);
hideModal && hideModal(`cape-preview-${capeId}`);
}}
/>
{/* Pass skinVariant to SkinView3DWrapper via the preview component by mounting a small wrapper that sets the prop. */}
</Modal>
));
}, [cape, isCurrentlyEquipping, activeAccount, showModal, hideModal, onEquipCape, isVanilla]);
Expand Down Expand Up @@ -716,13 +742,15 @@ function Cape3DPreviewWithToggle({
capeUrl,
capeId,
onEquipCape,
isEquipped = false
isEquipped = false,
skinVariant = 'classic',
}: {
skinUrl?: string;
capeUrl?: string; // Optional - falls nicht übergeben, wird CDN URL verwendet
capeId: string;
onEquipCape: () => void;
isEquipped?: boolean; // Optional - für Vanilla Capes relevant
skinVariant?: 'classic' | 'slim'
}) {
const [showElytra, setShowElytra] = useState(false);

Expand All @@ -749,6 +777,7 @@ function Cape3DPreviewWithToggle({
<SkinView3DWrapper
skinUrl={skinUrl}
capeUrl={finalCapeUrl}
skinVariant={skinVariant}
enableAutoRotate={true}
autoRotateSpeed={0.5}
startFromBack={true}
Expand Down