feat: rebuild the wardrobe

settings.gradle.kts

@@ -10,9 +10,9 @@ pluginManagement {
     }
 
     plugins {
-        kotlin("jvm") version "2.4.10"
-        kotlin("plugin.serialization") version "2.4.10"
-        kotlin("plugin.compose") version "2.4.10"
+        kotlin("jvm") version "2.4.20"
+        kotlin("plugin.serialization") version "2.4.20"
+        kotlin("plugin.compose") version "2.4.20"
         id("com.gradleup.shadow") version "9.6.1"
         id("me.modmuss50.mod-publish-plugin") version "2.2.0"
     }

src/main/java/org/polyfrost/polyplus/mixin/client/cosmetics/MixinAbstractClientPlayer.java

@@ -2,10 +2,12 @@
 
 //? if > 1.8.9 {
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.mojang.authlib.GameProfile;
 import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.client.player.AbstractClientPlayer;
-import org.polyfrost.polyplus.client.cosmetics.CosmeticAssetCache;
+import org.polyfrost.polyplus.client.cosmetics.CapeResolver;
 import org.polyfrost.polyplus.client.cosmetics.CosmeticEquipment;
+import org.polyfrost.polyplus.client.cosmetics.LocalSkinOverride;
 import org.polyfrost.polyplus.client.cosmetics.access.PlayerCosmeticsAccess;
 import org.polyfrost.polyplus.client.cosmetics.access.PlayerEmotesAccess;
 import org.polyfrost.polyplus.client.emotes.playback.EmoteController;
@@ -16,16 +18,17 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.UUID;
+
 //? if >= 1.21.10 {
-import net.minecraft.core.ClientAsset;
 import net.minecraft.world.entity.player.PlayerSkin;
 //?}
 
 //? if < 1.21.10 {
 /*import net.minecraft.client.resources.PlayerSkin;
 *///?}
 
-@Mixin(AbstractClientPlayer.class)
+@Mixin(value = AbstractClientPlayer.class, priority = 1500)
 public abstract class MixinAbstractClientPlayer implements PlayerEmotesAccess, PlayerCosmeticsAccess {
     @Shadow
     private PlayerInfo playerInfo;
@@ -67,50 +70,40 @@ public abstract class MixinAbstractClientPlayer implements PlayerEmotesAccess, P
             return original;
         }
 
+        GameProfile profile = this.playerInfo.getProfile();
         //~ if >= 1.21.10 'getId' -> 'id'
-        var capeLocation = CosmeticAssetCache.getCapeTexture(this.playerInfo.getProfile().id());
-        if (capeLocation == null) {
-            return original;
-        }
-
-        return new PlayerSkin(
-                // FIXME: how to simplify this
-                //? if >= 1.21.10 {
-                original.body(),
-                new ClientAsset.ResourceTexture(capeLocation),
-                original.elytra(),
-                original.model(),
-                original.secure()
-                //?} else {
-                /*original.texture(),
-                original.textureUrl(),
-                capeLocation,
-                original.elytraTexture(),
-                original.model(),
-                original.secure()
-                *///?}
-        );
+        UUID player = profile.id();
+        return LocalSkinOverride.apply(player, CapeResolver.applyCape(player, profile, original));
     }
 }
 //?} else {
