From 529639fdd0683066eadffe93473a300a2177c008 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 13 Jun 2024 22:21:50 +0200
Subject: Backend: for each (#1725)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/utils/renderables/Renderable.kt       | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils/renderables')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 870a3a2f2..6079f79d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -501,8 +501,8 @@ interface Renderable {
             val emptySpaceY = if (useEmptySpace) 0 else yPadding
 
             override fun render(posX: Int, posY: Int) {
-                content.forEachIndexed { rowIndex, row ->
-                    row.forEachIndexed { index, renderable ->
+                for ((rowIndex, row) in content.withIndex()) {
+                    for ((index, renderable) in row.withIndex()) {
                         GlStateManager.pushMatrix()
                         GlStateManager.translate(xOffsets[index].toFloat(), yOffsets[rowIndex].toFloat(), 0F)
                         renderable?.renderXYAligned(
@@ -747,20 +747,20 @@ interface Renderable {
                 var renderY = 0
                 var virtualY = 0
                 var found = false
-                list.forEach {
-                    if ((virtualY..virtualY + it.height) in scroll.asInt()..end) {
-                        it.renderXAligned(posX, posY + renderY, width)
-                        GlStateManager.translate(0f, it.height.toFloat(), 0f)
-                        renderY += it.height
+                for (renderable in list) {
+                    if ((virtualY..virtualY + renderable.height) in scroll.asInt()..end) {
+                        renderable.renderXAligned(posX, posY + renderY, width)
+                        GlStateManager.translate(0f, renderable.height.toFloat(), 0f)
+                        renderY += renderable.height
                         found = true
                     } else if (found) {
                         found = false
-                        if (renderY + it.height <= height) {
-                            it.renderXAligned(posX, posY + renderY, width)
+                        if (renderY + renderable.height <= height) {
+                            renderable.renderXAligned(posX, posY + renderY, width)
                         }
-                        return@forEach
+                        continue
                     }
-                    virtualY += it.height
+                    virtualY += renderable.height
                 }
                 GlStateManager.translate(0f, -renderY.toFloat(), 0f)
             }
@@ -807,7 +807,7 @@ interface Renderable {
 
                 var renderY = 0
                 if (hasHeader) {
-                    content[0].forEachIndexed { index, renderable ->
+                    for ((index, renderable) in content[0].withIndex()) {
                         GlStateManager.translate(xOffsets[index].toFloat(), 0f, 0f)
                         renderable?.renderXYAligned(
                             posX + xOffsets[index],
@@ -834,7 +834,7 @@ interface Renderable {
                     }
 
                 for (rowIndex in range2) {
-                    content[rowIndex].forEachIndexed { index, renderable ->
+                    for ((index, renderable) in content[rowIndex].withIndex()) {
                         GlStateManager.translate(xOffsets[index].toFloat(), 0f, 0f)
                         renderable?.renderXYAligned(
                             posX + xOffsets[index],
-- 
cgit