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: Golden Fish Timer #1941

Merged
merged 23 commits into from
Sep 10, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented May 30, 2024

What

Adds a Golden Fish Timer, with info on how long it has been since the last rod, time until you can spawn one, etc.
Also adds options to, for example, show certain info as a nametag on top of the golden fish, highlight it when its ready and give a warning when you are close to the time limit of throwing rod.

Images

image
image

Changelog New Features

  • Added Golden Fish Timer. - Empa
    • Includes an option to warn you when to throw your rod.
    • Shows how weak the golden fish is, as a nametag.
    • Also works on Stranded.

ItsEmpa added 5 commits May 30, 2024 15: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>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@hannibal002 hannibal002 added this to the Version 0.27 milestone May 30, 2024
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

code looks good just this one thing

Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa ItsEmpa requested a review from CalMWolfs May 31, 2024 08:22
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Copy link

github-actions bot commented Jun 5, 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 5, 2024
CalMWolfs added 3 commits June 6, 2024 09:20
…timer

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
Copy link

github-actions bot commented Jun 5, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added Merge Conflicts There are open merge conflicts with the beta branch. and removed Merge Conflicts There are open merge conflicts with the beta branch. labels Jun 5, 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.

…timer

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.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! 🎉

Copy link

github-actions bot commented Jun 8, 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 8, 2024
…timer

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
Copy link

github-actions bot commented Jun 8, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 22, 2024
Copy link

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

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

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Aug 21, 2024
@hannibal002
Copy link
Owner

idk what i am doing wrong. either the 3 minutes delay are wrong. or you need to fish something, not throw the rod in.
image

@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Aug 26, 2024

i think the most likely reason is that the detection for wheter or not something actually counts as throwing rod is really weird

@hannibal002
Copy link
Owner

oje
image

@hannibal002 hannibal002 removed the Soon This Pull Request will be merged within the next couple of betas label Sep 4, 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.

Does not work for me.

@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Sep 10, 2024
@hannibal002 hannibal002 self-requested a review September 10, 2024 13:56
@hannibal002 hannibal002 merged commit d6c9b63 into hannibal002:beta Sep 10, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Sep 10, 2024
@ItsEmpa ItsEmpa deleted the feature/golden-fish-timer branch October 12, 2024 15:57
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.

4 participants