From 6d1dc5a5acba1adc926cde84b393f1c7e6f5c86f Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 9 Nov 2023 18:03:42 +0800
Subject: [PATCH] Fix cherrypick conflicts

---
 .../client/gui/screen/collapsible/CollapsibleEntriesScreen.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java
index 054f7651b..2d3e782b1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java
@@ -180,7 +180,7 @@ public void render(PoseStack poses, int mouseX, int mouseY, float delta) {
         this.font.drawShadow(poses, this.title, this.width / 2.0F - this.font.width(this.title) / 2.0F, 12.0F, -1);
         
         if (ConfigObject.getInstance().doDebugRenderTimeRequired()) {
-            Component debugText = new TextComponent(String.format("%s fps", minecraft.fpsString.split(" ")[0]));
+            Component debugText = Component.literal(String.format("%s fps", minecraft.fpsString.split(" ")[0]));
             int stringWidth = font.width(debugText);
             fillGradient(poses, minecraft.screen.width - stringWidth - 2, 32, minecraft.screen.width, 32 + font.lineHeight + 2, -16777216, -16777216);
             MultiBufferSource.BufferSource immediate = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());