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

Add new Farmland Mode with light level for crops #55

Merged
merged 12 commits into from
Apr 5, 2024

Conversation

Alveel
Copy link
Contributor

@Alveel Alveel commented Apr 1, 2024

Added light level functionality for farmland/crops.

2024-04-01 150330 java_ndFjqTJy0v

Also added a new separate farmland mode. I must note that about 95% of the farmland mode code is identical to carpet mode.

image

@Alveel Alveel marked this pull request as draft April 1, 2024 13:21
Copy link
Contributor

@andi-makes andi-makes left a comment

Choose a reason for hiding this comment

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

Looks very good overall, thank you for working on this!

There are some nit-picks and suggestions, see the comments for further details.

I highly appreciate the help! Feel free to further work on it as much as you like, and then I'll take it from there.

I already have ideas how to integrate the farmland mode as a kind of "sub-overlay", so don't worry too much about rendering stuff, I'll make it so that the rendering gets adjusted depending on whether the "main overlay" is carpet mode, number mode etc.

Again, thanks for the help!

gradle.properties Outdated Show resolved Hide resolved
gradle.properties Outdated Show resolved Hide resolved
fabric/build.gradle Outdated Show resolved Hide resolved
@Alveel Alveel changed the title 1.20.4 and add light level for crops Add light level for crops and new Farmland Mode Apr 1, 2024
@Alveel Alveel force-pushed the light-level-for-crops branch from 8032201 to feefa26 Compare April 2, 2024 15:25
@Alveel Alveel marked this pull request as ready for review April 2, 2024 16:27
@Alveel
Copy link
Contributor Author

Alveel commented Apr 2, 2024

Ready for review!

@Alveel Alveel requested a review from andi-makes April 2, 2024 16:31
@Alveel Alveel changed the title Add light level for crops and new Farmland Mode Add new Farmland Mode with light level for crops Apr 3, 2024
Copy link
Contributor

@andi-makes andi-makes left a comment

Choose a reason for hiding this comment

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

Sorry to have kept you waiting!

I really like the work you've done here, well done!

I suggest a small change for LightyColors.getGrowthARGB that represents the growth conditions based on lighting a little bit better. Based on my testing, the change makes it so that:

  • If plants can grow, green
  • If plants cannot grow, orange
  • If plants unplant themself, red

Please also take a look at the change if you want to and verify that I didn't mess something up 🙃

When the change is applied, I see no further issues and I'll be happy to merge this PR!

Copy link
Contributor

@andi-makes andi-makes left a comment

Choose a reason for hiding this comment

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

lgtm, orange and red in the farmland overlay is swapped, but I'll fix it after the merge

Again, thank you very much for working on the Farmland mode, highly appreciated!

@andi-makes andi-makes merged commit aaad716 into SchmarrnDevs:1.20.3 Apr 5, 2024
1 check passed
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.

2 participants