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

pattern monitor pattern advanced tooltip lines

Browse Source
This commit is contained in:
YuRaNnNzZZ 2023-07-19 05:51:59 +03:00
parent 824d75a680
commit cc31b6e4bb
Signed by: YuRaNnNzZZ
GPG Key ID: 5F71738C85A6006D
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
View File

@ -258,6 +258,9 @@ private fun misc(provider: MatteryLanguageProvider) {
misc("item.pattern.infinite.stored", "Stored patterns: %s")
misc("item.pattern.line", "%s [%s%%]")
misc("item.pattern.research", "Researched: %s%%")
misc("item.pattern.research.item_count", "Items: %s / %s")
misc("item.pattern.research.advance", "Progress per item: %s%%")
misc("item.matter.infinite", "Stored matter: ∞ / ∞")
misc("item.matter.normal", "Stored matter: %s / %s")

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
View File

@ -264,6 +264,8 @@ private fun misc(provider: MatteryLanguageProvider) {
misc("item.pattern.stored", "Хранимые шаблоны: %s / %s")
misc("item.pattern.infinite.stored", "Хранимые шаблоны: %s")
misc("item.pattern.research", "Исследовано: %s%%")
misc("item.pattern.research.item_count", "Предметы: %s / %s")
misc("item.pattern.research.advance", "Исследование за предмет: %s%%")
misc("item.matter.infinite", "Хранимая материя неиссякаема")
misc("item.matter.normal", "Хранимая материя: %s / %s")

20
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt
View File

@ -34,6 +34,7 @@ import ru.dbotthepony.mc.otm.menu.matter.ReplicationRequestPacket
import ru.dbotthepony.mc.otm.network.MenuNetworkChannel
import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
import java.util.function.Predicate
import kotlin.math.ceil
import kotlin.math.roundToInt
@MouseTweaksDisableWheelTweak
@ -165,7 +166,24 @@ class MatterPanelScreen(
list.add(TranslatableComponent(
"otm.item.pattern.research",
String.format("%.2f", it.researchPercent * 100.0)
).withStyle(ChatFormatting.AQUA)) }
).withStyle(ChatFormatting.AQUA))
if (minecraft?.options?.advancedItemTooltips == true) {
val researchAdvance = MatterManager.getResearchAdvance(it.item)
val required = ceil(1.0 / researchAdvance).toInt()
val researched = (required.toDouble() * it.researchPercent).toInt()
list.add(TranslatableComponent(
"otm.item.pattern.research.item_count",
researched,
required
).withStyle(ChatFormatting.DARK_GRAY))
list.add(TranslatableComponent(
"otm.item.pattern.research.advance",
String.format("%.2f", researchAdvance * 100.0)
).withStyle(ChatFormatting.DARK_GRAY))
}
}
} else {
menu.tasksFiltered.getOrNull(index)?.let {
list.add(TranslatableComponent("otm.gui.matter_task.total", it.total).withStyle(ChatFormatting.GRAY))