From 21d592ba61f5dbda11b7474e78f56cae9ba1c32e Mon Sep 17 00:00:00 2001 From: bdew Date: Sat, 22 Jul 2023 20:05:05 +0300 Subject: [PATCH] gui fixes --- src/main/scala/net/bdew/lib/gui/BaseScreen.scala | 1 + src/main/scala/net/bdew/lib/gui/DrawTarget.scala | 1 - src/main/scala/net/bdew/lib/gui/ModelDrawHelper.scala | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/bdew/lib/gui/BaseScreen.scala b/src/main/scala/net/bdew/lib/gui/BaseScreen.scala index 99ae179..64f54c6 100644 --- a/src/main/scala/net/bdew/lib/gui/BaseScreen.scala +++ b/src/main/scala/net/bdew/lib/gui/BaseScreen.scala @@ -46,6 +46,7 @@ abstract class BaseScreen[T <: AbstractContainerMenu](container: T, playerInv: I widgets.draw(graphics, mouse, pf) val tip = ArrayBuffer.empty[Component] widgets.handleTooltip(mouse, tip) + Color.white.activate() if (tip.nonEmpty) { import scala.jdk.CollectionConverters._ graphics.renderTooltip(getFontRenderer, tip.asJava, Optional.empty[TooltipComponent], mouseX, mouseY) diff --git a/src/main/scala/net/bdew/lib/gui/DrawTarget.scala b/src/main/scala/net/bdew/lib/gui/DrawTarget.scala index 9a1e475..0b5e74a 100644 --- a/src/main/scala/net/bdew/lib/gui/DrawTarget.scala +++ b/src/main/scala/net/bdew/lib/gui/DrawTarget.scala @@ -61,7 +61,6 @@ trait SimpleDrawTarget extends DrawTarget { } override def drawText(graphics: GuiGraphics, text: Component, p: Point, color: Color, shadow: Boolean): Unit = { - color.activate() graphics.drawString(getFontRenderer, text, p.x.toInt, p.y.toInt, color.asARGB, shadow) } diff --git a/src/main/scala/net/bdew/lib/gui/ModelDrawHelper.scala b/src/main/scala/net/bdew/lib/gui/ModelDrawHelper.scala index d334e04..fdd731d 100644 --- a/src/main/scala/net/bdew/lib/gui/ModelDrawHelper.scala +++ b/src/main/scala/net/bdew/lib/gui/ModelDrawHelper.scala @@ -37,7 +37,7 @@ object ModelDrawHelper { val pose = graphics.pose() // Setup shader stuff - RenderSystem.setShader(() => GameRenderer.getPositionTexShader) // FIXME + RenderSystem.setShader(() => GameRenderer.getPositionColorTexShader) // Make sure that block atlas is selected RenderSystem.setShaderTexture(0, Client.blocksAtlas)