Add chocolate factory helper #683
Merged
Conversation
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
src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
Outdated
Show resolved
Hide resolved
|
Make sure to rebase this, it won't work on 1.20.6 sadly |
Emirlol
force-pushed
the
chocolate-factory-helper
branch
from
d357fd3
to
8dfbf43
Compare
|
Decided to finalize this draft and make the egg helper separately later on, as it's just a game of waiting until next spring and then finding all egg locations. |
LifeIsAParadox
added
reviews needed
|
Looks like it works pretty well, you just need to do your todos! |
I forgot about them, ehe |
Emirlol
force-pushed
the
chocolate-factory-helper
branch
from
d3fd175
to
19f510a
Compare
AzureAaron
requested changes
May 10, 2024
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
Outdated
Show resolved
Hide resolved
LifeIsAParadox
added
changes requested
kevinthegreat1
added
the
bleeding edge
Emirlol
force-pushed
the
chocolate-factory-helper
branch
from
e656489
to
15e53e0
Compare
Julienraptor01
suggested changes
May 14, 2024
There was a problem hiding this comment.
fixed the logic and enhanced few things
also nitpicking, but the proper way to say "getConcattedLore" is "getConcatenatedLore"
(yes i know engrish eeeh)
Here's a patch version to make all changes at once that you can apply by just doing
git apply 0001-Fix-few-things.patch
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
Outdated
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
Outdated
Show resolved
Hide resolved
LifeIsAParadox
added
changes requested
Emirlol
force-pushed
the
chocolate-factory-helper
branch
from
6c1d259
to
837c176
Compare
LifeIsAParadox
added
reviews needed
Emirlol
force-pushed
the
chocolate-factory-helper
branch
from
9c9abf6
to
25b0561
Compare
AzureAaron
requested changes
May 15, 2024
src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
Show resolved
Hide resolved
src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
Show resolved
Hide resolved
LifeIsAParadox
added
changes requested
Not necessarily related to the chocolate factory, but it was also added by me so should be fine
…oid merge conflicts
Emirlol
force-pushed
the
chocolate-factory-helper
branch
from
b3d4203
to
7601959
Compare
kevinthegreat1
previously approved these changes
May 23, 2024
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| public class SkyblockTime { | ||
| private static final long SKYBLOCK_POCH = 1560275700000L; |
There was a problem hiding this comment.
Don't think "poch" is a word, should be "epoch".
LifeIsAParadox
added
merge me please
LifeIsAParadox
added
reviews needed
kevinthegreat1
approved these changes
May 24, 2024
LifeIsAParadox
added
merge me please
kevinthegreat1
removed
the
bleeding edge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Highlights the best pick based on the price and CPS gain.
Currently, it tries to recalculate every second (when the screen updates due to chocolate gain). I tried to make it update only on click inside of the mixin but doesn't seem to work and I didn't bother to debug as I couldn't really understand the solver implementation. The performance loss is very negligible, and you wouldn't really care about performance in the inventory, but it still bugs me. So lmk if you have a solution.
Also sorry about the optionals, I recently started learning rust and they feel more natural than returning -1. As for the sorted map, I first tried to add the CPS increase factor to the item tooltip but that was a whole another thing I had to read and figure out, so I just left it as is.