Skip to content
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

Jump to bottom

Feature: Custom Wardrobe #2039

Merged
merged 15 commits into from
Jun 9, 2024
Merged

Feature: Custom Wardrobe #2039

merged 15 commits into from
Jun 9, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Jun 8, 2024 •
edited by hannibal002
Loading

Dependencies

What

This pull request adds the Custom Wardrobe feature. You can now personalize your wardrobe with custom colors, display sizes, and favorite slots.
It also includes multiple Backend Changes, please look at the changelog for those.

Continues #1657 because that had too many commits

Discord Suggestion

Note

This currently does not support the NEU Wardrobe Keybind, since we block any keyboard click. We don't know how to fix that, but that fix won't happen this Pull Request.

Video

https://youtu.be/p57gL5ALyFE

Changelog New Features

  • Added Custom Wardrobe, a new look for the wardrobe. - j10an15, Empa
    • Highly customizable: Colors, display sizes.
    • Estimated Price Integration.
    • Favorite slots; option to only display favorite slots.

Changelog Technical Details

  • Added player, drawInsideRoundedRecWithOutline & doubleLayered Renderable. - j10a1n15, Empa, Thunderblade73
  • Added render Renderables method, which only takes in one renderable. - Empa
  • Added method to remove enchants from any item. - j10a1n15
  • Added method to click on any slot in any window. - j10a1n15
  • Added "addToGUIEditor" param to render Renderables method. - j10a1n15

@ItsEmpa @j10a1n15
Custom Wardrobe
4987b64 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15 j10a1n15 mentioned this pull request Jun 8, 2024
Closed
@ItsEmpa ItsEmpa changed the title Custom Wardrobe Feature: Custom Wardrobe Jun 8, 2024
@CalMWolfs CalMWolfs self-requested a review June 8, 2024 23:33
@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Jun 8, 2024
@CalMWolfs CalMWolfs added this to the Version 0.26 milestone Jun 8, 2024
CalMWolfs
CalMWolfs requested changes Jun 9, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the highlighting of slots you can click blue seems to have broken since I last tested, and now it highlights the ones on the other page. (unless this is intentional) also the highlighting of empty slots that you cant click as grey doesnt seem to work

ItsEmpa and others added 3 commits June 9, 2024 08:55
@ItsEmpa
fix some things
80bb799 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Merge remote-tracking branch 'origin/feature/custom-wardrobe' into fe…
e52d3a6 
…ature/custom-wardrobe
@ItsEmpa
fix color
d7129c2 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa ItsEmpa requested a review from CalMWolfs June 9, 2024 07:32
CalMWolfs
CalMWolfs approved these changes Jun 9, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

worked for me :)

hannibal002
hannibal002 requested changes Jun 9, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The feature works really well!
Suggested some code cleanup (did a lot of smaller stuff myself already)

I've found one small visual bug:
image

src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeAPI.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeAPI.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeAPI.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeAPI.kt Show resolved Hide resolved
hannibal002
hannibal002 requested changes Jun 9, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some additional suggestions

src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/CustomWardrobe.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/EstimatedWardrobePrice.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/WardrobeAPI.kt Outdated Show resolved Hide resolved
j10a1n15 and others added 6 commits June 9, 2024 12:54
@j10a1n15 @ItsEmpa
resolve
770ed78 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@ItsEmpa
fix second page
b1ea186 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
fix github action crying?
7da600c 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Merge branch 'refs/heads/beta' into feature/custom-wardrobe
2110aec
@ItsEmpa
a bunch of fixes
cbabb21 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
surely it will stop crying now
7340b19 
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa ItsEmpa requested a review from hannibal002 June 9, 2024 13:26
hannibal002
hannibal002 approved these changes Jun 9, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

surely

@hannibal002 hannibal002 merged commit cc62938 into hannibal002:beta Jun 9, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Jun 9, 2024
@j10a1n15 j10a1n15 mentioned this pull request Jun 9, 2024
Closed
@j10a1n15 j10a1n15 mentioned this pull request Jun 9, 2024
Draft
@ItsEmpa ItsEmpa deleted the feature/custom-wardrobe branch June 13, 2024 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalMWolfs CalMWolfs CalMWolfs approved these changes

@hannibal002 hannibal002 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.26
Development

Successfully merging this pull request may close these issues.
4 participants
@ItsEmpa @hannibal002 @CalMWolfs @j10a1n15