Daytime Sleeping & en_us.json Improvements #48
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FIX: Added missing config option en_us.json entries REFACTOR: Updated some tooltips to be easier to read on bigger GUI sizes(notably the longer tooltips) REFACTOR: Updated the title language entry ever so slightly
FEAT: Added a new config option to enable/disable sleeping through the day! (fixes steves-underwater-paradise#21) FEAT: Config options to enable/disable time until dusk message REFACTOR: Some changes on how nighttime is detected, now always using a boolean form SleepMath instead of calculating it each time it is needed REFACTOR: Some additional changes to en_us.json
|
I forgot to mention this earlier, but I also added missing translation keys in en_us.json for some of the config options. |
|
Hi Superkat, this PR looks really good! Thanks a lot for the contribution, good luck with the rest of Modtoberfest (and beyond)! |
Steveplays28
added
enhancement
|
Glad you like it! It was a lot of fun to put together. Modtoberfest has challenged me to do things I never would've thought of doing, and it's been really great. If there's anything that needs changing, I can definitely change it. |
|
Thanks for the contribution Superkat! I'll try to get this released today. |
|
No worries! Don't feel the need to rush a release out if you don't have the time. Thanks for merging! |
Steveplays28
pushed a commit
that referenced
this pull request
Oct 15, 2023
(cherry picked from commit 6cd8241)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does 2 main things.
Daytime Sleeping:
Sleeping through the day to dusk is now possible. It can be optionally toggled in the config, along with some other config options for the seconds until dusk message and the night time message. For the night time message, I decided to make it "The night begins." instead of "The moon rises", as I felt like the second option would have been too obvious. However, this is easily changeable in the config. Additionally, I also renamed the "WAKE_UP_TIME" int to be "SUNRISE_WAKE_UP", as a second
private static intneeded to be added.The actual daytime sleeping works by using a FabricApi method, which also works with Quilt in my quick testing. It then checks if the config option is enabled or disabled, then decides what to do from there. If enabled, it allows the user to sleep in the bed(even during the day), otherwise, it returns the vanilla action.
en_us.json Improvements:
Firstly, lots of the longer tooltips have been reduced in length to be more easily readable on larger GUI sizes. I made this its own commit so it should be easy to reverse if you don't like it. Secondly, the config title has changed from "Realistic Sleep mod config" to "Realistic Sleep Config". This helps make it seem more in line with other config titles(e.g. Video Settings, Key Binds, Mouse Settings, Mod Menu Options, etc.)
Video:
A quick video showcase of the PR. Happy Modtoberfest!
daytimeSleeping.mp4