From 84da57719dd253f08081389db1bb51d1ab895070 Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Wed, 23 Oct 2024 20:50:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BA=D0=B5=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B3=D0=B0=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=87=D0=BA=D0=B5=20?=
 =?UTF-8?q?(=D0=B8=20=D0=B2=D1=81=D1=80=D0=B0=D1=82=D0=B0=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D1=82=D1=80=D0=B0=20=D0=BD=D0=B0=20=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BA=D1=83=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/decorative/HoloSignBlockEntity.kt  |   7 +++++++
 .../mc/otm/client/render/Widgets18.kt         |   4 ++++
 .../render/blockentity/HoloSignRenderer.kt    |  10 ++++++----
 .../screen/decorative/HoloSignScreen.kt       |  15 +++++++++++----
 .../mc/otm/menu/decorative/HoloSignMenu.kt    |   4 ++++
 .../textures/gui/widgets/side_controls.png    | Bin 2925 -> 2675 bytes
 .../textures/gui/widgets/side_controls.xcf    | Bin 74976 -> 78060 bytes
 7 files changed, 32 insertions(+), 8 deletions(-)

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 34a356892..5ab2a9764 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
@@ -56,6 +56,11 @@ class HoloSignBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryB
 	var textBlue by syncher.float(85f / 255f, setter = ::colorSetter).delegate
 	var textAlpha by syncher.float(1f).delegate
 
+	var textAutoScale by syncher.boolean(true, setter = { access, value ->
+		setChanged()
+		access.accept(value)
+	}).delegate
+
 	var isLocked = false
 
 	init {
@@ -67,6 +72,8 @@ class HoloSignBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryB
 		savetables.float(::textGreen)
 		savetables.float(::textBlue)
 		savetables.float(::textAlpha)
+
+		savetables.bool(::textAutoScale)
 	}
 
 	override fun createMenu(p_39954_: Int, p_39955_: Inventory, p_39956_: Player): AbstractContainerMenu {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
index 4454efe37..d8ef39b0a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
@@ -176,4 +176,8 @@ object Widgets18 {
 	}
 
 	val UPGRADES = controlsGrid.next()
+
+	val COLOR_PALETTE = controlsGrid.next()
+	val TEXT_SCALE_DISABLED = controlsGrid.next()
+	val TEXT_SCALE_ENABLED = controlsGrid.next()
 }
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 ed719fb84..45ca54dd4 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
@@ -35,10 +35,12 @@ class HoloSignRenderer(private val context: BlockEntityRendererProvider.Context)
 		val totalHeight = lines.size * font.lineHeight + (lines.size - 1) * 2f
 		var y = -totalHeight / 2f
 
-		val totalWidth = lines.maxOf { font.width(it) }.toFloat()
-		val highest = totalWidth.coerceAtLeast(totalHeight)
-		val mul = if (highest > 64f) 1f / (highest / 64f) else 64f / highest
-		poseStack.scale(mul, mul, mul)
+		if (tile.textAutoScale) {
+			val totalWidth = lines.maxOf { font.width(it) }.toFloat()
+			val highest = totalWidth.coerceAtLeast(totalHeight)
+			val mul = if (highest > 64f) 1f / (highest / 64f) else 64f / highest
+			poseStack.scale(mul, mul, mul)
+		}
 
 		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))
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 f291876b3..20524cf57 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
@@ -2,8 +2,6 @@ package ru.dbotthepony.mc.otm.client.screen.decorative
 
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
-import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.client.render.ItemStackIcon
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.ColorPickerPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.Dock
@@ -15,8 +13,9 @@ import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls
 import ru.dbotthepony.mc.otm.client.screen.panels.input.NetworkedStringInputPanel
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.kommons.math.RGBAColor
+import ru.dbotthepony.mc.otm.client.render.Widgets18
+import ru.dbotthepony.mc.otm.client.screen.panels.button.LargeBooleanRectangleButtonPanel
 import ru.dbotthepony.mc.otm.menu.decorative.HoloSignMenu
-import ru.dbotthepony.mc.otm.registry.MItems
 
 class HoloSignScreen(menu: HoloSignMenu, inventory: Inventory, title: Component) : MatteryScreen<HoloSignMenu>(menu, title) {
 	override fun makeMainFrame(): FramePanel<MatteryScreen<*>> {
@@ -51,10 +50,18 @@ class HoloSignScreen(menu: HoloSignMenu, inventory: Inventory, title: Component)
 		}) {
 			init {
 				tooltips.add(TranslatableComponent("otm.gui.change_color"))
-				icon = ItemStackIcon(ItemStack(MItems.PAINTER)).fixed()
+				icon = Widgets18.COLOR_PALETTE
 			}
 		})
 
+		controls.addButton(LargeBooleanRectangleButtonPanel(
+			this@HoloSignScreen,
+			frame,
+			prop = menu.textAutoScale,
+			iconActive = Widgets18.TEXT_SCALE_ENABLED,
+			iconInactive = Widgets18.TEXT_SCALE_DISABLED,
+		))
+
 		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 87c55378e..2dd7ffa7c 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 textGreen = FloatInputWithFeedback(this)
 	val textBlue = FloatInputWithFeedback(this)
 	val textAlpha = FloatInputWithFeedback(this)
+	val textAutoScale = BooleanInputWithFeedback(this)
 
 	init {
 		text.filter { it.isCreative || !locked.value }
@@ -35,6 +36,8 @@ class HoloSignMenu(
 		textBlue.filter { it.isCreative || !locked.value }
 		textAlpha.filter { it.isCreative || !locked.value }
 
+		textAutoScale.filter { it.isCreative || !locked.value }
+
 		if (tile != null) {
 			text.withConsumer { if (tile.isLocked) tile.signText = it else tile.signText = HoloSignBlockEntity.truncate(it) }.withSupplier(tile::signText)
 			textRed.withConsumer { tile.textRed = it.coerceIn(0f, 1f) }.withSupplier(tile::textRed)
@@ -43,6 +46,7 @@ class HoloSignMenu(
 			textAlpha.withConsumer { tile.textAlpha = it.coerceIn(0f, 1f) }.withSupplier(tile::textAlpha)
 			locked.with(tile::isLocked)
 			redstone.with(tile.redstoneControl::redstoneSetting)
+			textAutoScale.with(tile::textAutoScale)
 		}
 	}
 }
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/side_controls.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/side_controls.png
index 41171ed83cf8384efae821239c5e56b039904b5e..9806ad55a39af3b1f167772a5192e540ff6ed437 100644
GIT binary patch
delta 2624
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
F<$sWZ;0*u(

delta 2874
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
BXsiGL

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/side_controls.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/side_controls.xcf
index cbd6a7acfa19b0844f877af057c6f252946495eb..928c66053ec01045c3af6587d5a8c8ece6a40f94 100644
GIT binary patch
delta 6053
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

delta 3817
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
PQ^GfE?cH*GPqO{L$<6es