From ee0a1137022ba00f65aaa5d0facaec7ee3ad019b Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Tue, 4 Mar 2025 21:57:17 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B1=D0=B5=D1=81=D0=BA=D0=BE=D0=BD=D0=B5?= =?UTF-8?q?=D1=87=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BD=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B4=D0=B5=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overdrive_that_matters/font/small.json | 2 +- .../textures/font/small.pdn | Bin 11149 -> 11163 bytes .../textures/font/small.png | Bin 1242 -> 1240 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/overdrive_that_matters/font/small.json b/src/main/resources/assets/overdrive_that_matters/font/small.json index 612ba26a3..30391944b 100644 --- a/src/main/resources/assets/overdrive_that_matters/font/small.json +++ b/src/main/resources/assets/overdrive_that_matters/font/small.json @@ -15,7 +15,7 @@ "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047\u0048\u0049\u004a\u004b\u004c\u004d\u004e\u004f", "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057\u0058\u0059\u005a\u005b\u005c\u005d\u005e\u005f", "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067\u0068\u0069\u006a\u006b\u006c\u006d\u006e\u006f", - "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077\u0078\u0079\u007a\u007b\u007c\u007d\u007e\u0000", + "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077\u0078\u0079\u007a\u007b\u007c\u007d\u007e\u221E", "\u0410\u0411\u0412\u0413\u0414\u0415\u0401\u0416\u0417\u0418\u0419\u041A\u041B\u041C\u041D\u041E", "\u041F\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E", "\u042F\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000", diff --git a/src/main/resources/assets/overdrive_that_matters/textures/font/small.pdn b/src/main/resources/assets/overdrive_that_matters/textures/font/small.pdn index 60ffb2a2efd974b0f45788de50857d04ef1991bf..ea895c7f7b0558f40432742baa3e83d911f44115 100644 GIT binary patch delta 4164 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 IvzW{O0ie`VyZ`_I delta 4145 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 O3IG5}MNUMnLSTaRov}Fp delta 942 zcmV;f15y0g3EByeZ3@8v01m+cxRGn^k#}|p*>(W{=mP)%*^%~Nf2SzEuKN|i>;M1* zWl2OqR9HvVnC)`&ItYZFbN?6pj`)05SZSt>e;m@0@CsO4P~_zL&*X~HW}B{S>4~`B zrlJ2R;jaYO5|0@xfx{Aa@{VoYXlaD&34}RROm33*;ySPP$S$uXYg)P^F}vPV;Jv6~ zco2w<`58%scnyXbf0Ibw){>hi_?=8jm)tY#ChI5lv5K8e(YW(xTT9ZVjx2+(#ytffAgLvDV9S&4gpmjd42eg5PNEkbM@i$@-V~*D*phe*_|T<0>j%OTJRwt#1jmIbo~Kr~MXadKMCG_8@TSr*X0Q_~z|yao zaZR0TT(vnC3`wK*WeAgtl>@aLaDiSFH!&)0rahV+e<)L?E#&Q@$niw;4c=3oU#*yA z$%nreaW$Rc7Sxqd1j_YJBI)ZUh)B2bkp!$0G%^jLNWIxPveyafK})7uK&Mx`Q;u!7 z#v~924{9~D1rrt$Psn(A+ItfENc-0>}$U03mE5yH#geCg)v2+DLF2-3a@ zd@gzqe^imv0Z&89>^~%k2wh|4dvz5pi9N?O>m;*-bmmYm(X>&5ERkJLvVy9{d@{sn z!Z*BLuiCWF#P8#03?jddJR$i-{4wcYo*t6?rvI2cPp|{umLzzaiBlnbQi1FR@{isv zrcAT9Y?RVM=8@?!w5hotaBVTLEC9%UqOsfHf54HKkwm&xyczwI$ldQn8O)_V?uff1>>Z^d>DB1TM~{ Q3;+NC07*qoM6N<$f>f~10RR91 From a00225e8590fce3bd987cceb3e6a6492c954a950 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Tue, 4 Mar 2025 22:19:47 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../textures/font/small.pdn | Bin 11163 -> 11157 bytes .../textures/font/small.png | Bin 1240 -> 1242 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/font/small.pdn b/src/main/resources/assets/overdrive_that_matters/textures/font/small.pdn index ea895c7f7b0558f40432742baa3e83d911f44115..25f26b09c61499577c5dcd08b0e1e6f2189e5210 100644 GIT binary patch delta 3888 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 delta 3860 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 O0000L*95#4RSXA#*qEP@AjD%Z%$SVCV=dW} z*8wGe{A3IVMoRP^;nu*F5c|kUs#NcE^706%K!=uGsFpDz!~x+Lp$){Q{-!^d$jaDp z-{cKWnb5RXxE{y;hN;2wwF*K`%OvlE$%rzcX`@3Lm1fw26pt>DxWyAI6W~GlR8q_}$q#ZY;%N<#{#`~^F z7bHB=>li~h0Ffthm}xBgT&!vCMr7(b1=WfoFA5ZeJS-*2j*L2)Hc>e0m4#rV5=5kb zHlD&wgb93zcYQ;+1W(A6Bf)WDisz}+wn!_gbE0Bw3EWhgj9yVA5IOYK>_wOyXDLfu zoN-N^YrJYR77Pia^3@OzJJHCY)O4U5>P3h!Ds846&910ZrY*_SMUmr)<{R8o9bc^? zTeX^{VOiy9a3(iUXGSSdtRtv+m5m@z(rtWX0!kWEka)-nh@!O<+dAdpBoBnNbKS2k6 zEkW=!6Q@FWrvkYb$Ul0um^6*v(kP{c%p=odXj5}P!nMVaWdels6OFqK9XRq~B#>$q zPe#82+5KJ=(HtT&yJA`JErG3KKc?vKR-emfk>FP%A6q1`R7H|fP9{ Date: Tue, 4 Mar 2025 22:31:24 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9D=D0=95=D0=A2=20=D0=9D=D0=A3=20=D0=95?= =?UTF-8?q?=D0=A1=D0=9B=D0=98=20=D0=A2=D0=95=D0=9F=D0=95=D0=A0=D0=AC=20?= =?UTF-8?q?=D0=A3=20=D0=9D=D0=90=D0=A1=20=D0=95=D0=A1=D0=A2=D0=AC=20=D0=A2?= =?UTF-8?q?=D0=90=D0=9A=D0=9E=D0=99=20=D0=A8=D0=A0=D0=98=D0=A4=D0=A2=20?= =?UTF-8?q?=D0=A2=D0=9E=20=D0=AF=20=D0=91=D0=A3=D0=94=D0=A3=20=D0=95=D0=93?= =?UTF-8?q?=D0=9E=20=D0=90=D0=91=D0=A3=D0=97=D0=98=D0=A2=D0=AC=20=D0=B8=20?= =?UTF-8?q?=D0=B2=D1=8B=20=D0=BC=D0=BD=D0=B5=20=D0=BD=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BD=D0=B5=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=D0=B5=20=D0=BF=D0=BE=D0=BD=D1=8F=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/dbotthepony/mc/otm/datagen/lang/English.kt | 4 ++++ .../ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 4 ++++ .../block/entity/decorative/HoloSignBlockEntity.kt | 6 ++++++ .../ru/dbotthepony/mc/otm/client/MatteryGUI.kt | 9 +++++---- .../client/render/blockentity/HoloSignRenderer.kt | 6 +++++- .../otm/client/screen/decorative/HoloSignScreen.kt | 12 ++++++++++++ .../mc/otm/menu/decorative/HoloSignMenu.kt | 3 +++ 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index d06fb62f0..b7797fb52 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -192,6 +192,10 @@ private fun misc(provider: MatteryLanguageProvider) { gui("holo_screen.resize_text", "Resize text automatically") gui("holo_screen.do_not_resize_text", "Do not resize text") + gui("abc", "ABC") + gui("use_standard_font", "Use standard font") + gui("use_small_font", "Use small font") + gui("ticks", "Ticks") gui("power_cost_per_use", "Power cost per use: %s") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index 77d971421..0efb16145 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -202,6 +202,10 @@ private fun misc(provider: MatteryLanguageProvider) { gui("holo_screen.resize_text", "Изменять размер текста автоматически") gui("holo_screen.do_not_resize_text", "Не менять размер текста") + gui("abc", "АБВ") + gui("use_standard_font", "Использовать стандартный шрифт") + gui("use_small_font", "Использовать уменьшенный шрифт") + gui("ticks", "Тиков") gui("power_cost_per_use", "Энергии на операцию: %s") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt index 02062bea9..748ec5811 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt @@ -61,6 +61,11 @@ class HoloSignBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryB access.accept(value) }).delegate + var smallerFont by syncher.boolean(false, setter = { access, value -> + setChanged() + access.accept(value) + }).delegate + var isLocked = false init { @@ -74,6 +79,7 @@ class HoloSignBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryB savetablesConfig.float(::textAlpha) savetablesConfig.bool(::textAutoScale) + savetablesConfig.bool(::smallerFont) } override fun createMenu(p_39954_: Int, p_39955_: Inventory, p_39956_: Player): AbstractContainerMenu { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt index b7f561691..ddc917ee3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt @@ -113,8 +113,9 @@ object MatteryGUI { event.registerAbove(VanillaGuiLayers.CAMERA_OVERLAYS, loc("android_low_power"), AndroidLowPowerLayer()) } - private val SMALL_FONT = loc("small") - private val SMALL_FONT_STYLE = Style.EMPTY.withFont(SMALL_FONT) + val SMALL_FONT = loc("small") + val SMALL_FONT_STYLE: Style = Style.EMPTY.withFont(SMALL_FONT) + val STANDARD_FONT_STYLE: Style = Style.EMPTY class AndroidEnergyBarLayer : LayeredDraw.Layer { override fun render( @@ -168,7 +169,7 @@ object MatteryGUI { val formattedPower = mattery.androidEnergy.batteryLevel.formatPower() val scale = if (ClientConfig.HUD.USE_SMALL_FONT) 1f else ClientConfig.HUD.BAR_TEXT_SCALE.toFloat() - guiGraphics.draw(formattedPower.withStyle(if (ClientConfig.HUD.USE_SMALL_FONT) SMALL_FONT_STYLE else Style.EMPTY), left + CHARGE_BG.width + 2f + scale, top + CHARGE_BG.height / 2f + scale, font = gui.font, scale = scale, gravity = RenderGravity.CENTER_LEFT, color = RGBAColor.FULL_POWER, drawOutline = true) + guiGraphics.draw(formattedPower.withStyle(if (ClientConfig.HUD.USE_SMALL_FONT) SMALL_FONT_STYLE else STANDARD_FONT_STYLE), left + CHARGE_BG.width + 2f + scale, top + CHARGE_BG.height / 2f + scale, font = gui.font, scale = scale, gravity = RenderGravity.CENTER_LEFT, color = RGBAColor.FULL_POWER, drawOutline = true) RenderSystem.disableBlend() RenderSystem.enableDepthTest() @@ -234,7 +235,7 @@ object MatteryGUI { formattedHealth = TextComponent("%d+%d/%d".format(ply.health.toInt(), ply.absorptionAmount.toInt(), ply.maxHealth.toInt())) val scale = if (ClientConfig.HUD.USE_SMALL_FONT) 1f else ClientConfig.HUD.BAR_TEXT_SCALE.toFloat() - guiGraphics.draw(formattedHealth.withStyle(if (ClientConfig.HUD.USE_SMALL_FONT) SMALL_FONT_STYLE else Style.EMPTY), left - 2f, top + HEALTH_BG.height / 2f + 1f * scale, scale = scale, gravity = RenderGravity.CENTER_RIGHT, color = getHealthColorForPlayer(ply), drawOutline = true) + guiGraphics.draw(formattedHealth.withStyle(if (ClientConfig.HUD.USE_SMALL_FONT) SMALL_FONT_STYLE else STANDARD_FONT_STYLE), left - 2f, top + HEALTH_BG.height / 2f + 1f * scale, scale = scale, gravity = RenderGravity.CENTER_RIGHT, color = getHealthColorForPlayer(ply), drawOutline = true) RenderSystem.disableBlend() RenderSystem.enableDepthTest() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt index 7f343934b..9a242dac8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt @@ -12,6 +12,9 @@ import ru.dbotthepony.mc.otm.client.render.draw import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom import ru.dbotthepony.kommons.math.RGBAColor +import ru.dbotthepony.mc.otm.client.MatteryGUI.SMALL_FONT_STYLE +import ru.dbotthepony.mc.otm.client.MatteryGUI.STANDARD_FONT_STYLE +import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.core.math.rotateWithBlockFacing class HoloSignRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer { @@ -42,8 +45,9 @@ class HoloSignRenderer(private val context: BlockEntityRendererProvider.Context) poseStack.scale(mul, mul, mul) } + val style = if (tile.smallerFont) SMALL_FONT_STYLE else STANDARD_FONT_STYLE for (line in lines) { - font.draw(poseStack = poseStack, buffer = bufferSource, text = line, gravity = RenderGravity.TOP_CENTER, y = y, color = RGBAColor(tile.textRed, tile.textGreen, tile.textBlue, tile.textAlpha)) + font.draw(poseStack = poseStack, buffer = bufferSource, text = TextComponent(line).withStyle(style), gravity = RenderGravity.TOP_CENTER, y = y, color = RGBAColor(tile.textRed, tile.textGreen, tile.textBlue, tile.textAlpha)) y += font.lineHeight + 2f } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt index 95d1b597c..f82987077 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt @@ -11,6 +11,8 @@ import ru.dbotthepony.mc.otm.client.screen.panels.input.NetworkedStringInputPane import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity +import ru.dbotthepony.mc.otm.client.MatteryGUI.SMALL_FONT_STYLE +import ru.dbotthepony.mc.otm.client.render.TextIcon import ru.dbotthepony.mc.otm.client.render.Widgets18 import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel @@ -84,6 +86,16 @@ class HoloSignScreen(menu: HoloSignMenu, inventory: Inventory, title: Component) tooltipInactive = TranslatableComponent("otm.gui.lock_holo_screen.unlocked") )) + controls.addButton(BooleanButtonPanel.square18( + this@HoloSignScreen, + frame, + prop = menu.smallerFont, + iconActive = TextIcon(font = font, text = TranslatableComponent("otm.gui.abc").withStyle(SMALL_FONT_STYLE)), + iconInactive = TextIcon(font = font, text = TranslatableComponent("otm.gui.abc")), + tooltipActive = TranslatableComponent("otm.gui.use_small_font"), + tooltipInactive = TranslatableComponent("otm.gui.use_standard_font") + )) + return frame } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt index d2c598c48..d31698c3b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/HoloSignMenu.kt @@ -24,6 +24,7 @@ class HoloSignMenu( val textBlue = FloatInputWithFeedback(this) val textAlpha = FloatInputWithFeedback(this) val textAutoScale = BooleanInputWithFeedback(this) + val smallerFont = BooleanInputWithFeedback(this) init { text.filter { it.isCreative || !locked.value } @@ -36,6 +37,7 @@ class HoloSignMenu( textAlpha.filter { it.isCreative || !locked.value } textAutoScale.filter { it.isCreative || !locked.value } + smallerFont.filter { it.isCreative || !locked.value } if (tile != null) { text.withConsumer { tile.signText = HoloSignBlockEntity.truncate(it, tile.isLocked) }.withSupplier(tile::signText) @@ -46,6 +48,7 @@ class HoloSignMenu( locked.with(tile::isLocked) redstone.with(tile.redstoneControl::redstoneSetting) textAutoScale.with(tile::textAutoScale) + smallerFont.with(tile::smallerFont) } } } From e8222216e0ae4dd0a8988dd42f5121b492d639e8 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Tue, 4 Mar 2025 22:41:58 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=B8=20=D0=BC=D0=B0=D1=81=D1=88=D1=82?= =?UTF-8?q?=D0=B0=D0=B1=20=D1=82=D0=BE=D0=B6=D0=B5=20=D0=BD=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=81=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=D0=B4=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/otm/client/render/blockentity/HoloSignRenderer.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt index 9a242dac8..999062414 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt @@ -4,6 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.renderer.MultiBufferSource import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider +import net.minecraft.network.chat.MutableComponent import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity import ru.dbotthepony.mc.otm.client.font import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource @@ -34,7 +35,8 @@ class HoloSignRenderer(private val context: BlockEntityRendererProvider.Context) poseStack.translate(0.5f, 0.5f, 0.75f) poseStack.scale(0.01f, 0.01f, 0.01f) - val lines = tile.signText.split('\n') + val style = if (tile.smallerFont) SMALL_FONT_STYLE else STANDARD_FONT_STYLE + val lines: List = tile.signText.split('\n').map { TextComponent(it).withStyle(style) } val totalHeight = lines.size * font.lineHeight + (lines.size - 1) * 2f var y = -totalHeight / 2f @@ -45,9 +47,8 @@ class HoloSignRenderer(private val context: BlockEntityRendererProvider.Context) poseStack.scale(mul, mul, mul) } - val style = if (tile.smallerFont) SMALL_FONT_STYLE else STANDARD_FONT_STYLE for (line in lines) { - font.draw(poseStack = poseStack, buffer = bufferSource, text = TextComponent(line).withStyle(style), gravity = RenderGravity.TOP_CENTER, y = y, color = RGBAColor(tile.textRed, tile.textGreen, tile.textBlue, tile.textAlpha)) + font.draw(poseStack = poseStack, buffer = bufferSource, text = line, gravity = RenderGravity.TOP_CENTER, y = y, color = RGBAColor(tile.textRed, tile.textGreen, tile.textBlue, tile.textAlpha)) y += font.lineHeight + 2f }