Skip to content

Commit e9ff9b3

Browse files
emyfopsemyfops
committed
Moved formatting functions into the utils
1 parent 25aa23e commit e9ff9b3

File tree

8 files changed

+120
-98
lines changed

8 files changed

+120
-98
lines changed

‎src/main/kotlin/com/lambda/config/groups/FormatterSettings.kt‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,34 +50,4 @@ class FormatterSettings(
5050

5151
val timeFormat by owner.setting("Time Format", FormatterConfig.Time.IsoDateTime) { vis() }.group(*baseGroup)
5252
override val format get() = timeFormat.format
53-
54-
infix fun format(value: Short) = "%d".format(locale, value)
55-
infix fun format(value: Int) = "%d".format(locale, value)
56-
infix fun format(value: Long) = "%d".format(locale, value)
57-
infix fun format(value: Float) = "%,.${precision}f".format(locale, value)
58-
infix fun format(value: Double) = "%,.${precision}f".format(locale, value)
59-
60-
infix fun format(tuple: Vec2f) = "$prefix${format(tuple.x)}$separator${format(tuple.y)}$postfix"
61-
infix fun format(tuple: Vec2d) = "$prefix${format(tuple.x)}$separator${format(tuple.y)}$postfix"
62-
infix fun format(tuple: Vec3i) = "$prefix${format(tuple.x)}$separator${format(tuple.y)}$separator${format(tuple.z)}$postfix"
63-
infix fun format(tuple: Vec3d) = "$prefix${format(tuple.x)}$separator${format(tuple.y)}$separator${format(tuple.z)}$postfix"
64-
infix fun format(tuple: Vector3f) = "$prefix${format(tuple.x)}$separator${format(tuple.y)}$separator${format(tuple.z)}$postfix"
65-
infix fun format(tuple: Vector4f) = "$prefix${format(tuple.x)}$separator${format(tuple.y)}$separator${format(tuple.z)}$separator${format(tuple.w)}$postfix"
66-
67-
infix fun format(tuple: ShortArray) = tuple.joinToString(separator, prefix, postfix) { format(it) }
68-
infix fun format(tuple: IntArray) = tuple.joinToString(separator, prefix, postfix) { format(it) }
69-
infix fun format(tuple: LongArray) = tuple.joinToString(separator, prefix, postfix) { format(it) }
70-
infix fun format(tuple: FloatArray) = tuple.joinToString(separator, prefix, postfix) { format(it) }
71-
infix fun format(tuple: DoubleArray) = tuple.joinToString(separator, prefix, postfix) { format(it) }
72-
73-
@JvmName("formatVec2fList") infix fun format(tuple: List<Vec2f>) = tuple.joinToString(separator, prefix, postfix) { format(it) }
74-
@JvmName("formatVec2dList") infix fun format(tuple: List<Vec2d>) = tuple.joinToString(separator, prefix, postfix) { format(it) }
75-
@JvmName("formatVec3iList") infix fun format(tuple: List<Vec3i>) = tuple.joinToString(separator, prefix, postfix) { format(it) }
76-
@JvmName("formatVec3dList") infix fun format(tuple: List<Vec3d>) = tuple.joinToString(separator, prefix, postfix) { format(it) }
77-
@JvmName("formatVector3fList") infix fun format(tuple: List<Vector3f>) = tuple.joinToString(separator, prefix, postfix) { format(it) }
78-
@JvmName("formatVector4fList") infix fun format(tuple: List<Vector4f>) = tuple.joinToString(separator, prefix, postfix) { format(it) }
79-
80-
infix fun format(time: LocalDate): String = time.format(format)
81-
infix fun format(time: LocalDateTime): String = time.format(format)
82-
infix fun format(time: ZonedDateTime): String = time.format(format)
8353
}

‎src/main/kotlin/com/lambda/module/hud/Coordinates.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ import com.lambda.gui.dsl.ImGuiBuilder
2323
import com.lambda.module.HudModule
2424
import com.lambda.module.tag.ModuleTag
2525
import com.lambda.threading.runSafe
26-
import com.lambda.util.Formatting.asString
26+
import com.lambda.util.Formatting.format
2727
import com.lambda.util.NamedEnum
2828
import com.lambda.util.extension.dimensionName
2929
import com.lambda.util.extension.isNether
30-
import com.lambda.util.extension.isOverworld
3130
import com.lambda.util.math.Vec2d
3231
import com.lambda.util.math.netherCoord
3332
import com.lambda.util.math.overworldCoord
34-
import java.util.Locale
3533

