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

Feature: Add overflow crop milestones #997

Merged
merged 33 commits into from
May 3, 2024
Merged

Feature: Add overflow crop milestones #997

merged 33 commits into from
May 3, 2024

Conversation

qtlunya
Copy link
Contributor

@qtlunya qtlunya commented Feb 11, 2024 •
edited by hannibal002
Loading

What

Added overflow Garden crop milestones.

Changelog New Features

  • Added overflow Garden crop milestones. - Luna & HiZe

Changelog Technical Details

  • Made CropType.getByNameOrNull() case-insensitive. - Luna

CalMWolfs
CalMWolfs requested changes Feb 11, 2024
View reviewed changes
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.

just this for now (and you would also need to remove the .get() from all of the checks for this as well)

...n/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java Outdated Show resolved Hide resolved
@qtlunya qtlunya marked this pull request as ready for review February 24, 2024 19:51
hannibal002
hannibal002 requested changes Feb 24, 2024
View reviewed changes
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.

First code cleanup reveiw. Have not tested in game.

...n/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt Show resolved Hide resolved
@hannibal002 hannibal002 added this to the Version 0.23 milestone Feb 24, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Feb 24, 2024
@qtlunya @superhize
Forgot to commit these
fe2cb65 
Co-authored-by: HiZe <superhize@hotmail.com>
qtlunya and others added 2 commits February 25, 2024 11:04
@qtlunya @CalMWolfs
No more property
41d9810 
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
@qtlunya
Fix access
8a54410
@github-actions GitHub Actions
Copy link

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 Feb 29, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Feb 29, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 self-requested a review March 1, 2024 11:40
hannibal002
hannibal002 requested changes Mar 1, 2024
View reviewed changes
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.

Another round of code cleanup reviews. (not tested ingame)

src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/events/CropMilestoneOverflowLevelUpEvent.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryTooltipOverflow.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryTooltipOverflow.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 2, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 2, 2024

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

@hannibal002
Merge branch 'beta' into fork/overflow-milestones
ffe6e70 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 7, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 7, 2024
This was referenced Apr 24, 2024
Merged
Merged
@hannibal002
Copy link
Owner

grafik
grafik

@hannibal002
Copy link
Owner

grafik
grafik

CalMWolfs
CalMWolfs requested changes Apr 24, 2024
View reviewed changes
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.

dont have the means to test in game but here is some code cleanup stuff

...t/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesOverflowConfig.java Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt Show resolved Hide resolved
...t/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesOverflowConfig.java Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/FarmingMilestoneCommand.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryTooltipOverflow.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryTooltipOverflow.kt Show resolved Hide resolved
hannibal002
hannibal002 approved these changes Apr 24, 2024
View reviewed changes
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.

All overflow options work for me, except inventory and tooltip, those i cant test.

hannibal002
hannibal002 requested changes Apr 24, 2024
View reviewed changes
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.

Agree with Cal's config wording suggestions

@hannibal002 hannibal002 mentioned this pull request Apr 28, 2024
Merged
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 1, 2024

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

@hannibal002
Merge branch 'beta' into fork/overflow-milestones
e8cb265 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 1, 2024

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 merged commit 37a9fd7 into hannibal002:beta May 3, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label May 3, 2024
@qtlunya qtlunya deleted the overflow-milestones branch May 18, 2024 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 hannibal002 approved these changes

@CalMWolfs CalMWolfs Awaiting requested review from CalMWolfs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.25
Development

Successfully merging this pull request may close these issues.
4 participants
@qtlunya @hannibal002 @CalMWolfs @superhize