From 3945675c04c4ebb2e924a3148febd695410e5466 Mon Sep 17 00:00:00 2001
From: IuCC123 <jamierp2007@proton.me>
Date: Thu, 12 Mar 2026 22:40:07 +0100
Subject: [PATCH] Add Fabric 1.21.11 support

---
 gradle.properties                             |  6 ++---
 .../item/SongItemConfirmationScreen.java      | 22 +++++++++++--------
 src/main/resources/fabric.mod.json            |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5848cc3..8d3bb89 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,8 +6,8 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=false
 
 # Fabric Properties
-	minecraft_version=1.21.9
-	yarn_mappings=1.21.9+build.1
+	minecraft_version=1.21.11
+	yarn_mappings=1.21.11+build.3
 	loader_version=0.18.4
 	loom_version=1.14-SNAPSHOT
 
@@ -17,4 +17,4 @@ org.gradle.configuration-cache=false
 	archives_base_name = song-player
 
 # Dependencies
-	fabric_version=0.134.1+1.21.9
+	fabric_version=0.139.5+1.21.11
diff --git a/src/main/java/com/github/hhhzzzsss/songplayer/item/SongItemConfirmationScreen.java b/src/main/java/com/github/hhhzzzsss/songplayer/item/SongItemConfirmationScreen.java
index 2d336bf..676784f 100644
--- a/src/main/java/com/github/hhhzzzsss/songplayer/item/SongItemConfirmationScreen.java
+++ b/src/main/java/com/github/hhhzzzsss/songplayer/item/SongItemConfirmationScreen.java
@@ -2,7 +2,6 @@
 
 import com.github.hhhzzzsss.songplayer.Util;
 import com.github.hhhzzzsss.songplayer.playing.SongHandler;
-import net.minecraft.client.font.MultilineText;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -15,8 +14,8 @@
 public class SongItemConfirmationScreen extends Screen {
     private ItemStack stack;
     private SongItemLoaderThread loaderThread;
-    private MultilineText unloadedText;
-    private MultilineText loadedText;
+    private Text[] unloadedText;
+    private Text[] loadedText;
     private boolean loaded = false;
 
     private static final Text CONFIRM = Text.literal("Play");
@@ -33,7 +32,7 @@ public SongItemConfirmationScreen(ItemStack stack) throws IOException, IllegalAr
     protected void init() {
         super.init();
         String unloadedMessage = "§7Loading song...";
-        this.unloadedText = MultilineText.create(this.textRenderer, Text.literal(unloadedMessage));
+        this.unloadedText = new Text[] {Text.literal(unloadedMessage)};
     }
 
     private void addButtons(int y) {
@@ -67,10 +66,9 @@ else if (loadedText == null) {
                         String.format("§7Max notes per second: %s%d", getNumberColor(loaderThread.maxNotesPerSecond), loaderThread.maxNotesPerSecond),
                         String.format("§7Avg notes per second: %s%.2f", getNumberColor(loaderThread.avgNotesPerSecond), loaderThread.avgNotesPerSecond),
                 };
-                Text[] messageList = Arrays.stream(loadedMessages).map(Text::literal).toArray(Text[]::new);
-                this.loadedText = MultilineText.create(this.textRenderer, messageList);
+                this.loadedText = Arrays.stream(loadedMessages).map(Text::literal).toArray(Text[]::new);
 
-                int loadedTextHeight = this.loadedText.getLineCount() * this.textRenderer.fontHeight;
+                int loadedTextHeight = this.loadedText.length * this.textRenderer.fontHeight;
                 addButtons(60 + loadedTextHeight + 12);
 
                 loaded = true;
@@ -78,10 +76,16 @@ else if (loadedText == null) {
         }
 
         if (loaded) {
-            loadedText.draw(context, MultilineText.Alignment.CENTER, this.width / 2, 60, 9, true, -1);
+            drawCenteredLines(context, loadedText, 60, 9, 0xFFFFFF);
         }
         else {
-            unloadedText.draw(context, MultilineText.Alignment.CENTER, this.width / 2, 60, 9, true, -1);
+            drawCenteredLines(context, unloadedText, 60, 9, 0xFFFFFF);
+        }
+    }
+
+    private void drawCenteredLines(DrawContext context, Text[] lines, int startY, int lineHeight, int color) {
+        for (int i = 0; i < lines.length; i++) {
+            context.drawCenteredTextWithShadow(textRenderer, lines[i], this.width / 2, startY + i * lineHeight, color);
         }
     }
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index f57d270..d8996aa 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -28,7 +28,7 @@
   "depends": {
     "fabricloader": ">=0.18.0",
     "fabric": "*",
-    "minecraft": "~1.21.9",
+    "minecraft": "~1.21.11",
     "java": ">=21"
   },
   "suggests": {