Skin management #1609

Trial97 · 2023-09-04T21:31:36Z

fixes #330
fixes #2409
Implemented:

manage skins similar to icons
visualize the 2D textures
on the first load try to get the data from the official Minecraft launcher
if Prism does not manage the current skin pull it as a new skin
saves the cape and the skin model with a specific
add skins from the local file
importing from a specific user skin or from a URL

Refactored and already there:

change skins
change cape
reset skin

Not implemented and not gonna implement them in this PR:

3d view of texture or any fancy texture display(I have no idea on how to do that and from what I saw that would also require extra dependencies, e.g. opengl as minimum and maybe core3d for ease)
ability to select a skin server

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

into skin_selector

TheKodeToad · 2023-09-04T21:37:44Z

Looks like there's some less ambitious stuff that's not done. Should this be a draft or can those be done later?

Trial97 · 2023-09-04T21:50:21Z

Regarding the not implemented stuff, I do not feel like doing them at all(partially because of the fact that I do not have any idea on how). Obviously I'm ok if there is somebody willing to extend this PR by implementing the mentioned stuff. As this PR solves the basic issue we can have separate PRs for the stuff I did not implemented.
Regarding the failing build I will have a look tomorrow (I'm a little tired).

TheKodeToad · 2023-09-04T22:29:15Z

I think using an existing player's skin should be easy

TheKodeToad · 2023-09-04T22:33:16Z

I don't think getting data from the official launcher is a great idea:

it doesn't happen with anything else
it's a proprietary format prone to change
it won't work in sandboxed environments

TheKodeToad · 2023-09-05T09:22:06Z

Removing that would also fix actions (although there's probably something that works with Qt5)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Trial97 · 2023-09-05T17:22:47Z

Ok removed the default launcher stuff.
Added more import options(from a username and from a URL)
Some open items:

Do I need to check if two skins are the same? If yes any fast way of doing that?
I always rewrite the files on import; Do I need to implement some sort of protection for that or can I leave it as is?
I know that I'm not good at designing GUI so do not expect this to look so good(I need a little help on that)

launcher/minecraft/skins/SkinList.cpp

TayouVR · 2023-09-05T20:31:52Z

3d view of texture

I wanted to implement this, with support for ears x3
Maybe if I have the time and motivation for it i could look into it after this PR.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

TayouVR

I tried renaming a skin and it duplicated it, keeping the original file.
can't reproduce it though and log doesn't say anything about it either as far as i can see.

Also just looked through the code to see if I can find how that could happen...
does FS::move perform a copy if the original file can't be deleted for whichever reason?

Edit: I can reproduce it. If the Skin has a url attached it seems to duplicate when renaming

owo and Ears_Wings2 are both from renaming the one with the id as name

Edit2: I am also not able to delete that one in the UI;

Edit3: also renaming causes the playermodel (and cape presumably) to be reset, I assume because the rename function just renames the file, it doesn't actually take care of updating the json?

TayouVR

renaming needs to be handled better, whatever is up with the user-id based skin not being possible to be deleted needs to be changed or better communicated.

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Trial97 · 2023-10-25T16:28:56Z

Yeah, you can not remove the current skin. Let me see what I can do regarding that and the rename stuff.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Trial97 · 2023-10-26T10:37:44Z

Fixed that too. It was a case mismatch the API returned "SLIM" I checked for "slim".

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

into skin_selector

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

launcher/ui/dialogs/skins/SkinManageDialog.ui

Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

into skin_selector

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

… skin_selector

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Trial97 · 2024-05-21T07:20:29Z

@getchoo you already said you will review

getchoo

most of this LGTM and works well. just two notes:

errors are silently ignored. they probably shouldn't be
- this is very confusing when trying to import the skin of another player for example. if i type the name in wrong and press "import user", i only see a flash of a loading screen that appears to do nothing
- this also can fool you into thinking your changes applied, when in reality they didn't
non-reproducible crash
- when changing from the slim to classic model, the entire launcher crashed. i had sadly not launched it from the cli so no errors. i haven't been able to replicate it since, and i'd imagine this is an issue in NetJob/Request instead of being introduced here. not going to make this blocker due to that, but something i figured i should bring up

into skin_selector

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Trial97 · 2024-05-30T13:23:28Z

Added the error message for that buttons, but could not produce any crash so nothing on that front

getchoo

everything else seems good. last issue i've found is that the error messages do display when importing a user's skin, but not when importing from a url

into skin_selector

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Ryex · 2024-06-09T17:52:22Z

launcher/ui/dialogs/skins/SkinManageDialog.cpp

+        if (Parsers::parseMinecraftProfileMojang(*profileOut, mcProfile)) {
+            downloadSkin->setUrl(mcProfile.skin.url);
+        } else {
+            job->abort();


should this branch report the error to the user?

No, as I consider all steps a whole task here: I display a generic fail message at the end.

I take it you mean the error if the resulting skin after all the tasks end isn't valid?

yes: if the task fails in any way the skin is not downloaded to path making it invalid

Ryex · 2024-06-09T18:00:35Z

other than those two points things look good code wise and I think the interface looks good too

Trial97 · 2024-06-09T18:02:54Z

other than those two points things look good code wise and I think the interface looks good too

you pointed out just one. What is the other one

Ryex · 2024-06-09T18:03:10Z

launcher/ui/dialogs/skins/SkinManageDialog.cpp

+    connect(getUUID.get(), &Task::aborted, uuidLoop.get(), &WaitTask::quit);
+    connect(getUUID.get(), &Task::failed, uuidLoop.get(), &WaitTask::quit);
+    connect(getProfile.get(), &Task::aborted, profileLoop.get(), &WaitTask::quit);
+    connect(getProfile.get(), &Task::failed, profileLoop.get(), &WaitTask::quit);


I think the failed events should use some logging and or inform the user of the failed task

Trial97 added 4 commits September 1, 2023 21:23

refactored skin apis

609eaa6

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

added skins directory

9ad029e

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

added skin manage dialog

c86b8b0

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

ab648e5

into skin_selector

Trial97 added enhancement New feature or request needs-testing PRs that should be tested a bit more before being merged changelog:added A PR that appears under "Added" in the changelog labels Sep 4, 2023

Trial97 marked this pull request as draft September 5, 2023 07:18

added more import options

8bad255

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Trial97 marked this pull request as ready for review September 5, 2023 17:22

Trial97 requested a review from TheKodeToad September 5, 2023 17:23

github-advanced-security bot found potential problems Sep 5, 2023

View reviewed changes

launcher/minecraft/skins/SkinList.cpp Fixed Show fixed Hide fixed

Trial97 added 6 commits September 5, 2023 23:45

fix codeql

8c8e432

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

made skin upload more generic

6ec1cf6

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

2e4fcd6

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

0b6373e

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

869f654

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

932cd9e

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

TayouVR approved these changes Oct 25, 2023

View reviewed changes

TayouVR requested changes Oct 25, 2023

View reviewed changes

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

a5938a7

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Fixed remane and delete of selected skin

263dc5a

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

ensured that the variant is allways uppercase

8b8ea2d

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

TayouVR approved these changes Oct 26, 2023

View reviewed changes

Trial97 added 3 commits October 26, 2023 19:06

fixed asan stuff

321bbf1

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

7a0b2a3

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

54c308e

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

TheKodeToad added this to the 9.0 milestone Nov 19, 2023

Trial97 added 2 commits November 23, 2023 10:41

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

a7be217

into skin_selector

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

9080727

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

getchoo self-requested a review March 27, 2024 17:47

Trial97 removed the needs-testing PRs that should be tested a bit more before being merged label Apr 24, 2024

Trial97 mentioned this pull request May 17, 2024

Change skin upload wording to Wide/Slim #2409

Open

1 task

DioEgizio reviewed May 18, 2024

View reviewed changes

launcher/ui/dialogs/skins/SkinManageDialog.ui Outdated Show resolved Hide resolved

Trial97 and others added 5 commits May 18, 2024 10:36

Update launcher/ui/dialogs/skins/SkinManageDialog.ui

0f27363

Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

23134d4

into skin_selector

Fix reggresion

2ac6efa

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into…

6aaf3a3

… skin_selector

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

6334898

into skin_selector Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

getchoo requested changes May 29, 2024

View reviewed changes

Trial97 added 2 commits May 30, 2024 14:25

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

75fbdc2

into skin_selector

added error message for import skin from user

eaccdca

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

getchoo requested changes Jun 9, 2024

View reviewed changes

Trial97 added 2 commits June 9, 2024 20:13

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher

689b768

into skin_selector

update fail url skin messagebox

04b2ac2

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Ryex requested changes Jun 9, 2024

View reviewed changes

Ryex reviewed Jun 9, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skin management #1609

Skin management #1609

Trial97 commented Sep 4, 2023 •

edited

TheKodeToad commented Sep 4, 2023

Trial97 commented Sep 4, 2023

TheKodeToad commented Sep 4, 2023

TheKodeToad commented Sep 4, 2023

TheKodeToad commented Sep 5, 2023

Trial97 commented Sep 5, 2023

TayouVR commented Sep 5, 2023 •

edited

TayouVR left a comment •

edited

TayouVR left a comment •

edited

Trial97 commented Oct 25, 2023

Trial97 commented Oct 26, 2023

Trial97 commented May 21, 2024

getchoo left a comment

Trial97 commented May 30, 2024

getchoo left a comment

Ryex Jun 9, 2024

Trial97 Jun 9, 2024

Ryex Jun 9, 2024

Trial97 Jun 9, 2024

Ryex commented Jun 9, 2024 •

edited

Trial97 commented Jun 9, 2024

Ryex Jun 9, 2024

Skin management #1609

Are you sure you want to change the base?

Skin management #1609

Conversation

Trial97 commented Sep 4, 2023 • edited

TheKodeToad commented Sep 4, 2023

Trial97 commented Sep 4, 2023

TheKodeToad commented Sep 4, 2023

TheKodeToad commented Sep 4, 2023

TheKodeToad commented Sep 5, 2023

Trial97 commented Sep 5, 2023

TayouVR commented Sep 5, 2023 • edited

TayouVR left a comment • edited

Choose a reason for hiding this comment

TayouVR left a comment • edited

Choose a reason for hiding this comment

Trial97 commented Oct 25, 2023

Trial97 commented Oct 26, 2023

Trial97 commented May 21, 2024

getchoo left a comment

Choose a reason for hiding this comment

Trial97 commented May 30, 2024

getchoo left a comment

Choose a reason for hiding this comment

Ryex Jun 9, 2024

Choose a reason for hiding this comment

Trial97 Jun 9, 2024

Choose a reason for hiding this comment

Ryex Jun 9, 2024

Choose a reason for hiding this comment

Trial97 Jun 9, 2024

Choose a reason for hiding this comment

Ryex commented Jun 9, 2024 • edited

Trial97 commented Jun 9, 2024

Ryex Jun 9, 2024

Choose a reason for hiding this comment

Trial97 commented Sep 4, 2023 •

edited

TayouVR commented Sep 5, 2023 •

edited

TayouVR left a comment •

edited

TayouVR left a comment •

edited

Ryex commented Jun 9, 2024 •

edited