Small improvements #10101
Merged
Small improvements #10101
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
Thodor12
reviewed
Aug 9, 2024
| @@ -598,7 +598,7 @@ | |||
| "com.minecolonies.coremod.gui.workerhuts.resourcelist": "Required Resources", | |||
|
|
|||
| "com.minecolonies.coremod.gui.workerhuts.recall": "Recall Worker", | |||
| "com.minecolonies.coremod.gui.workerhuts.workerassigned": "Assigned Workers:", | |||
| "com.minecolonies.coremod.gui.workerhuts.workerassigned": "§lAssigned Workers:", | |||
There was a problem hiding this comment.
Can't you modify this on the component level in the code instead of modifying the translation?
There was a problem hiding this comment.
Technichally yes, but it's more roundabout and we do that with a lot of text already here
someaddons
reviewed
Aug 9, 2024
| @@ -486,7 +486,7 @@ public void reduceNeededResources(final ItemStack stack) | |||
| @Override | |||
| protected boolean checkIfCanceled() | |||
| { | |||
| if ((job.getWorkOrder() == null && job.getBlueprint() != null) || (structurePlacer != null && !structurePlacer.getB().hasBluePrint())) | |||
| if ((job.hasWorkOrder() && job.getWorkOrder() == null) || (job.getWorkOrder() == null && job.getBlueprint() != null) || (structurePlacer != null && !structurePlacer.getB().hasBluePrint())) | |||
There was a problem hiding this comment.
has and get should be equvialent to get and null check, if has is true the get should always return sth
There was a problem hiding this comment.
hasWorkorder just checks if it has an id assigned atm, get actually fetches the workmanager one. I think it's also a performance thing. I could rename it to hasWorkOrderId or so
someaddons
approved these changes
Aug 9, 2024
Raycoms
added a commit
that referenced
this pull request
Aug 12, 2024
Add another null check to avoid some transition crashes in the resource scroll Proper show stash/postbox naming in requests Allow builder to recover from broken workorder setups Adjust recruitment interaction to properly display the recruitment text @Nightenom the pane builder culls the last added line? Adjust window resource tab to not overflow and add tooltip hover to always show even if overflowing Adjust min stock and courier assignment window to use the space better
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Closes #10021
Closes #10025
Closes #9889
Closes #10082
Closes #10084
Closes #10094
Changes proposed in this pull request:
[ x ] Yes I tested this before submitting it.
[ ] I also did a multiplayer test.
Review please