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

Feature: New Year Cake Tracker #2237

Merged
merged 66 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
18deecc
Start of feature
DavidArthurCole Jul 18, 2024
210f709
Progress, still lots to do
DavidArthurCole Jul 19, 2024
a19327c
Full functionality
DavidArthurCole Jul 19, 2024
b4b446b
Add logic to only update currentYear during or after Late Winter 29th
DavidArthurCole Jul 19, 2024
37993ae
Add note about NEU, convert static color to config option
DavidArthurCole Jul 20, 2024
8ae19a4
Merge branch 'beta' into CakeTracker
DavidArthurCole Jul 30, 2024
4a862de
Post merge cleanup
DavidArthurCole Jul 30, 2024
2694845
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Aug 17, 2024
3e6da88
This seems better
DavidArthurCole Aug 21, 2024
5b4b4df
Actually take action on param, rename
DavidArthurCole Aug 21, 2024
ccfcf69
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Aug 26, 2024
1c07362
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Aug 26, 2024
93ea6c2
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Aug 26, 2024
850ee70
Merge branch 'beta' into CakeTracker
DavidArthurCole Sep 7, 2024
4f4815f
Merge branch 'beta' into CakeTracker
DavidArthurCole Sep 8, 2024
7b508f1
Post merge cleanup
DavidArthurCole Sep 8, 2024
896287a
Update command registration to be readable
DavidArthurCole Sep 8, 2024
0473e14
Merge branch 'beta' into CakeTracker
DavidArthurCole Sep 9, 2024
836be14
Post-merge cleanup
DavidArthurCole Sep 9, 2024
657edbc
Update to Searchables
DavidArthurCole Sep 9, 2024
5d47495
Merge branch 'beta' into CakeTracker
DavidArthurCole Sep 13, 2024
0d09c13
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Sep 14, 2024
95a089a
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Sep 25, 2024
d671876
Update formatting post-Searchable conversion
DavidArthurCole Oct 10, 2024
cc4ed31
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Oct 10, 2024
4af491f
Merge branch 'beta' into CakeTracker
DavidArthurCole Oct 13, 2024
6781f76
Fixes & improvements
DavidArthurCole Oct 16, 2024
f1cf754
More fixes
DavidArthurCole Oct 16, 2024
d706503
Code cleanup, improvements
DavidArthurCole Oct 18, 2024
82181cf
Merge branch 'beta' into CakeTracker
DavidArthurCole Oct 19, 2024
2b642c5
Detektions
DavidArthurCole Oct 19, 2024
c43b482
Detektions
DavidArthurCole Oct 19, 2024
f99df45
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Oct 20, 2024
af1568e
Merge branch 'beta' into CakeTracker
CalMWolfs Oct 20, 2024
2346386
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Oct 24, 2024
b51aecc
Update src/main/java/at/hannibal2/skyhanni/features/inventory/caketra…
DavidArthurCole Oct 24, 2024
30b6d76
Requested changes
DavidArthurCole Oct 24, 2024
1ae6c3f
Fixes
DavidArthurCole Oct 24, 2024
40cb345
Requested changes
DavidArthurCole Oct 25, 2024
37f20ee
Update src/main/java/at/hannibal2/skyhanni/features/inventory/caketra…
DavidArthurCole Oct 25, 2024
b9c934b
Requested changes
DavidArthurCole Oct 25, 2024
0aada80
requested changes
DavidArthurCole Oct 26, 2024
4833f0e
fix
DavidArthurCole Oct 26, 2024
33b90df
detektions
DavidArthurCole Oct 26, 2024
0270544
fuck you intellij
DavidArthurCole Oct 26, 2024
7fe8699
I had to type every import out manually. IntelliJ can eat my ENTIRE ass
DavidArthurCole Oct 26, 2024
746947a
fml
DavidArthurCole Oct 26, 2024
b476736
Aliasing from Empa
DavidArthurCole Oct 26, 2024
1998f7c
Requested changes
DavidArthurCole Oct 26, 2024
42f4778
Boolean inversions, message on reset
DavidArthurCole Oct 26, 2024
cc18c0f
More updates, fixes, improvements, and formatting changes
DavidArthurCole Oct 26, 2024
44f8881
Unused import
DavidArthurCole Oct 26, 2024
aabd6dc
Detektions
DavidArthurCole Oct 26, 2024
48ab016
Omit headers from max count
DavidArthurCole Oct 26, 2024
47bd35e
Change on property changes
DavidArthurCole Oct 26, 2024
d1406f4
Requested changes
DavidArthurCole Nov 4, 2024
71f27a2
Updates and fixes, normalization
DavidArthurCole Nov 4, 2024
477df92
Don't know when that got nuked, that's probably important to annotate
DavidArthurCole Nov 4, 2024
d04fd59
Merge branch 'hannibal002:beta' into CakeTracker
DavidArthurCole Nov 4, 2024
5bf7f4b
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/CakeTracker
hannibal002 Nov 12, 2024
e2457a2
wording
hannibal002 Nov 12, 2024
4ca02c4
Fixes, improvements :3
DavidArthurCole Nov 12, 2024
f14b0bd
Detekt
DavidArthurCole Nov 12, 2024
3d17a8b
Fix displaying in invs with no cakes
DavidArthurCole Nov 15, 2024
b665394
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/CakeTracker
hannibal002 Nov 15, 2024
8f9ed7e
code cleanup
hannibal002 Nov 15, 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
@@ -0,0 +1,65 @@
package at.hannibal2.skyhanni.config.features.inventory;

