feat(PlayerObject): Add support for default skin parts

GeorgeV220 · Oct 12, 2023 · 984b743 · 984b743
1 parent c037e0a
commit 984b743
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java
@@ -13,8 +13,9 @@
 import com.georgev22.skinoverlay.event.events.user.data.load.UserPreLoadEvent;
 import com.georgev22.skinoverlay.exceptions.UserException;
 import com.georgev22.skinoverlay.handler.SGameProfile;
+import com.georgev22.skinoverlay.handler.SProperty;
 import com.georgev22.skinoverlay.handler.Skin;
-import com.georgev22.skinoverlay.utilities.SkinOptions;
+import com.georgev22.skinoverlay.handler.skin.SkinParts;
 import com.georgev22.skinoverlay.utilities.Updater;
 import com.georgev22.skinoverlay.utilities.Utilities;
 import com.georgev22.skinoverlay.utilities.config.OptionsUtil;
@@ -278,9 +279,11 @@ public void playerJoin() {
                                         user,
                                         Pair.create(
                                                 "defaultSkin",
-                                                new Skin(skinUUID, gameProfile().getProperties().get("textures") != null
-                                                        ? gameProfile().getProperties().get("textures")
-                                                        : skinOverlay.getSkinHandler().getSkin(playerObject()))
+                                                new Skin(skinUUID,
+                                                        gameProfile().getProperties().get("textures") != null
+                                                                ? gameProfile().getProperties().get("textures")
+                                                                : skinOverlay.getSkinHandler().getSkin(playerObject()),
+                                                        "default")
                                         ),
                                         true));
                         if (!event.isCancelled()) {
@@ -419,13 +422,13 @@ public void updateSkin() {
                         .callEvent(new PlayerObjectPreUpdateSkinEvent(this, user, true));
                 if (event.isCancelled())
                     return;
-                SkinOptions skinOptions = user.skin().skinOptions();
-                if (skinOptions == null)
+                SkinParts skinParts = user.skin().skinParts();
+                if (skinParts == null)
                     return;
-                skinOverlay.getLogger().info("Skin name " + skinOptions.getSkinName());
-                if (skinOptions.getSkinName().equals("default"))
+                skinOverlay.getLogger().info("Skin name " + skinParts.getSkinName());
+                if (skinParts.getSkinName().equals("default"))
                     return;
-                skinOverlay.getSkinHandler().retrieveOrGenerateSkin(event.getPlayerObject(), null, skinOptions)
+                skinOverlay.getSkinHandler().retrieveOrGenerateSkin(event.getPlayerObject(), null, skinParts)
                         .thenAccept(skin -> skinOverlay.getSkinHandler().setSkin(playerObject(), skin));
             }
         }).handleAsync((unused, throwable) -> {