DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Cycle between full and si-prefixed matter values

Browse Source
This commit is contained in:
DBotThePony 2023-02-05 17:56:35 +07:00
parent a9fee2b527
commit fea86d74ef
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
View File

@ -79,6 +79,7 @@ import ru.dbotthepony.mc.otm.core.readItemType
import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.core.registryName
import ru.dbotthepony.mc.otm.core.stream import ru.dbotthepony.mc.otm.core.stream
import ru.dbotthepony.mc.otm.core.writeItemType import ru.dbotthepony.mc.otm.core.writeItemType
import ru.dbotthepony.mc.otm.milliTime
import ru.dbotthepony.mc.otm.network.MatteryPacket import ru.dbotthepony.mc.otm.network.MatteryPacket
import ru.dbotthepony.mc.otm.network.RegistryNetworkChannel import ru.dbotthepony.mc.otm.network.RegistryNetworkChannel
import ru.dbotthepony.mc.otm.registry.RegistryDelegate import ru.dbotthepony.mc.otm.registry.RegistryDelegate
@ -86,6 +87,7 @@ import ru.dbotthepony.mc.otm.storage.ItemStackWrapper
import java.io.File import java.io.File
import java.math.BigInteger import java.math.BigInteger
import java.util.* import java.util.*
import java.util.function.BooleanSupplier
import java.util.function.Supplier import java.util.function.Supplier
import java.util.stream.Stream import java.util.stream.Stream
import kotlin.ConcurrentModificationException import kotlin.ConcurrentModificationException
@ -1085,6 +1087,8 @@ object MatterManager {
return getResearchAdvance(this@MatterManager.get(stack.asItem()).complexity) return getResearchAdvance(this@MatterManager.get(stack.asItem()).complexity)
} }
private val formatMatterAsReadable = BooleanSupplier { minecraft.window.isShiftDown && milliTime % 2_000L > 1_000L }
fun tooltipEvent(event: ItemTooltipEvent) { fun tooltipEvent(event: ItemTooltipEvent) {
if (minecraft.window.isShiftDown) { if (minecraft.window.isShiftDown) {
val matter = get(event.itemStack, accountForStackSize = false) val matter = get(event.itemStack, accountForStackSize = false)
@ -1096,20 +1100,20 @@ object MatterManager {
if (matter.matter != matterSized.matter || matter.complexity != matterSized.complexity) { if (matter.matter != matterSized.matter || matter.complexity != matterSized.complexity) {
event.toolTip.add( event.toolTip.add(
TranslatableComponent("otm.gui.matter.format_and_complexity2", TranslatableComponent("otm.gui.matter.format_and_complexity2",
matter.matter.formatMatterFull(), matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable),
matterSized.matter.formatMatter(), matterSized.matter.formatMatter(formatAsReadable = formatMatterAsReadable),
if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")), if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")),
if (matterSized.complexity > 1000.0) formatTickDuration(matterSized.complexity.roundToInt(), true) else matterSized.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")), if (matterSized.complexity > 1000.0) formatTickDuration(matterSized.complexity.roundToInt(), true) else matterSized.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")),
).withStyle(ChatFormatting.AQUA)) ).withStyle(ChatFormatting.AQUA))
} else { } else {
event.toolTip.add( event.toolTip.add(
TranslatableComponent("otm.gui.matter.format_and_complexity", TranslatableComponent("otm.gui.matter.format_and_complexity",
matter.matter.formatMatterFull(), matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable),
if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")), if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")),
).withStyle(ChatFormatting.AQUA)) ).withStyle(ChatFormatting.AQUA))
} }
} else { } else {
event.toolTip.add(matter.matter.formatMatterFull().withStyle(ChatFormatting.AQUA)) event.toolTip.add(matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable).withStyle(ChatFormatting.AQUA))
} }
} }