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.

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

Custom Wardrobe #2

Merged
merged 338 commits into from
Jun 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
338 commits
Select commit Hold shift + click to select a range
a3f563f
yoo custom skin render (i hate 2nd layer)
j10a1n15 Apr 22, 2024
7110c78
debug
j10a1n15 Apr 22, 2024
d74a013
wardrobeapi
ItsEmpa Apr 22, 2024
535ccd2
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay
ItsEmpa Apr 22, 2024
e4f3be4
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 22, 2024
11f5e7c
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay
ItsEmpa Apr 22, 2024
f35bfc3
fix regex
ItsEmpa Apr 22, 2024
a461f2c
test
j10a1n15 Apr 22, 2024
f1cb304
fixed more edge cases
Thunderblade73 Apr 22, 2024
264e2bd
fix saving items
ItsEmpa Apr 22, 2024
f0feff1
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-dynamic…
j10a1n15 Apr 22, 2024
ea6165f
Merge pull request #28 from ItsEmpa/wardrobe-overlay-dynamic-rows-col…
j10a1n15 Apr 22, 2024
fb46c30
fix
ItsEmpa Apr 22, 2024
2b8717f
Merge pull request #29 from ItsEmpa/wardrobe-overlay-dynamic-rows-col…
j10a1n15 Apr 22, 2024
d7b178d
fix temp toggle
j10a1n15 Apr 22, 2024
d11fe41
fix temp toggle when switching pages
j10a1n15 Apr 22, 2024
7d74527
option for players to look at mouse
j10a1n15 Apr 22, 2024
7cf2198
fix typo
j10a1n15 Apr 22, 2024
3cdcd59
redundant
j10a1n15 Apr 22, 2024
f393b20
slot clicking!!
j10a1n15 Apr 22, 2024
cd14800
improve
j10a1n15 Apr 22, 2024
7998293
Merge branch 'fork/gui-before-draw' into feature/wardrobe-overlay
j10a1n15 Apr 22, 2024
ded1860
shdebug support
j10a1n15 Apr 22, 2024
aabf31d
armorrrr!!!
j10a1n15 Apr 22, 2024
2ef14a5
cleaner armor!!!
j10a1n15 Apr 22, 2024
a209cdb
cleanup
j10a1n15 Apr 22, 2024
c4eaa24
fix color on skin again
j10a1n15 Apr 22, 2024
1481893
Revert "fix color on skin again"
j10a1n15 Apr 22, 2024
eed0e8a
Revert "cleanup"
j10a1n15 Apr 22, 2024
e74c59f
fix name
j10a1n15 Apr 22, 2024
e50458a
remove enchants
j10a1n15 Apr 23, 2024
7bf0795
hide empty nametags
ItsEmpa Apr 23, 2024
e9a2ce0
cleanup
ItsEmpa Apr 23, 2024
0a58363
more imports
ItsEmpa Apr 23, 2024
1bdbccd
Merge pull request #30 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 23, 2024
ed50bc2
more debug
j10a1n15 Apr 23, 2024
6969ad8
lots of changes
ItsEmpa Apr 23, 2024
7ea0e0f
Merge pull request #31 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 23, 2024
80ae417
fix when empty wardrobe or smth
j10a1n15 Apr 23, 2024
b87b658
tried pricing overlay
j10a1n15 Apr 23, 2024
189dea3
maybe fixed neu inventory buttons flashing
Thunderblade73 Apr 23, 2024
167e610
add support for favorite wardrobe slots, recolor unfocused players, f…
ItsEmpa Apr 23, 2024
ec631d7
Merge branch 'fork/gui-before-draw' into feature/wardrobe-overlay
j10a1n15 Apr 23, 2024
1e09972
Merge pull request #32 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 23, 2024
6629567
reordering
j10a1n15 Apr 23, 2024
2a61f1b
fixed padding thing
j10a1n15 Apr 23, 2024
d715fda
change default padding value idk
j10a1n15 Apr 23, 2024
bf1a3cd
fixed player rendering over lore
j10a1n15 Apr 23, 2024
be36b64
fixed ordering of armor in lore
j10a1n15 Apr 23, 2024
69e0b78
rename + remove useless
j10a1n15 Apr 23, 2024
2365cbd
this is a function!!
j10a1n15 Apr 23, 2024
3f6cd3a
item price cache + more
ItsEmpa Apr 23, 2024
ddd7708
Merge pull request #33 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 23, 2024
f05fb46
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 23, 2024
4dc3252
fix armor list sorting, improved price cache or smth
j10a1n15 Apr 23, 2024
e3da46d
fix fakeplayer performance
j10a1n15 Apr 23, 2024
3c663a0
this is also a method
j10a1n15 Apr 23, 2024
1d35313
erm actually this renders all entities
j10a1n15 Apr 24, 2024
2af2d8e
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 24, 2024
8188c46
fix gray overlay + better armor
ItsEmpa Apr 24, 2024
7a89b14
Merge pull request #34 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 24, 2024
1027958
kinda improved buttons (not finished)
j10a1n15 Apr 24, 2024
3de2197
how the fuck did this fix it
j10a1n15 Apr 24, 2024
176891c
fixed buttons
j10a1n15 Apr 24, 2024
df3a7f7
improved performance by like 10x
ItsEmpa Apr 24, 2024
918706b
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 24, 2024
9a1e1d9
Merge branch 'beta' into gui-before-draw
Thunderblade73 Apr 24, 2024
6c4138d
fixed issues
ItsEmpa Apr 24, 2024
b3ec38d
Update src/main/java/at/hannibal2/skyhanni/features/inventory/wardrob…
j10a1n15 Apr 24, 2024
d541bf9
Update src/main/java/at/hannibal2/skyhanni/features/inventory/wardrob…
j10a1n15 Apr 24, 2024
1329a58
Update src/main/java/at/hannibal2/skyhanni/features/inventory/wardrob…
j10a1n15 Apr 24, 2024
08d9971
Merge pull request #35 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 24, 2024
f8ea20f
fixed button size
j10a1n15 Apr 24, 2024
966d6e3
Merge branch 'fork/outlined-scoreboard' into feature/wardrobe-overlay
j10a1n15 Apr 25, 2024
75eb727
small cleanup
j10a1n15 Apr 25, 2024
50b9ae1
fixed button size
j10a1n15 Apr 24, 2024
f9a4cc2
a
VixidDev Apr 15, 2024
41e3125
Fix the entire scoreboard being covered in the outline color
VixidDev Apr 16, 2024
0efd209
fix alignment when outline
j10a1n15 Apr 17, 2024
9154ed2
too many things to count at this point
ItsEmpa Apr 24, 2024
2af7ba3
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 26, 2024
e276eca
renamed to custom wardrobe
ItsEmpa Apr 26, 2024
b23b73d
move wardrobe price logic to wardrobeapi
ItsEmpa Apr 26, 2024
bd2050f
fix estimated wardrobe price tooltip appearing in custom wardrobe
ItsEmpa Apr 26, 2024
4450eba
fix not setting no current slot and added support for storing locked …
ItsEmpa Apr 26, 2024
23e8b4a
Merge pull request #36 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 26, 2024
d077422
Merge branch 'feature/wardrobe-overlay' of https://github.com/j10a1n1…
j10a1n15 Apr 26, 2024
38c11d1
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 Apr 26, 2024
ede0cc5
fix hover size
ItsEmpa Apr 26, 2024
354e506
only create new renderables when absolutely necessary
ItsEmpa Apr 26, 2024
a0be0dd
where second layer
j10a1n15 Apr 26, 2024
e2d6be2
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 26, 2024
7dea50f
Merge pull request #37 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 26, 2024
a663f03
move to category, fix still showing when temp disabled
ItsEmpa Apr 26, 2024
3f5161d
added back and close buttons
j10a1n15 Apr 26, 2024
d9b6d44
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 26, 2024
1614811
Merge branch 'beta' into gui-before-draw
Thunderblade73 Apr 26, 2024
92057f8
fix bug
Thunderblade73 Apr 26, 2024
e24ca2d
Merge branch 'fork/gui-before-draw' into feature/wardrobe-overlay
j10a1n15 Apr 26, 2024
c61aa73
a
ItsEmpa Apr 26, 2024
8a98af4
added depth Layer
Thunderblade73 Apr 26, 2024
86155a7
I learned how to write
Thunderblade73 Apr 26, 2024
0ab3da0
Merge pull request #39 from Thunderblade73/pr/wardrobe-overlay
j10a1n15 Apr 26, 2024
2adcc3c
Merge pull request #38 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 26, 2024
81ecabd
shouldAllowLink updated
Thunderblade73 Apr 26, 2024
81e66b0
Merge branch 'fork/gui-before-draw' into feature/wardrobe-overlay
j10a1n15 Apr 26, 2024
0c0bb9b
removed dupe code
j10a1n15 Apr 27, 2024
d5833fc
use reset here
j10a1n15 Apr 27, 2024
95f48e6
added price tooltips hover thingy
j10a1n15 Apr 27, 2024
c78e97e
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 Apr 27, 2024
53e953b
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 27, 2024
525d1bf
removed mixin, made player renderer work without mixin, and fixed sec…
ItsEmpa Apr 27, 2024
bf7ce73
Merge pull request #40 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 27, 2024
8b9635e
thunder vertical container fix
ItsEmpa Apr 27, 2024
558c356
switch from tables to vertical containers, add favoriting in a per-sl…
ItsEmpa Apr 27, 2024
930c864
Merge pull request #41 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 27, 2024
5495122
things :3
ItsEmpa Apr 28, 2024
96ed2b9
Merge pull request #42 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 28, 2024
9e7b880
removed player cache
j10a1n15 Apr 28, 2024
9a9c28c
fixed players having no armor on first load
j10a1n15 Apr 28, 2024
4e169bf
small cleanup
j10a1n15 Apr 28, 2024
d79dc48
so smart
j10a1n15 Apr 28, 2024
7dc5a79
addAll() exists
j10a1n15 Apr 28, 2024
c3990df
renamed loop vars
j10a1n15 Apr 28, 2024
08e008a
renamed some more vars
j10a1n15 Apr 28, 2024
4f02bc3
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 28, 2024
addf3e0
fixed slot buttons alignment
j10a1n15 Apr 28, 2024
9f305c1
fixed typo in config
j10a1n15 Apr 28, 2024
1f4b407
b
ItsEmpa Apr 29, 2024
b388c3b
b
ItsEmpa Apr 29, 2024
1977826
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 29, 2024
0cbe652
fix sometimes storing items from other menus
ItsEmpa Apr 29, 2024
6a7e2ac
aaaa
ItsEmpa Apr 29, 2024
f064612
item fix
Thunderblade73 Apr 29, 2024
1847cd2
Merge pull request #43 from Thunderblade73/pr/wardrobe-overlay
j10a1n15 Apr 29, 2024
d791975
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 29, 2024
d659be5
removed useless update()
j10a1n15 Apr 29, 2024
5e05e1a
improve player renderable bounding and make every slot a single rende…
ItsEmpa Apr 29, 2024
ed4298a
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 29, 2024
8969685
itemstack sizes
ItsEmpa Apr 29, 2024
597f1c9
delete thing
ItsEmpa Apr 29, 2024
18b5c18
Merge pull request #44 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 29, 2024
7b47f1c
fix maybe?
ItsEmpa Apr 30, 2024
53a5a0e
make everything inside very few renderables!!!
ItsEmpa Apr 30, 2024
cbc1890
dont allow wardrobe loc edit in guieditormanager
j10a1n15 Apr 30, 2024
2299c67
add a billion config options
ItsEmpa Apr 30, 2024
b36f789
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
ItsEmpa Apr 30, 2024
2389b8b
Merge pull request #45 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 30, 2024
1b55339
add auto-adjusting global wardrobe scale
ItsEmpa Apr 30, 2024
c0c3332
fix slot flickering
ItsEmpa Apr 30, 2024
e006cba
make better buttons
ItsEmpa Apr 30, 2024
ae9d89d
Merge pull request #46 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 30, 2024
69111c2
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Apr 30, 2024
bab8b38
funny
ItsEmpa Apr 30, 2024
acdd722
Merge pull request #47 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 30, 2024
71abf41
added bg
j10a1n15 Apr 30, 2024
c0113a5
centered fix
ItsEmpa Apr 30, 2024
147b530
warning text scaling and centered
ItsEmpa Apr 30, 2024
a7a8b80
added skyhanni text
j10a1n15 Apr 30, 2024
4d530f9
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 Apr 30, 2024
be2386f
Merge pull request #48 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Apr 30, 2024
0eabdf1
removed useless comment
j10a1n15 Apr 30, 2024
c6215a0
Merge remote-tracking branch 'origin/feature/wardrobe-overlay' into f…
j10a1n15 Apr 30, 2024
d3e71c8
optimized alignment import
j10a1n15 Apr 30, 2024
8524354
optimized alignment import part 2
j10a1n15 Apr 30, 2024
a181674
removed smth
j10a1n15 Apr 30, 2024
fd7ea5f
not working event
j10a1n15 May 1, 2024
9eda549
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 May 2, 2024
7fb5eba
configs, fixes, cleanup, more idk
ItsEmpa May 2, 2024
f1a1bec
Merge pull request #49 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 May 2, 2024
6158dfc
no need to render multiple renderables !!
ItsEmpa May 2, 2024
68fcdeb
Merge pull request #50 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 May 2, 2024
05d0f15
fix
j10a1n15 May 2, 2024
bc119d0
cleanup and config link fix
ItsEmpa May 2, 2024
36b4cb2
Merge pull request #51 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 May 2, 2024
eca31ef
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 May 2, 2024
9248577
removed stupid event
j10a1n15 May 2, 2024
54b688f
small cleanup
j10a1n15 May 2, 2024
2752647
Merge branch 'beta' into gui-before-draw
Thunderblade73 May 2, 2024
ddb2fef
fix skyHanni guis bugging out the preDrawEventCanceled state
Thunderblade73 May 2, 2024
2abb184
Merge branch 'gui-before-draw' into feature/wardrobe-overlay
j10a1n15 May 2, 2024
f892d43
render infront of actionbar
j10a1n15 May 2, 2024
fc088fc
fixed not being able to click after using jumpToEditor()
j10a1n15 May 2, 2024
1b474d8
fix
Thunderblade73 May 2, 2024
d753e4b
small formatting
j10a1n15 May 2, 2024
37a5cbd
Merge branch 'gui-before-draw' into feature/wardrobe-overlay
j10a1n15 May 2, 2024
48d9f6a
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 May 3, 2024
9374ba6
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 May 4, 2024
14f24e7
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 May 11, 2024
2e296c7
fix
j10a1n15 May 11, 2024
c5318fc
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 May 12, 2024
bfcf43f
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 May 20, 2024
79cc2c9
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 May 24, 2024
c51a4d9
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 May 24, 2024
48c4098
doppelt hält besser
j10a1n15 May 28, 2024
0dfc5e8
formatting
j10a1n15 May 28, 2024
2dafcb3
changes
ItsEmpa May 28, 2024
2a9e8be
not needed
ItsEmpa May 28, 2024
c66fe5f
Merge pull request #56 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 May 28, 2024
1157f82
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 May 29, 2024
1461b8c
Merge branch 'refs/heads/beta' into wardrobe-overlay-addon
ItsEmpa May 29, 2024
695fc2e
fix import
ItsEmpa May 29, 2024
7b69c98
cal changes
ItsEmpa May 29, 2024
784c972
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 May 29, 2024
59d691b
Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over…
ItsEmpa May 29, 2024
beed318
Merge branch 'feature/wardrobe-overlay' into wardrobe-overlay-addon
j10a1n15 May 29, 2024
13fc361
Merge remote-tracking branch 'origin/wardrobe-overlay-addon' into war…
ItsEmpa May 29, 2024
4e586cb
more changes
ItsEmpa May 29, 2024
d27e360
Merge pull request #57 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 May 29, 2024
4bbfb7b
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 May 30, 2024
13501d9
fix
j10a1n15 May 30, 2024
a8ceb19
Merge branch 'hannibal002:beta' into feature/wardrobe-overlay
j10a1n15 Jun 1, 2024
bc9b02a
auto load
j10a1n15 Jun 1, 2024
6b41101
fix item pickup
j10a1n15 Jun 1, 2024
efc6f92
small cleanup
j10a1n15 Jun 1, 2024
ee3987f
apparently we do
j10a1n15 Jun 1, 2024
a7408dc
changes and cleanup
ItsEmpa Jun 1, 2024
d9a0602
Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over…
ItsEmpa Jun 1, 2024
56ebdae
oop
ItsEmpa Jun 1, 2024
3ca25be
some refactoring and cleanup
ItsEmpa Jun 1, 2024
04f0441
changes
ItsEmpa Jun 1, 2024
33d1958
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov…
CalMWolfs Jun 2, 2024
bb804b4
add annotation, fix merge
CalMWolfs Jun 2, 2024
e9843da
Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over…
ItsEmpa Jun 2, 2024
d27e24c
fix size
ItsEmpa Jun 2, 2024
d27adf5
Merge pull request #58 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Jun 2, 2024
a890bd4
oops
ItsEmpa Jun 2, 2024
beaa8a2
Merge pull request #59 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Jun 2, 2024
b8534b8
first batch of changes
ItsEmpa Jun 4, 2024
ee7f9a1
second batch of changes
ItsEmpa Jun 4, 2024
36abbc7
Merge pull request #60 from ItsEmpa/wardrobe-overlay-addon
j10a1n15 Jun 4, 2024
8a75593
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 Jun 5, 2024
e7f3952
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov…
CalMWolfs Jun 6, 2024
26b9bfc
fix merge
CalMWolfs Jun 6, 2024
f3b72bc
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov…
CalMWolfs Jun 6, 2024
10e1a6b
color
j10a1n15 Jun 6, 2024
6c446b5
change click stopping
j10a1n15 Jun 6, 2024
483a179
Merge branch 'refs/heads/beta' into fork/feature/wardrobe-overlay
hannibal002 Jun 7, 2024
3a4426e
fixed merge conflicts
hannibal002 Jun 7, 2024
ae2c1dd
Merge branch 'beta' into feature/wardrobe-overlay
j10a1n15 Jun 8, 2024
829614b
i hate this
ItsEmpa Jun 7, 2024
61f0b6c
aegrraer5gr
ItsEmpa Jun 7, 2024
1595d14
i fucking hate this
ItsEmpa Jun 7, 2024
35f8ba7
i hate this so much
ItsEmpa Jun 8, 2024
179e8df
gui name as a val
ItsEmpa Jun 8, 2024
7b1b6cf
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/wardrobe-ov…
CalMWolfs Jun 8, 2024
0e1b5c1
whatever this is, it works but doesnt update the sizes when it should
ItsEmpa Jun 8, 2024
d4f218a
Merge branch 'refs/heads/feature/wardrobe-overlay' into wardrobe-over…
ItsEmpa Jun 8, 2024
4425e86
finally it works
ItsEmpa Jun 8, 2024
c856b62
Merge branch 'refs/heads/beta' into wardrobe-overlay-addon
ItsEmpa Jun 8, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import at.hannibal2.skyhanni.config.FeatureToggle;
import at.hannibal2.skyhanni.config.HasLegacyId;
import at.hannibal2.skyhanni.config.features.inventory.chocolatefactory.ChocolateFactoryConfig;
import at.hannibal2.skyhanni.config.features.inventory.customwardrobe.CustomWardrobeConfig;
import at.hannibal2.skyhanni.config.features.inventory.helper.HelperConfig;
import at.hannibal2.skyhanni.config.features.itemability.ItemAbilityConfig;
import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig;
Expand Down Expand Up @@ -49,6 +50,10 @@ public class InventoryConfig {
@Category(name = "Item Abilities", desc = "Stuff about item abilities.")
public ItemAbilityConfig itemAbilities = new ItemAbilityConfig();

@Expose
@Category(name = "Custom Wardrobe", desc = "New Wardrobe Look.")
public CustomWardrobeConfig customWardrobe = new CustomWardrobeConfig();

@Expose
@Category(name = "Chocolate Factory", desc = "Features to help you master the Chocolate Factory idle game.")
public ChocolateFactoryConfig chocolateFactory = new ChocolateFactoryConfig();
Expand Down Expand Up @@ -93,23 +98,19 @@ public class InventoryConfig {
@Accordion
public GetFromSackConfig gfs = new GetFromSackConfig();

@Expose
@ConfigOption(name = "Pocket Sack-In-A-Sack", desc = "")
@Accordion
@Expose
public PocketSackInASackConfig pocketSackInASack = new PocketSackInASackConfig();

@Expose
@ConfigOption(
name = "Item Number",
desc = "Showing the item number as a stack size for these items."
)
@ConfigOption(name = "Item Number", desc = "Showing the item number as a stack size for these items.")
@ConfigEditorDraggableList
public List<ItemNumberEntry> itemNumberAsStackSize = new ArrayList<>(Arrays.asList(
NEW_YEAR_CAKE,
RANCHERS_BOOTS_SPEED,
LARVA_HOOK,
VACUUM_GARDEN
));
VACUUM_GARDEN));