3634
object Coordinates : HudModule(
3735
name = "Coordinates",
@@ -49,10 +47,10 @@ object Coordinates : HudModule(
4947

5048
override fun ImGuiBuilder.buildLayout() {
5149
runSafe {
52-
val position = formatter.format(player.pos)
50+
val position = player.pos.format(formatter)
5351
val otherDimensionPos =
54-
if (world.isNether) otherFormatter.format(player.overworldCoord.let { Vec2d(it.x, it.z) })
55-
else otherFormatter.format(player.netherCoord.let { Vec2d(it.x, it.z) })
52+
if (world.isNether) player.overworldCoord.let { Vec2d(it.x, it.z) }.format(otherFormatter)
53+
else player.netherCoord.let { Vec2d(it.x, it.z) }.format(otherFormatter)
5654

5755
val text = "$position $otherDimensionPos"
5856

‎src/main/kotlin/com/lambda/module/hud/Tps.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package com.lambda.module.hud
2020
import com.lambda.gui.dsl.ImGuiBuilder
2121
import com.lambda.module.HudModule
2222
import com.lambda.module.tag.ModuleTag
23-
import com.lambda.util.Formatting.string
23+
import com.lambda.util.Formatting.format
2424
import com.lambda.util.ServerTPS
2525
import com.lambda.util.ServerTPS.recentData
2626
import imgui.ImVec2
@@ -45,10 +45,10 @@ object Tps : HudModule(
4545
val current = data.last()
4646
val avg = data.average().toFloat()
4747
if (!showGraph) {
48-
text("${format.displayName}: ${avg.string}${format.unit}")
48+
text("${format.displayName}: ${avg.format()}${format.unit}")
4949
return
5050
}
51-
val overlay = "cur ${current.string}${format.unit} | avg ${avg.string}${format.unit}"
51+
val overlay = "cur ${current.format()}${format.unit} | avg ${avg.format()}${format.unit}"
5252

5353
plotLines(
5454
label = "##TPSPlot",

‎src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.lambda.module.tag.ModuleTag
2727
import com.lambda.sound.SoundManager.playSound
2828
import com.lambda.util.Communication
2929
import com.lambda.util.Communication.prefix
30-
import com.lambda.util.Formatting.string
30+
import com.lambda.util.Formatting.format
3131
import com.lambda.util.combat.CombatUtils.hasDeadlyCrystal
3232
import com.lambda.util.combat.DamageUtils.isFallDeadly
3333
import com.lambda.util.extension.fullHealth
@@ -125,7 +125,7 @@ object AutoDisconnect : Module(
125125
private fun SafeContext.damageDisconnect(source: DamageSource, amount: Float) {
126126
buildText {
127127
literal("Got ")
128-
highlighted(amount.string)
128+
highlighted(amount.format())
129129
literal(" damage of type ")
130130
highlighted(source.name)
131131
source.attacker?.let {
@@ -140,7 +140,7 @@ object AutoDisconnect : Module(
140140
}
141141
source.position?.let {
142142
literal(" at position ")
143-
highlighted(it.string)
143+
highlighted(it.format())
144144
}
145145
literal(".")
146146
}.let {
@@ -160,11 +160,11 @@ object AutoDisconnect : Module(
160160
text(text)
161161
literal("\n\n")
162162
literal("Disconnected at ")
163-
highlighted(player.pos.string)
163+
highlighted(player.pos.format())
164164
literal(" on ")
165165
highlighted(Communication.currentTime())
166166
literal(" with ")
167-
highlighted(player.fullHealth.string)
167+
highlighted(player.fullHealth.format())
168168
literal(" health.")
169169
if (player.isSubmergedInWater) {
170170
literal("\n")
@@ -197,7 +197,7 @@ object AutoDisconnect : Module(
197197
if (player.fullHealth < minimumHealth) {
198198
buildText {
199199
literal("Health ")
200-
highlighted(player.fullHealth.string)
200+
highlighted(player.fullHealth.format())
201201
literal(" below minimum of ")
202202
highlighted("$minimumHealth")
203203
literal("!")
@@ -223,7 +223,7 @@ object AutoDisconnect : Module(
223223
}?.let { creeper ->
224224
buildText {
225225
literal("An ignited creeper was ")
226-
highlighted(creeper.pos.distanceTo(player.pos).string)
226+
highlighted(creeper.pos.distanceTo(player.pos).format())
227227
literal(" blocks away!")
228228
}
229229
}
@@ -238,7 +238,7 @@ object AutoDisconnect : Module(
238238
literal("The player ")
239239
text(otherPlayer.name)
240240
literal(" was ")
241-
highlighted("${otherPlayer.distanceTo(player).string} blocks away")
241+
highlighted("${otherPlayer.distanceTo(player).format()} blocks away")
242242
literal("!")
243243
}
244244
}

‎src/main/kotlin/com/lambda/module/modules/player/Replay.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import com.lambda.util.Communication.logError
4747
import com.lambda.util.Communication.warn
4848
import com.lambda.util.FileUtils.locationBoundDirectory
4949
import com.lambda.util.FolderRegister
50-
import com.lambda.util.Formatting.asString
50+
import com.lambda.util.Formatting.format
5151
import com.lambda.util.Formatting.getTime
5252
import com.lambda.util.KeyCode
5353
import com.lambda.util.StringUtils.sanitizeForFilename
@@ -162,7 +162,7 @@ object Replay : Module(
162162
this@Replay.warn(
163163
"Position deviates from the recording by ${
164164
"%.3f".format(diff)
165-
} blocks. Desired position: ${pos.asString(3)}"
165+
} blocks. Desired position: ${pos.format()}"
166166
)
167167
if (cancelOnDeviation && diff > deviationThreshold) {
168168
state = State.Inactive
@@ -210,7 +210,7 @@ object Replay : Module(
210210
literal(" of ")
211211
color(ClickGuiLayout.primaryColor) { literal(saving.duration.toString()) }
212212
literal(" at ")
213-
color(ClickGuiLayout.primaryColor) { literal(saving.endPos.asString(1)) }
213+
color(ClickGuiLayout.primaryColor) { literal(saving.endPos.format(precision = 1)) }
214214
playMessage(saving)
215215
saveMessage(saving)
216216
pruneMessage(saving)
@@ -398,7 +398,7 @@ object Replay : Module(
398398
literal("Checkpoint #")
399399
color(ClickGuiLayout.primaryColor) { literal("${recordings.indexOf(checkRec)}") }
400400
literal(" created at ")
401-
color(ClickGuiLayout.primaryColor) { literal(checkRec.endPos.asString(0)) }
401+
color(ClickGuiLayout.primaryColor) { literal(checkRec.endPos.format(precision = 0)) }
402402
literal(".")
403403
playMessage(checkRec)
404404
saveMessage(checkRec)
@@ -581,8 +581,8 @@ object Replay : Module(
581581
)
582582

583583
override fun toString() = "Recording from ${
584-
startPos.asString(1)
585-
} to ${endPos.asString(1)} (in ${duration})"
584+
startPos.format(precision = 0)
585+
} to ${endPos.format(precision = 0)} (in ${duration})"
586586

587587
override fun serialize(
588588
src: Recording?,

‎src/main/kotlin/com/lambda/task/tasks/BuildTask.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import com.lambda.interaction.request.placing.PlaceRequest
5454
import com.lambda.task.Task
5555
import com.lambda.task.tasks.EatTask.Companion.eat
5656
import com.lambda.threading.runSafeAutomated
57-
import com.lambda.util.Formatting.string
57+
import com.lambda.util.Formatting.format
5858
import com.lambda.util.extension.Structure
5959
import com.lambda.util.extension.inventorySlots
6060
import com.lambda.util.item.ItemUtils.block
@@ -70,7 +70,7 @@ class BuildTask private constructor(
7070
private val lifeMaintenance: Boolean,
7171
automated: Automated
7272
) : Task<Structure>(), Automated by automated {
73-
override val name: String get() = "Building $blueprint with ${(breaks / (age / 20.0 + 0.001)).string} b/s ${(placements / (age / 20.0 + 0.001)).string} p/s"
73+
override val name: String get() = "Building $blueprint with ${(breaks / (age / 20.0 + 0.001)).format(precision = 1)} b/s ${(placements / (age / 20.0 + 0.001)).format(precision = 1)} p/s"
7474

7575
private val pendingInteractions = ConcurrentLinkedQueue<BuildContext>()
7676
private val atMaxPendingInteractions

‎src/main/kotlin/com/lambda/util/DebugInfoHud.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.lambda.Lambda.mc
2222
import com.lambda.command.CommandRegistry
2323
import com.lambda.event.EventFlow
2424
import com.lambda.module.ModuleRegistry
25-
import com.lambda.util.Formatting.asString
25+
import com.lambda.util.Formatting.format
2626
import com.lambda.util.extension.tickDelta
2727
import net.minecraft.util.Formatting
2828
import net.minecraft.util.hit.BlockHitResult
@@ -55,7 +55,7 @@ object DebugInfoHud {
5555
null -> add("Crosshair Target: None")
5656
}
5757

58-
add("Eye Pos: ${mc.cameraEntity?.getCameraPosVec(mc.tickDelta.toFloat())?.asString(3)}")
58+
add("Eye Pos: ${mc.cameraEntity?.getCameraPosVec(mc.tickDelta)?.format()}")
5959

6060
return
6161
}

0 commit comments

Comments
 (0)