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

Open
wants to merge 28 commits into
base: beta
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
28 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
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 @@ -56,6 +56,7 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI
import at.hannibal2.skyhanni.features.garden.pests.PestFinder
import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker
import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
import at.hannibal2.skyhanni.features.inventory.caketracker.CakeTracker
import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker
import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentsProfitTracker
import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
Expand Down Expand Up @@ -396,6 +397,11 @@ object Commands {
category = CommandCategory.USERS_RESET
callback { ExcavatorProfitTracker.resetCommand() }
}
event.register("shresetcaketracker") {
description = "Resets the New Year Cake Tracker"
category = CommandCategory.USERS_RESET
callback { CakeTracker.resetCommand() }
}

// non trackers
event.register("shresetghostcounter") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import at.hannibal2.skyhanni.config.features.itemability.ItemAbilityConfig;
import at.hannibal2.skyhanni.config.features.misc.EstimatedItemValueConfig;
import at.hannibal2.skyhanni.config.features.misc.PocketSackInASackConfig;
import at.hannibal2.skyhanni.features.inventory.caketracker.CakeTrackerConfig;
import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.Accordion;
import io.github.notenoughupdates.moulconfig.annotations.Category;
Expand Down Expand Up @@ -134,6 +135,11 @@ public class InventoryConfig {
@Accordion
public PageScrollingConfig pageScrolling = new PageScrollingConfig();

@Expose
@ConfigOption(name = "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 @@ -31,6 +31,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.caketracker.CakeTracker;
import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker;
import at.hannibal2.skyhanni.features.inventory.experimentationtable.ExperimentsProfitTracker;
import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
Expand Down Expand Up @@ -516,6 +517,9 @@ public static class GhostCounter {

}

@Expose
public CakeTracker.Data cakeTracker = new CakeTracker.Data();

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

Expand Down
Loading
Loading