From cc5748a5d4cfc5d7437ca7611389e380f6899259 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 21 Jan 2022 11:47:44 +0700 Subject: [PATCH] Format matter value --- .../java/ru/dbotthepony/mc/otm/menu/FormattingHelper.java | 4 ++++ .../ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt | 3 ++- .../mc/otm/client/render/GravitationStabilizerRenderer.kt | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/FormattingHelper.java b/src/main/java/ru/dbotthepony/mc/otm/menu/FormattingHelper.java index b5d44b8b8..3f6570bfe 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/FormattingHelper.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/FormattingHelper.java @@ -1,5 +1,6 @@ package ru.dbotthepony.mc.otm.menu; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.TextComponent; @@ -7,10 +8,13 @@ import net.minecraft.network.chat.TranslatableComponent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.core.Fraction; +import javax.annotation.ParametersAreNonnullByDefault; import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class FormattingHelper { public static final String[] SUFFIX_COMPONENTS_ABOVE_ONE = new String[] { "otm.suffix.kilo", diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt index 7fe4473af..8d2f64d20 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt @@ -17,6 +17,7 @@ import ru.dbotthepony.mc.otm.block.entity.BlockEntityGravitationStabilizer import ru.dbotthepony.mc.otm.block.entity.blackhole.BlockEntityBlackHole import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.core.* +import ru.dbotthepony.mc.otm.menu.FormattingHelper import kotlin.math.PI private const val BEAM_WIDTH = 0.2 @@ -167,7 +168,7 @@ class BlackHoleRenderer(private val context: BlockEntityRendererProvider.Context poseStack.scale(scale, scale, scale) val font = Minecraft.getInstance().font - val text1 = TranslatableComponent("otm.3d2d.gravitation_stabilizer.mass", tile.mass.decimalString(2)) + val text1 = TranslatableComponent("otm.3d2d.gravitation_stabilizer.mass", FormattingHelper.formatMatterValuePlain(tile.mass)) val text2 = TranslatableComponent("otm.3d2d.gravitation_stabilizer.strength", "%.2f".format(tile.gravitationStrength)) font.drawAligned(poseStack, text1, TextAlign.TOP_LEFT, 0.8f, 0.8f - font.lineHeight.toFloat() / 2f, 0x0) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt index 408c4adbf..949855f45 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt @@ -20,6 +20,7 @@ import ru.dbotthepony.mc.otm.block.entity.BlockEntityGravitationStabilizer import ru.dbotthepony.mc.otm.block.entity.blackhole.BlockEntityBlackHole import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState import ru.dbotthepony.mc.otm.core.* +import ru.dbotthepony.mc.otm.menu.FormattingHelper import kotlin.math.PI private val BEAM_RENDER_TYPE_INNER = RenderType.beaconBeam(BeaconRenderer.BEAM_LOCATION, false) @@ -103,7 +104,7 @@ class GravitationStabilizerRenderer(private val context: BlockEntityRendererProv poseStack.scale(0.01f, 0.01f, 0.01f) val font = Minecraft.getInstance().font - font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.mass", bhTile.mass.decimalString(2)), TextAlign.TOP_CENTER, 0f, -font.lineHeight.toFloat() / 2f, 0xFFFFFF) + font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.mass", FormattingHelper.formatMatterValuePlain(bhTile.mass)), TextAlign.TOP_CENTER, 0f, -font.lineHeight.toFloat() / 2f, 0xFFFFFF) font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.strength", "%.2f".format(bhTile.gravitationStrength)), TextAlign.TOP_CENTER, 0f, font.lineHeight.toFloat() / 2f, 0xFFFFFF) poseStack.popPose()