-
-
Notifications
You must be signed in to change notification settings - Fork 223
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: Gift Profit Tracker #3072
Open
DavidArthurCole
wants to merge
43
commits into
hannibal002:beta
Choose a base branch
from
DavidArthurCole:GiftTracker
base: beta
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+513
−80
Open
Changes from 40 commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
533055b
Done (I think)
DavidArthurCole 9a71cca
Should probably add types, yeah
DavidArthurCole 58dd7fb
Fix a couple problems
DavidArthurCole 3e2cd49
Okay, now done
DavidArthurCole 6357088
Fin
DavidArthurCole 73d4695
Attempt to pre-solve for Party gifts
DavidArthurCole 50d75ab
Better add method
DavidArthurCole c79aec7
Formatting
DavidArthurCole 2102075
Merge branch 'hannibal002:beta' into GiftTracker
DavidArthurCole a4c9450
Merge
DavidArthurCole 0bd8f5e
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/GiftTracker
CalMWolfs 798974c
Merge
DavidArthurCole ebcf04a
Merge remote-tracking branch 'upstream/beta' into GiftTracker
DavidArthurCole 46611db
Port config
DavidArthurCole bd3182a
Merge branch 'beta' into GiftTracker
CalMWolfs bb75f1d
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/GiftTracker
CalMWolfs 49934c1
regression
CalMWolfs 995740e
Merge branch 'beta' into GiftTracker
DavidArthurCole 726b3e3
Merge branch 'beta' into GiftTracker
CalMWolfs 72882c8
Merge
DavidArthurCole 7d93755
Fix
DavidArthurCole a3a2f43
Merge
DavidArthurCole 58c2bc3
Merge branch 'beta' into GiftTracker
DavidArthurCole 352a83d
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/GiftTracker
CalMWolfs 4d8c653
Merge
DavidArthurCole f2ef4aa
Import
DavidArthurCole bc16aaf
Merge branch 'beta' into GiftTracker
DavidArthurCole bdd75e2
Merge
DavidArthurCole a9d5e73
Merge branch 'beta' into GiftTracker
DavidArthurCole 98b53ba
Merge
DavidArthurCole 8f406a6
Cleanup
DavidArthurCole 9ad52e7
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/GiftTracker
hannibal002 89ab441
Merge remote-tracking branch 'upstream/beta' into GiftTracker
DavidArthurCole 33a408d
Merge remote-tracking branch 'upstream/beta' into GiftTracker
DavidArthurCole b398a1d
Merge branch 'beta' into GiftTracker
DavidArthurCole da6f854
Merge branch 'beta' into GiftTracker
DavidArthurCole d18795d
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/GiftTracker
hannibal002 20d69c5
merge conflict
hannibal002 82b6cd8
code cleanup
hannibal002 5edd2df
added searchable support
hannibal002 2682680
Merge remote-tracking branch 'upstream/beta' into GiftTracker
DavidArthurCole 5124b56
Cleanup
DavidArthurCole 997a15b
Merge remote-tracking branch 'upstream/beta' into GiftTracker
DavidArthurCole File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
src/main/java/at/hannibal2/skyhanni/config/features/event/gifting/GiftTrackerConfig.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package at.hannibal2.skyhanni.config.features.event.gifting | ||
|
||
import at.hannibal2.skyhanni.config.core.config.Position | ||
import com.google.gson.annotations.Expose | ||
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean | ||
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText | ||
import io.github.notenoughupdates.moulconfig.annotations.ConfigLink | ||
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption | ||
|
||
class GiftTrackerConfig { | ||
@Expose | ||
@ConfigOption(name = "Enabled", desc = "Enable the gift profit tracker.") | ||
@ConfigEditorBoolean | ||
var enabled: Boolean = false | ||
|
||
@Expose | ||
@ConfigOption( | ||
name = "§cNote", | ||
desc = "§cDue to the complexities of gifts leaving and re-entering the inventory or stash, gift usage is not auto-tracked. " + | ||
"§cUse §e/shaddusedgifts §cto manually add gifts used." | ||
) | ||
@ConfigEditorInfoText | ||
var note: String = "" | ||
|
||
@Expose | ||
@ConfigOption(name = "Holding Gift", desc = "Only show the tracker while holding a gift.") | ||
@ConfigEditorBoolean | ||
var holdingGift: Boolean = false | ||
|
||
@Expose | ||
@ConfigLink(owner = GiftTrackerConfig::class, field = "enabled") | ||
var position: Position = Position(-274, 0) | ||
} |
25 changes: 25 additions & 0 deletions
25
src/main/java/at/hannibal2/skyhanni/config/features/event/gifting/GiftingConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package at.hannibal2.skyhanni.config.features.event.gifting; | ||
|
||
import at.hannibal2.skyhanni.config.features.event.winter.GiftingOpportunitiesConfig; | ||
import at.hannibal2.skyhanni.config.features.event.winter.UniqueGiftConfig; | ||
import com.google.gson.annotations.Expose; | ||
import io.github.notenoughupdates.moulconfig.annotations.Accordion; | ||
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; | ||
|
||
public class GiftingConfig { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shouldnt this config file be made in kotlin? |
||
|
||
@Expose | ||
@ConfigOption(name = "Gift Profit Tracker", desc = "") | ||
@Accordion | ||
public GiftTrackerConfig giftProfitTracker = new GiftTrackerConfig(); | ||
|
||
@Expose | ||
@ConfigOption(name = "Unique Gifting Opportunities", desc = "Highlight players who you haven't given gifts to yet.") | ||
@Accordion | ||
public GiftingOpportunitiesConfig giftingOpportunities = new GiftingOpportunitiesConfig(); | ||
|
||
@Accordion | ||
@Expose | ||
@ConfigOption(name = "Unique Gift Counter", desc = "Keep track of how many unique players you have given gifts to.") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. order the annotations here the same way and put |
||
public UniqueGiftConfig uniqueGiftCounter = new UniqueGiftConfig(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dont use
@Expose
on config options annotated by@ConfigEditorInfoText