From 4fa9b95a280515b1fa71425e8e1c61d5b4a009f6 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 8 Dec 2023 11:36:38 -0400 Subject: Fix duplicate water hydra catch title, add shadows to titles (#749) Better looking titles, added test command /shsendtitle and fixed Water Hydra warning showing up multiple times. #749 --- .../at/hannibal2/skyhanni/data/TitleManager.kt | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt index 4fa661562..383600ff9 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.PreProfileSwitchEvent +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.SimpleTimeMark import io.github.moulberry.moulconfig.internal.TextRenderUtils import net.minecraft.client.Minecraft @@ -9,6 +10,7 @@ import net.minecraft.client.gui.ScaledResolution import net.minecraft.client.renderer.GlStateManager import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration +import kotlin.time.Duration.Companion.seconds class TitleManager { @@ -16,11 +18,27 @@ class TitleManager { private var display = "" private var endTime = SimpleTimeMark.farPast() private var heightModifier = 1.8 + private var fontSizeModifier = 4.0 - fun sendTitle(text: String, duration: Duration, height: Double = 1.8) { + fun sendTitle(text: String, duration: Duration, height: Double = 1.8, fontSize: Double = 4.0) { display = "§f$text" endTime = SimpleTimeMark.now() + duration heightModifier = height + fontSizeModifier = fontSize + } + + fun command(args: Array) { + if (args.size < 4) { + LorenzUtils.userError("Specify title text to test") + return + } + + val duration = args[0].toInt().seconds + val height = args[1].toDouble() + val fontSize = args[2].toDouble() + val title = "§6" + args.drop(3).joinToString(" ") + + sendTitle(title, duration, height, fontSize) } } @@ -43,8 +61,8 @@ class TitleManager { GlStateManager.pushMatrix() GlStateManager.translate((width / 2).toFloat(), (height / heightModifier).toFloat(), 0.0f) - GlStateManager.scale(4.0f, 4.0f, 4.0f) - TextRenderUtils.drawStringCenteredScaledMaxWidth(display, renderer, 0f, 0f, false, 75, 0) + GlStateManager.scale(fontSizeModifier, fontSizeModifier, fontSizeModifier) + TextRenderUtils.drawStringCenteredScaledMaxWidth(display, renderer, 0f, 0f, true, 75, 0) GlStateManager.popMatrix() } -} \ No newline at end of file +} -- cgit