public enum ItemNumberEntry implements HasLegacyId {
MASTER_STAR_TIER("§bMaster Star Tier", 0),
Expand Down Expand Up @@ -168,11 +169,8 @@ public String toString() {
public boolean vacuumBagCap = true;

@Expose
@ConfigOption(
name = "Quick Craft Confirmation",
desc = "Require Ctrl+Click to craft items that aren't often quick crafted " +
"(e.g. armor, weapons, accessories). Sack items can be crafted normally."
)
@ConfigOption(name = "Quick Craft Confirmation", desc = "Require Ctrl+Click to craft items that aren't often quick crafted " +
"(e.g. armor, weapons, accessories). Sack items can be crafted normally.")
@ConfigEditorBoolean
@FeatureToggle
public boolean quickCraftingConfirmation = false;
Expand All @@ -190,23 +188,20 @@ public String toString() {
public boolean anvilCombineHelper = false;

@Expose
@ConfigOption(name = "Item Stars",
desc = "Show a compact star count in the item name for all items.")
@ConfigOption(name = "Item Stars", desc = "Show a compact star count in the item name for all items.")
@ConfigEditorBoolean
@FeatureToggle
public boolean itemStars = false;

@Expose
@ConfigOption(name = "Missing Tasks",
desc = "Highlight missing tasks in the SkyBlock Level Guide inventory.")
@ConfigOption(name = "Missing Tasks", desc = "Highlight missing tasks in the SkyBlock Level Guide inventory.")
// TODO move( , "inventory.highlightMissingSkyBlockLevelGuide", "inventory.skyblockGuideConfig.highlightMissingSkyBlockLevelGuide")
@ConfigEditorBoolean
@FeatureToggle
public boolean highlightMissingSkyBlockLevelGuide = true;

@Expose
@ConfigOption(name = "Power Stone Guide",
desc = "Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the items in the Power Stone Guide.")
@ConfigOption(name = "Power Stone Guide", desc = "Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the items in the Power Stone Guide.")
// TODO move( , "inventory.powerStoneGuide", "inventory.skyblockGuideConfig.powerStoneGuide")
@ConfigEditorBoolean
@FeatureToggle
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package at.hannibal2.skyhanni.config.features.inventory.customwardrobe;

import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;

public class ColorConfig {

@Expose
@ConfigOption(name = "Background", desc = "Color of the GUI background.")
@ConfigEditorColour
public String backgroundColor = "0:127:0:0:0";

@Expose
@ConfigOption(name = "Equipped", desc = "Color of the currently equipped wardrobe slot.")
@ConfigEditorColour
public String equippedColor = "0:127:85:255:85";

@Expose
@ConfigOption(name = "Favorite", desc = "Color of the wardrobe slots that have been added as favorites.")
@ConfigEditorColour
public String favoriteColor = "0:127:255:85:85";

@Expose
@ConfigOption(name = "Same Page", desc = "Color of wardrobe slots in the same page.")
@ConfigEditorColour
public String samePageColor = "0:127:94:108:255";

@Expose
@ConfigOption(name = "Other Page", desc = "Color of wardrobe slots in another page.")
@ConfigEditorColour
public String otherPageColor = "0:127:0:0:0";

@Expose
@ConfigOption(name = "Top Outline", desc = "Color of the top of the outline when hovered.")
@ConfigEditorColour
public String topBorderColor = "0:255:255:200:0";

@Expose
@ConfigOption(name = "Bottom Outline", desc = "Color of the bottom of the outline when hovered.")
@ConfigEditorColour
public String bottomBorderColor = "0:255:255:0:0";

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package at.hannibal2.skyhanni.config.features.inventory.customwardrobe;

import at.hannibal2.skyhanni.config.FeatureToggle;
import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.Accordion;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;

public class CustomWardrobeConfig {

@Expose
@ConfigOption(name = "Enable", desc = "Enables the Custom Wardrobe GUI.")
@ConfigEditorBoolean
@FeatureToggle
public boolean enabled = true;

@Expose
@ConfigOption(name = "Follow mouse", desc = "Players follow the movement of the mouse.")
@ConfigEditorBoolean
public boolean eyesFollowMouse = true;

@Expose
@ConfigOption(name = "Hide Empty Slots", desc = "Hides wardrobe slots with no armor.")
@ConfigEditorBoolean
public boolean hideEmptySlots = false;

@Expose
@ConfigOption(name = "Hide Locked Slots", desc = "Hides locked wardrobe slots.")
@ConfigEditorBoolean
public boolean hideLockedSlots = false;

@Expose
public boolean onlyFavorites = false;

@Expose
@ConfigOption(name = "Estimated Value", desc = "Show a §2$ §7sign you can hover to see the wardrobe slot value.")
@ConfigEditorBoolean
public boolean estimatedValue = true;

@Expose
@ConfigOption(name = "Loading text", desc = "Shows a \"§cLoading...\" §7text when the wardrobe page hasn't fully loaded in yet.")
@ConfigEditorBoolean
public boolean loadingText = true;

@Expose
@ConfigOption(name = "Colors", desc = "Change the color settings.")
@Accordion
public ColorConfig color = new ColorConfig();

@Expose
@ConfigOption(name = "Spacing", desc = "")
@Accordion
public SpacingConfig spacing = new SpacingConfig();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
package at.hannibal2.skyhanni.config.features.inventory.customwardrobe;

import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
import io.github.notenoughupdates.moulconfig.observer.Property;

public class SpacingConfig {

@Expose
@ConfigOption(name = "Global Scale", desc = "Controls the scale of the entirety of the wardrobe.")
@ConfigEditorSlider(
minValue = 30,
maxValue = 200,
minStep = 1
)
public Property<Integer> globalScale = Property.of(100);

@Expose
@ConfigOption(name = "Outline Thickness", desc = "How thick the outline of the hovered slot is.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 15,
minStep = 1
)
public Property<Integer> outlineThickness = Property.of(5);

@Expose
@ConfigOption(name = "Outline Blur", desc = "Amount of blur of the outline.")
@ConfigEditorSlider(
minValue = 0f,
maxValue = 1f,
minStep = 0.1f
)
public Property<Float> outlineBlur = Property.of(0.5f);

@Expose
@ConfigOption(name = "Slot Width", desc = "Width of the wardrobe slots.")
@ConfigEditorSlider(
minValue = 30,
maxValue = 100,
minStep = 1
)
public Property<Integer> slotWidth = Property.of(75);

@Expose
@ConfigOption(name = "Slot Height", desc = "Height of the wardrobe slots.")
@ConfigEditorSlider(
minValue = 60,
maxValue = 200,
minStep = 1
)
public Property<Integer> slotHeight = Property.of(140);

@Expose
@ConfigOption(name = "Player Scale", desc = "Scale of the players.")
@ConfigEditorSlider(
minValue = 0,
maxValue = 100,
minStep = 1
)
public Property<Integer> playerScale = Property.of(75);

@Expose
@ConfigOption(name = "Slots per Row", desc = "Max amount of wardrobe slots per row.")
@ConfigEditorSlider(
minValue = 5,
maxValue = 18,
minStep = 1
)
public Property<Integer> maxPlayersPerRow = Property.of(9);

@Expose
@ConfigOption(name = "Slots Horizontal Spacing", desc = "How much space horizontally between wardrobe slots.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 20,
minStep = 1
)
public Property<Integer> horizontalSpacing = Property.of(3);

@Expose
@ConfigOption(name = "Slots Vertical Spacing", desc = "How much space vertically between wardrobe slots.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 20,
minStep = 1
)
public Property<Integer> verticalSpacing = Property.of(3);

@Expose
@ConfigOption(name = "Slots & Buttons Spacing", desc = "How much vertical space there is between wardrobe slots and the buttons.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 40,
minStep = 1
)
public Property<Integer> buttonSlotsVerticalSpacing = Property.of(10);

@Expose
@ConfigOption(name = "Button Horizontal Spacing", desc = "How much space horizontally between buttons.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 40,
minStep = 1
)
public Property<Integer> buttonHorizontalSpacing = Property.of(10);

@Expose
@ConfigOption(name = "Button Vertical Spacing", desc = "How much space vertically between buttons.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 40,
minStep = 1
)
public Property<Integer> buttonVerticalSpacing = Property.of(10);

@Expose
@ConfigOption(name = "Button Width", desc = "Width of the buttons.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 60,
minStep = 1
)
public Property<Integer> buttonWidth = Property.of(50);

@Expose
@ConfigOption(name = "Button Height", desc = "Height of the buttons.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 60,
minStep = 1
)
public Property<Integer> buttonHeight = Property.of(20);

@Expose
@ConfigOption(name = "Background Padding", desc = "Space between the edges of the background and the slots.")
@ConfigEditorSlider(
minValue = 1,
maxValue = 20,
minStep = 1
)
public Property<Integer> backgroundPadding = Property.of(10);

}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker;
import at.hannibal2.skyhanni.features.garden.pests.VinylType;
import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker;
import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker;
import at.hannibal2.skyhanni.features.misc.trevor.TrevorTracker;
Expand Down Expand Up @@ -609,13 +610,26 @@ public static class DianaStorage {
public DianaProfitTracker.Data dianaProfitTracker = new DianaProfitTracker.Data();

@Expose
// TODO renmae
// TODO rename
public MythologicalCreatureTracker.Data mythologicalMobTracker = new MythologicalCreatureTracker.Data();
}

@Expose
public Map<SkillType, SkillAPI.SkillInfo> skillData = new HashMap<>();

@Expose
public WardrobeStorage wardrobe = new WardrobeStorage();

public static class WardrobeStorage {
@Expose
public Map<Integer, WardrobeAPI.WardrobeData> wardrobeData = new HashMap<>();

@Expose
@Nullable
public Integer currentWardrobeSlot = null;
}


@Expose
public UpgradeReminder.CommunityShopUpgrade communityShopProfileUpgrade = null;
}
Loading
Loading