-/*import com.mojang.authlib.GameProfile;
+/*import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.mojang.authlib.GameProfile;
 import net.minecraft.client.entity.living.player.ClientPlayerEntity;
+import net.minecraft.client.network.PlayerInfo;
 import net.minecraft.entity.living.player.PlayerEntity;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.World;
 import org.polyfrost.polyplus.client.PolyPlusConfig;
+import org.polyfrost.polyplus.client.cosmetics.CapeResolver;
 import org.polyfrost.polyplus.client.cosmetics.CosmeticAssetCache;
 import org.polyfrost.polyplus.client.cosmetics.CosmeticEquipment;
+import org.polyfrost.polyplus.client.cosmetics.LocalSkinOverride;
+import org.polyfrost.polyplus.client.cosmetics.MojangCapeService;
 import org.polyfrost.polyplus.client.cosmetics.access.PlayerCosmeticsAccess;
 import org.polyfrost.polyplus.client.cosmetics.access.PlayerEmotesAccess;
 import org.polyfrost.polyplus.client.emotes.playback.EmoteController;
+import org.polyfrost.polyplus.client.gui.preview.PreviewSkin;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(ClientPlayerEntity.class)
+import java.util.UUID;
+
+@Mixin(value = ClientPlayerEntity.class, priority = 1500)
 public abstract class MixinAbstractClientPlayer extends PlayerEntity implements PlayerEmotesAccess, PlayerCosmeticsAccess {
     @Unique
     private EmoteController polyplus$emoteController;
@@ -122,6 +115,9 @@ private MixinAbstractClientPlayer(World world, GameProfile profile) {
         super(world, profile);
     }
 
+    @Shadow
+    protected abstract PlayerInfo getInfo();
+
     @Override
     public EmoteController polyplus$emoteController() {
         EmoteController controller = polyplus$emoteController;
@@ -148,10 +144,40 @@ public void tick() {
         polyplus$emoteController().tick((ClientPlayerEntity) (Object) this);
     }
 
-    @Inject(method = "getCapeTextureLocation", at = @At("HEAD"), cancellable = true)
-    private void polyplus$replaceCapeTexture(CallbackInfoReturnable<Identifier> cir) {
-        Identifier cape = CosmeticAssetCache.getCapeTexture(((ClientPlayerEntity) (Object) this).getUuid());
-        if (cape != null) cir.setReturnValue(cape);
+    @ModifyReturnValue(method = "getCapeTextureLocation", at = @At("RETURN"))
+    private Identifier polyplus$replaceCapeTexture(Identifier original) {
+        UUID playerId = ((ClientPlayerEntity) (Object) this).getUuid();
+        switch (CapeResolver.decide(playerId, original == null ? null : original.getNamespace())) {
+            case POLYPLUS:
+                return polyplus$orOriginal(CosmeticAssetCache.getCapeTexture(playerId), original);
+            case MOJANG:
+                return polyplus$orOriginal(MojangCapeService.localCapeTexture(), original);
+            case VANILLA:
+                PlayerInfo info = getInfo();
+                return info == null ? null : info.getCapeTexture();
+            case NONE:
+                return null;
+            default:
+                return original;
+        }
+    }
+
+    @ModifyReturnValue(method = "getSkinTextureLocation()Lnet/minecraft/resource/Identifier;", at = @At("RETURN"))
+    private Identifier polyplus$replaceSkinTexture(Identifier original) {
+        PreviewSkin skin = LocalSkinOverride.forPlayer(((ClientPlayerEntity) (Object) this).getUuid());
+        return skin != null ? skin.getTexture() : original;
+    }
+
+    @ModifyReturnValue(method = "getModelType", at = @At("RETURN"))
+    private String polyplus$replaceSkinModel(String original) {
+        PreviewSkin skin = LocalSkinOverride.forPlayer(((ClientPlayerEntity) (Object) this).getUuid());
+        if (skin == null) return original;
+        return skin.getSlim() ? "slim" : "default";
+    }
+
+    @Unique
+    private static Identifier polyplus$orOriginal(Identifier cape, Identifier original) {
+        return cape != null ? cape : original;
     }
 
     @Inject(method = "getFovModifier", at = @At("HEAD"), cancellable = true)

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusClient.kt

@@ -33,6 +33,7 @@ import org.polyfrost.polyplus.client.features.DefaultSettings
 import org.polyfrost.polyplus.client.features.JvmAdvisor
 import org.polyfrost.polyplus.client.features.ModpackDiff
 import org.polyfrost.polyplus.client.features.OnboardingFeatures
+import org.polyfrost.polyplus.client.gui.PolyPlusOneConfigIntegration
 import org.polyfrost.polyplus.client.gui.VanillaMenuButton
 import org.polyfrost.polyplus.client.gui.preview.PlayerPreviewRenderer
 import org.polyfrost.polyplus.client.host.HostWorldManager
@@ -164,6 +165,7 @@ object PolyPlusClient {
         }
         step("rich text privacy") { RichTextPrivacy.warmUp() }
         step("default settings") { DefaultSettings.initialize() }
+        step("oneconfig ui") { PolyPlusOneConfigIntegration.register() }
         step("default mod order") { DefaultModOrder.initialize() }
         step("advanced mod cards") { AdvancedModCards.initialize() }
         step("onboarding") { OnboardingFeatures.initialize() }

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusConfig.kt

@@ -15,6 +15,7 @@ import org.polyfrost.oneconfig.api.ui.v1.keybind.OneConfigKeybind
 import org.polyfrost.polyplus.BackendUrl
 import org.polyfrost.polyplus.PolyPlusConstants
 import org.polyfrost.polyplus.client.emotes.EmoteWheelKeybind
+import org.polyfrost.polyplus.client.gui.PolyPlusOneConfigIntegration
 import org.polyfrost.polyplus.client.network.websocket.PolyConnection
 import org.polyfrost.polyplus.client.privacy.PrivacyEnforcement
 import org.polyfrost.polyplus.client.social.SocialOverlay
@@ -224,6 +225,18 @@ object PolyPlusConfig : Config("${PolyPlusConstants.ID}.json", "${PolyPlusConsta
         true
     }
 
+    @Keybind(
+        title = "Open Wardrobe",
+        subcategory = "Keybinds",
+        description = "Open the PolyPlus wardrobe",
+    )
+    var wardrobeKeybind = OneConfigKeybind(null, null, KeyModifiers.NONE, 0L) { state ->
+        if (state) {
+            PolyPlusOneConfigIntegration.openCosmeticsFromKeybind()
+        }
+        true
+    }
+
     @Dropdown(title = "API URL", description = "The URL used for the PolyPlus API. Only change if you know what you're doing.")
     var apiUrl: BackendUrl = BackendUrl.PRODUCTION
         get() = if (PolyPlusConstants.IS_DEV_ENV) field else BackendUrl.PRODUCTION

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusCosmeticsConfig.kt

@@ -36,6 +36,13 @@ object PolyPlusCosmeticsConfig : Config(
     )
     var hideFeetCosmeticsWithBoots = true
 
+    @JvmStatic
+    @Switch(
+        title = "Force PolyPlus Capes",
+        description = "Show the capes picked in the wardrobe even when another mod sets its own cape.",
+    )
+    var forcePolyPlusCapes = false
+
     @JvmStatic
     @Dropdown(
         title = "Capes",

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusMainMenuConfig.kt

@@ -73,8 +73,8 @@ object PolyPlusMainMenuConfig : Config(
 
     @JvmStatic
     @Switch(
-        title = "Hide Cosmetics Button",
-        description = "Hide the Cosmetics button on the PolyPlus main menu.",
+        title = "Hide Wardrobe Button",
+        description = "Hide the Wardrobe button on the PolyPlus main menu.",
         subcategory = "Elements",
     )
     var hideMainMenuCosmetics = false