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

Improvement + Fix: Barn Fishing Timer #1960

Merged
merged 14 commits into from
Jul 26, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented May 31, 2024

What

Refactors Barn Fishing Timer to use MobDetection, adds a warning for when you reach a certain amount of sea creatures, and makes the time actually based on the time each mob has existed for instead of the time the timer has been active for.

This pr now also makes changes to the barn fishing timer to work with the new fishing cap changes Hypixel implemented.

Changelog Improvements

  • Improved Barn Fishing Timer. - Empa
    • Modified the warning thresholds for Crimson Isle and Crystal Hollows.
    • The timer now only takes into account the user's own sea creatures.
    • Added a warning when reaching a certain number of sea creatures.

Changelog Fixes

  • Fixed Squid Pet counting towards the Fishing Timer. - Empa

ItsEmpa added 3 commits May 31, 2024 09:17
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@hannibal002 hannibal002 added this to the Version 0.27 milestone May 31, 2024
Copy link

github-actions bot commented Jun 6, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 6, 2024
…hing-timer

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 6, 2024
Copy link

github-actions bot commented Jun 6, 2024

Conflicts have been resolved! 🎉

ItsEmpa added 6 commits July 2, 2024 20:41
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Jul 10, 2024

the scope of this pr has changed to also implement the sea creature cap changes added by hypixel

@hannibal002 hannibal002 added the Bug Fix Bug fixes label Jul 21, 2024
@hannibal002 hannibal002 changed the title Improvement: Barn Fishing Timer Improvement + Fix: Barn Fishing Timer Jul 21, 2024
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont understand why we process magma slugs differently. also the custom handlinb of fishing mobs should maybe get moved into another api class, so that only the count and add logic remains in this class. (extract complexitiy that might be duplicated in future other features into abstract classes early)

@hannibal002 hannibal002 merged commit 19d4d4e into hannibal002:beta Jul 26, 2024
3 checks passed
@github-actions github-actions bot removed the Bug Fix Bug fixes label Jul 26, 2024
Nealkitt pushed a commit to Nealkitt/SkyHanni that referenced this pull request Sep 8, 2024
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
@ItsEmpa ItsEmpa deleted the improvement/barn-fishing-timer branch October 12, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants