gui fixes

bdew-minecraft · Jul 22, 2023 · 21d592b · 21d592b
1 parent ee11718
commit 21d592b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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)