Do not show contract limit when limit is at maxValue, add FormatContractText() method - #70
Merged
Conversation
Clayell
changed the title
siimav
requested changes
May 25, 2026
Comment on lines
+1302
to
+1317
| string stars = string.Concat(Enumerable.Repeat("<sprite=\"CurrencySpriteAsset\" name=\"Reputation\" tint=1>", starCount)); | ||
|
|
||
| string text; | ||
|
|
||
| if (max == int.MaxValue) | ||
| { | ||
| text = "{2}"; | ||
| } | ||
| else | ||
| { | ||
| text = current >= max ? "<color=#f97306>{2} [{1}: {3}]</color>" : "{2} [{1}: {3}]"; | ||
| } | ||
|
|
||
| text = addNewLine ? text + "\n" : text; | ||
|
|
||
| output += StringBuilderCache.Format($"<b><color=#f4ee21>{stars}{starSpacing}</color><color=#DB8310>{{0}}{titleSpacing}</color></b>{text}", Localizer.Format(title), Localizer.Format("#cc.mcui.max"), current, max); |
There was a problem hiding this comment.
This should use stringbuilder from start to finish. Way too many string concats in there now.
Author
There was a problem hiding this comment.
siimav
requested changes
May 25, 2026
|
|
||
| private void FormatContractCounts(ref string output, int starCount, string title, int current, int max, string starSpacing, string titleSpacing, bool addNewLine) | ||
| { | ||
| string stars = string.Concat(Enumerable.Repeat("<sprite=\"CurrencySpriteAsset\" name=\"Reputation\" tint=1>", starCount)); |
|
|
||
| text = addNewLine ? text + "\n" : text; | ||
|
|
||
| output += StringBuilderCache.Format("<b><color=#f4ee21>{0}{1}</color><color=#DB8310>{2}{3}</color></b>" + text, stars, starSpacing, Localizer.Format(title), titleSpacing, Localizer.Format("#cc.mcui.max"), current, max); |
There was a problem hiding this comment.
You allocate a new chonker of a string here for + text. Then another chonker when Format fills in the placeholders.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Bug reported by Worcester
Before:
After:
Also condensed all of this text into a method, since it was very repetitive and hard to follow.