-
Notifications
You must be signed in to change notification settings - Fork 41
Feat: option to view biome name in Coordinates.kt (HUD elem) #264
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ import com.lambda.util.extension.isNether | |
| import com.lambda.util.math.Vec2d | ||
| import com.lambda.util.math.netherCoord | ||
| import com.lambda.util.math.overworldCoord | ||
| import io.ktor.util.* | ||
|
|
||
| object Coordinates : HudModule( | ||
| name = "Coordinates", | ||
|
|
@@ -42,6 +43,7 @@ object Coordinates : HudModule( | |
| } | ||
|
|
||
| private val showDimension by setting("Show Dimension Name", true) | ||
| private val showBiome by setting("Show Biome Name", true) // TwinkNet - Show biome | ||
| private val showCurrentDimensionOnly by setting("Show Current Dimension Only", true) | ||
|
|
||
| private val formatter = FormatterSettings(c = this, baseGroup = arrayOf(Group.CurrentDimension)).apply { | ||
|
|
@@ -66,10 +68,33 @@ object Coordinates : HudModule( | |
| else "$position $otherDimensionPos" | ||
|
|
||
| val withDimension = | ||
| if (showDimension) "$text ${world.dimensionName}" | ||
| // TwinkNet start - show biome | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same with these comments and all below |
||
| if (showDimension && showBiome) "$text ${world.dimensionName} in" | ||
|
TwinkNet marked this conversation as resolved.
Outdated
|
||
| else if (showDimension) "$text ${world.dimensionName}" | ||
| // TwinkNet end | ||
| else text | ||
|
|
||
| textCopyable(withDimension) | ||
| // TwinkNet start - Show biome | ||
| val withBiome = | ||
| if (showBiome) "$withDimension ${beautifyBiome(world.getBiome(player.blockPos).idAsString)}" | ||
| else withDimension | ||
| // TwinkNet end | ||
| textCopyable(withBiome) | ||
| } | ||
| } | ||
|
|
||
| // TwinkNet start - Show biome | ||
| fun beautifyBiome(biome: String): String { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This function can be refactored to be more readable and in line with native kotlin methods. fun beautifyBiome(biome: String): String = biome
.substringAfterLast(':')
.replace('_', ' ')
.split(' ')
.joinToString(" ") { it.replaceFirstChar(Char::uppercaseChar) } |
||
| val beautifulBiome = biome.replace(Regex("^.*:"), "").replace("_", " ") | ||
| // nuke the namespace key and underscores | ||
| val arr = beautifulBiome.toCharArray() | ||
| arr[0] = Character.toUpperCase(arr[0]) // first letter uppercase | ||
| for ((index, ch) in arr.withIndex()) { | ||
| if (ch == ' ') { | ||
| arr[index + 1] = Character.toUpperCase(arr[index + 1]) // uppercase every first letter of each word | ||
| } | ||
| } | ||
| return String(arr) | ||
| } | ||
| // TwinkNet end | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line comment is not necessary. This is not a paper server patch.