Merge branch 'refs/heads/modern-rendering-part-3' into modern-rendering-part-4

Author: CalMWolfs

src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt

@@ -56,7 +56,7 @@ class GuiPositionEditor(
 
     override fun onDrawScreen(context: DrawContext, originalMouseX: Int, originalMouseY: Int, partialTicks: Float) {
         // Items aren't drawn due to a bug in neu rendering
-        drawDefaultBackground()
+        drawDefaultBackground(context, originalMouseX, originalMouseY, partialTicks)
         if (oldScreen != null) {
             val accessor = oldScreen as AccessorGuiContainer
             accessor.invokeDrawGuiContainerBackgroundLayer_skyhanni(partialTicks, -1, -1)

src/main/java/at/hannibal2/skyhanni/features/chat/ChatHistoryGui.kt

@@ -35,7 +35,7 @@ class ChatHistoryGui(private val history: List<ChatManager.MessageFilteringResul
         history.sumOf { splitLine(it.message).size * 10 + (it.modified?.let { mod -> splitLine(mod).size * 10 } ?: 0) }
 
     override fun onDrawScreen(context: DrawContext, originalMouseX: Int, originalMouseY: Int, partialTicks: Float) {
-        drawDefaultBackground()
+        drawDefaultBackground(context, originalMouseX, originalMouseY, partialTicks)
         var queuedTooltip: List<String>? = null
         context.matrices.pushMatrix()
         val l = (width / 2.0 - w / 2.0).toInt()

src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt

@@ -116,7 +116,8 @@ object TabListRenderer {
         var headerY = y
         if (header.isNotEmpty()) {
             for (line in header) {
-                minecraft.fontRendererObj.drawStringWithShadow(
+                GuiRenderUtils.drawString(
+                    context,
                     line,
                     x + totalWidth / 2f - minecraft.fontRendererObj.getStringWidth(line) / 2f,
                     headerY.toFloat(),
@@ -131,7 +132,8 @@ object TabListRenderer {
         if (footer.isNotEmpty()) {
             var footerY = y + totalHeight - footer.size * LINE_HEIGHT + TAB_PADDING / 2 + 1
             for (line in footer) {
-                minecraft.fontRendererObj.drawStringWithShadow(
+                GuiRenderUtils.drawString(
+                    context,
                     line,
                     x + totalWidth / 2f - minecraft.fontRendererObj.getStringWidth(line) / 2f,
                     footerY.toFloat(),
@@ -192,14 +194,16 @@ object TabListRenderer {
                 var text = if (AdvancedPlayerList.ignoreCustomTabList()) tabLine.text else tabLine.customName
                 if (text.contains("§l")) text = "§r$text"
                 if (tabLine.type == TabStringType.TITLE) {
-                    minecraft.fontRendererObj.drawStringWithShadow(
+                    GuiRenderUtils.drawString(
+                        context,
                         text,
                         middleX + column.getMaxWidth() / 2f - tabLine.getWidth() / 2f,
                         middleY.toFloat(),
                         0xFFFFFF,
                     )
                 } else {
-                    minecraft.fontRendererObj.drawStringWithShadow(
+                    GuiRenderUtils.drawString(
+                        context,
                         text,
                         middleX.toFloat(),
                         middleY.toFloat(),

src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt

@@ -44,7 +44,7 @@ class DefaultConfigOptionGui(
 
     @Suppress("CyclomaticComplexMethod", "LongMethod")
     override fun onDrawScreen(context: DrawContext, originalMouseX: Int, originalMouseY: Int, partialTicks: Float) {
-        drawDefaultBackground()
+        drawDefaultBackground(context, originalMouseX, originalMouseY, partialTicks)
         RenderUtils.drawFloatingRectDark((width - xSize) / 2, (height - ySize) / 2, xSize, ySize)
         val scaledResolution = ScaledResolution(mc)
         var hoveringTextToDraw: List<String>? = null

src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt

@@ -99,7 +99,7 @@ open class VisualWordGui : SkyhanniBaseScreen() {
     }
 
     override fun onDrawScreen(context: DrawContext, originalMouseX: Int, originalMouseY: Int, partialTicks: Float) {
-        drawDefaultBackground()
+        drawDefaultBackground(context, originalMouseX, originalMouseY, partialTicks)
         screenHeight = height
         guiLeft = (width - sizeX) / 2
         guiTop = (height - sizeY) / 2

src/main/java/at/hannibal2/skyhanni/utils/guide/GuideGUI.kt

@@ -75,7 +75,7 @@ abstract class GuideGUI<pageEnum : Enum<*>>(defaultScreen: pageEnum) : SkyhanniB
     }
 
     override fun onDrawScreen(context: DrawContext, originalMouseX: Int, originalMouseY: Int, partialTicks: Float) = try {
-        drawDefaultBackground()
+        drawDefaultBackground(context, originalMouseX, originalMouseY, partialTicks)
         val guiLeft = (width - sizeX) / 2
         val guiTop = (height - sizeY) / 2
 

versions/mapping-1.21.4-1.16.5-fabric.txt

@@ -18,5 +18,7 @@ net.minecraft.client.gui.DrawContext at.hannibal2.skyhanni.utils.compat.DrawCont
 
 net.minecraft.client.util.math.MatrixStack at.hannibal2.skyhanni.utils.compat.MatrixStack
 
+net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext at.hannibal2.skyhanni.utils.compat.WorldRenderContext
+
 net.minecraft.client.util.math.MatrixStack push() pushMatrix()
 net.minecraft.client.util.math.MatrixStack pop() popMatrix()