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.

Sign up for GitHub

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

Jump to bottom

Update ItemCooldowns.java #636

Merged
merged 6 commits into from
Apr 19, 2024
Merged

Update ItemCooldowns.java #636

merged 6 commits into from
Apr 19, 2024

Conversation

VeritasDL
Copy link
Contributor

add legendary monkey pet wood cutting cooldown attempt

idk if this is right or if im calling the api every time a block's broke lol

@LifeIsAParadox LifeIsAParadox added the reviews needed This PR needs reviews label Apr 6, 2024
@VeritasDL
Copy link
Contributor Author

updated to use the async stuff and to use a 3 min cooldown for api requests

@LifeIsAParadox LifeIsAParadox added changes requested This PR need changes and removed reviews needed This PR needs reviews labels Apr 8, 2024
@VeritasDL VeritasDL requested a review from viciscat April 8, 2024 19:19
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed changes requested This PR need changes labels Apr 8, 2024
@kevinthegreat1
Copy link
Collaborator

Hi, this pr will require some more work. We have many pr's right now so it may be a bit when I get to this.

@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Apr 17, 2024
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Apr 17, 2024
@kevinthegreat1
Copy link
Collaborator

Cleaned up the profile stuff a lot. Did not test yet.

viciscat
viciscat reviewed Apr 18, 2024
View reviewed changes
Copy link
Collaborator

@viciscat viciscat left a comment

Choose a reason for hiding this comment

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

Looks like this should work but i don't have legendary monke so I can't test

kevinthegreat1
kevinthegreat1 previously approved these changes Apr 18, 2024
View reviewed changes
Copy link
Collaborator

@kevinthegreat1 kevinthegreat1 left a comment

Choose a reason for hiding this comment

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

Tested the profile part.

@LifeIsAParadox LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Apr 18, 2024
@kevinthegreat1 kevinthegreat1 added this to the 1.20 milestone Apr 18, 2024
@kevinthegreat1
Copy link
Collaborator

Hi, the commit history is a bit messed up. Can you run a git rebase origin/master? If you don't know how to rebase and you're fine if I commit the changes, then I can do it for you.

@kevinthegreat1 kevinthegreat1 added changes requested This PR need changes bleeding edge This PR has been accepted into bleeding edge labels Apr 19, 2024
@LifeIsAParadox LifeIsAParadox added merge conflicts This PR has merge conflicts that need solving. and removed merge me please Pull requests that are ready to merge changes requested This PR need changes labels Apr 19, 2024
@VeritasDL
Copy link
Contributor Author

Hi, the commit history is a bit messed up. Can you run a git rebase origin/master? If you don't know how to rebase and you're fine if I commit the changes, then I can do it for you.

i think i did it? idk

@viciscat
Copy link
Collaborator

oof I don't think you did it right... You aren't supposed to merge after you rebase. You are supposed to force push git push --force if I remember correctly

@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews merge conflicts This PR has merge conflicts that need solving. and removed merge conflicts This PR has merge conflicts that need solving. reviews needed This PR needs reviews labels Apr 19, 2024
VeritasDL and others added 6 commits April 19, 2024 18:00
@VeritasDL
Update ItemCooldowns.java
07217c6 
add legendary monkey pet wood cutting cooldown attempt
@VeritasDL
Update ItemCooldowns.java
2827273 
MonkeyPet treecapitator cooldown
@VeritasDL
Update ItemCooldowns.java
1d01689 
Changed to not request api every block break? i think idk havent tested
@VeritasDL
added CompletableFuture.runAsync for the monkey cooldown and added a …
774a0f7 
…3 min api cooldown
@VeritasDL
Update ItemCooldowns.java
e6c0ca1 
github, intellij or I suck
@kevinthegreat1 @VeritasDL
Add ProfileUtils and clean up code
e049ed1
@LifeIsAParadox LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Apr 19, 2024
@LifeIsAParadox LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Apr 19, 2024
@kevinthegreat1 kevinthegreat1 merged commit fac81da into SkyblockerMod:master Apr 19, 2024
1 check passed
@LifeIsAParadox LifeIsAParadox removed the merge me please Pull requests that are ready to merge label Apr 19, 2024
@kevinthegreat1 kevinthegreat1 removed the bleeding edge This PR has been accepted into bleeding edge label May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@viciscat viciscat viciscat left review comments

@kevinthegreat1 kevinthegreat1 kevinthegreat1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.20
Development

Successfully merging this pull request may close these issues.
4 participants
@VeritasDL @kevinthegreat1 @viciscat @LifeIsAParadox