Cleanup code in InfoCalculator.kt

Signed-off-by: Dominika <sokolov.dominika@gmail.com>
This commit is contained in:
Dominika 2020-09-27 23:19:15 -04:00
parent 1dc8ebe4cb
commit 981bf42883
No known key found for this signature in database
GPG Key ID: B4A5A6DCA70F861F
2 changed files with 2 additions and 51 deletions

View File

@ -12,7 +12,6 @@ import me.zeroeightsix.kami.util.color.ColorTextFormatting
import me.zeroeightsix.kami.util.color.ColorTextFormatting.ColourCode
import me.zeroeightsix.kami.util.math.MathUtils
import net.minecraft.client.Minecraft
import net.minecraft.network.NetworkManager
import net.minecraft.util.text.TextFormatting
import java.util.*
import kotlin.math.max
@ -113,7 +112,7 @@ object InfoOverlay : Module() {
infoContents.add(setToText(firstColour.value).toString() + mc.player.serverBrand)
}
if (durability.value) {
infoContents.add(setToText(firstColour.value).toString() + InfoCalculator.dura() + setToText(secondColour.value).toString() + " dura")
infoContents.add(setToText(firstColour.value).toString() + InfoCalculator.heldItemDurability() + setToText(secondColour.value).toString() + " heldItemDurability")
}
if (biome.value) {
infoContents.add(setToText(firstColour.value).toString() + mc.world.getBiome(mc.player.position).biomeName + setToText(secondColour.value).toString() + " biome")

View File

@ -4,77 +4,29 @@ import me.zeroeightsix.kami.util.LagCompensator.tickRate
import me.zeroeightsix.kami.util.math.MathUtils.round
import kotlin.math.hypot
/**
* @author l1ving
* Created by l1ving on 18/01/20
* Updated by l1ving on 06/02/20
* Updated by Xiaro on 11/09/20
*
*
* Speed:
* @author l1ving
* Created by l1ving on 18/01/20
* Credit to Seppuku for the following calculation I made more efficient and got inspiration from
* final String bps = "BPS: " + df.format((MathHelper.sqrt(deltaX * deltaX + deltaZ * deltaZ) / tickRate));
*
*
* Durability:
* @author TBM
* Created by TBM on 8/12/19
*
*
* TPS:
* @author 086
*/
object InfoCalculator {
private val mc = Wrapper.minecraft
/**
* @return Server type
*/
@JvmStatic
fun getServerType() = if (mc.isIntegratedServerRunning) "Singleplayer" else mc.currentServerData?.serverIP
?: "MainMenu"
/**
* @return Ping
*/
@JvmStatic
fun ping() = mc.player?.let { mc.connection?.getPlayerInfo(it.uniqueID)?.responseTime ?: 1 } ?: -1
/**
* @return Speed
*/
@JvmStatic
fun speed(useUnitKmH: Boolean): Double {
val tps = 1000.0 / mc.timer.tickLength
val multiply = if (useUnitKmH) 3.6 else 1.0 // convert mps to kmh
return hypot(mc.player.posX - mc.player.prevPosX, mc.player.posZ - mc.player.prevPosZ) * multiply * tps
}
/**
* @return Durability
*/
@JvmStatic
fun dura() = with(mc.player.heldItemMainhand) { maxDamage - getItemDamage() }
fun heldItemDurability() = with(mc.player.heldItemMainhand) { maxDamage - getItemDamage() }
/**
* @return Memory usage
*/
@JvmStatic
fun memory() = (Runtime.getRuntime().freeMemory() / 1000000L)
/**
* @return Ticks per second
*/
@JvmStatic
fun tps(places: Int) = round(tickRate, places)
/**
* @return Dimension
*/
@JvmStatic
fun dimension() = when (mc.player?.dimension) {
-1 -> "Nether"
0 -> "Overworld"