import at.hannibal2.skyhanni.config.FeatureToggle;
import at.hannibal2.skyhanni.config.core.config.Position;
import at.hannibal2.skyhanni.utils.LorenzColor;
import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
import io.github.notenoughupdates.moulconfig.observer.Property;

public class CakeTrackerConfig {

@Expose
@ConfigOption(name = "Enabled", desc = "Track which Cakes you have/need. §cWill not fully work with NEU Storage Overlay.")
@ConfigEditorBoolean
@FeatureToggle
public boolean enabled = false;

@Expose
@ConfigLink(owner = CakeTrackerConfig.class, field = "enabled")
public Position cakeTrackerPosition = new Position(300, 300, false, true);

@Expose
public CakeTrackerDisplayType displayType = CakeTrackerDisplayType.MISSING_CAKES;

public enum CakeTrackerDisplayType {
MISSING_CAKES,
OWNED_CAKES,
}

@Expose
public CakeTrackerDisplayOrderType displayOrderType = CakeTrackerDisplayOrderType.OLDEST_FIRST;

public enum CakeTrackerDisplayOrderType {
OLDEST_FIRST,
NEWEST_FIRST,
}

@Expose
@ConfigOption(
name = "Missing Color",
desc = "The color that should be used to highlight unobtained cakes in the auction house."
)
@ConfigEditorColour
public String unobtainedAuctionHighlightColor = LorenzColor.RED.toConfigColor();

@Expose
@ConfigOption(
name = "Owned Color",
desc = "The color that should be used to highlight obtained cakes in the auction house."
)
@ConfigEditorColour
public String obtainedAuctionHighlightColor = LorenzColor.GREEN.toConfigColor();

@Expose
@ConfigOption(
name = "Maximum Rows",
desc = "The maximum number of rows to display in the tracker, before a cutoff is imposed."
)
@ConfigEditorSlider(minValue = 5, maxValue = 40, minStep = 1)
public Property<Integer> maxDisplayRows = Property.of(20);
}
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ public class InventoryConfig {
@Accordion
public PageScrollingConfig pageScrolling = new PageScrollingConfig();

@Expose
@ConfigOption(name = "New Year Cake Tracker", desc = "")
@Accordion
public CakeTrackerConfig cakeTracker = new CakeTrackerConfig();

@Expose
@ConfigOption(name = "Magical Power Display", desc = "")
@Accordion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -521,6 +522,26 @@ public static class GhostCounter {

}

public static class CakeData {
@Expose
public Set<Integer> ownedCakes = new HashSet<>();

@Expose
public Set<Integer> missingCakes = new HashSet<>();

@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ownedCakes.hashCode();
result = prime * result + missingCakes.hashCode();
return result;
}
}

@Expose
public CakeData cakeData = new CakeData();

@Expose
public PowderTracker.Data powderTracker = new PowderTracker.Data();

Expand Down
Loading
Loading