Skip to content

Add Fabric 1.21.11 support #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IuCC123 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Fabric 1.21.11 support #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
22 changes: 13 additions & 9 deletions src/main/java/com/github/hhhzzzsss/songplayer/item/SongItemConfirmationScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand All @@ -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) {
Expand Down Expand Up @@ -67,21 +66,26 @@ 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;
}
}

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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"depends": {
"fabricloader": ">=0.18.0",
"fabric": "*",
"minecraft": "~1.21.9",
"minecraft": "~1.21.11",
"java": ">=21"
},
"suggests": {
Expand Down