From 89425258881d6ac6bc6c4e0863e5d9c03fbe3f82 Mon Sep 17 00:00:00 2001
From: LostLuma <lilly@lostluma.net>
Date: Wed, 24 Apr 2024 20:38:05 +0200
Subject: [PATCH] Remove special casing during rendering of Modrinth update
 info

---
 .../gui/widget/DescriptionListWidget.java     | 35 +++++++------------
 .../modmenu/util/mod/ModrinthUpdateInfo.java  | 12 +++++++
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java b/src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java
index c7b8b666..0155f66b 100644
--- a/src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java
+++ b/src/main/java/com/terraformersmc/modmenu/gui/widget/DescriptionListWidget.java
@@ -37,7 +37,6 @@ public class DescriptionListWidget extends EntryListWidget<DescriptionListWidget
 
 	private static final Text HAS_UPDATE_TEXT = Text.translatable("modmenu.hasUpdate");
 	private static final Text EXPERIMENTAL_TEXT = Text.translatable("modmenu.experimental").formatted(Formatting.GOLD);
-	private static final Text MODRINTH_TEXT = Text.translatable("modmenu.modrinth");
 	private static final Text DOWNLOAD_TEXT = Text.translatable("modmenu.downloadLink").formatted(Formatting.BLUE).formatted(Formatting.UNDERLINE);
 	private static final Text CHILD_HAS_UPDATE_TEXT = Text.translatable("modmenu.childHasUpdate");
 	private static final Text LINKS_TEXT = Text.translatable("modmenu.links");
@@ -114,30 +113,20 @@ public void renderList(DrawContext DrawContext, int mouseX, int mouseY, float de
 							children().add(new DescriptionEntry(line, 8));
 						}
 
-						if (updateInfo instanceof ModrinthUpdateInfo modrinthUpdateInfo) {
-							Text updateText = Text.translatable("modmenu.updateText", VersionUtil.stripPrefix(modrinthUpdateInfo.getVersionNumber()), MODRINTH_TEXT)
-								.formatted(Formatting.BLUE)
-								.formatted(Formatting.UNDERLINE);
-
-							for (OrderedText line : textRenderer.wrapLines(updateText, wrapWidth - 16)) {
-								children().add(new LinkEntry(line, modrinthUpdateInfo.getDownloadLink(), 8));
-							}
+						Text updateMessage = updateInfo.getUpdateMessage();
+						String downloadLink = updateInfo.getDownloadLink();
+						if (updateMessage == null) {
+							updateMessage = DOWNLOAD_TEXT;
 						} else {
-							Text updateMessage = updateInfo.getUpdateMessage();
-							String downloadLink = updateInfo.getDownloadLink();
-							if (updateMessage == null) {
-								updateMessage = DOWNLOAD_TEXT;
-							} else {
-								if (downloadLink != null) {
-									updateMessage = updateMessage.copy().formatted(Formatting.BLUE).formatted(Formatting.UNDERLINE);
-								}
+							if (downloadLink != null) {
+								updateMessage = updateMessage.copy().formatted(Formatting.BLUE).formatted(Formatting.UNDERLINE);
 							}
-							for (OrderedText line : textRenderer.wrapLines(updateMessage, wrapWidth - 16)) {
-								if (downloadLink != null) {
-									children().add(new LinkEntry(line, downloadLink, 8));
-								} else {
-									children().add(new DescriptionEntry(line, 8));
-								}
+						}
+						for (OrderedText line : textRenderer.wrapLines(updateMessage, wrapWidth - 16)) {
+							if (downloadLink != null) {
+								children().add(new LinkEntry(line, downloadLink, 8));
+							} else {
+								children().add(new DescriptionEntry(line, 8));
 							}
 						}
 					}
diff --git a/src/main/java/com/terraformersmc/modmenu/util/mod/ModrinthUpdateInfo.java b/src/main/java/com/terraformersmc/modmenu/util/mod/ModrinthUpdateInfo.java
index f982211b..2586da8a 100644
--- a/src/main/java/com/terraformersmc/modmenu/util/mod/ModrinthUpdateInfo.java
+++ b/src/main/java/com/terraformersmc/modmenu/util/mod/ModrinthUpdateInfo.java
@@ -1,7 +1,12 @@
 package com.terraformersmc.modmenu.util.mod;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.terraformersmc.modmenu.api.UpdateChannel;
 import com.terraformersmc.modmenu.api.UpdateInfo;
+import com.terraformersmc.modmenu.util.VersionUtil;
+
+import net.minecraft.text.Text;
 
 public class ModrinthUpdateInfo implements UpdateInfo {
 	protected final String projectId;
@@ -9,6 +14,8 @@ public class ModrinthUpdateInfo implements UpdateInfo {
 	protected final String versionNumber;
 	protected final UpdateChannel updateChannel;
 
+	private static final Text MODRINTH_TEXT = Text.translatable("modmenu.modrinth");
+
 	public ModrinthUpdateInfo(String projectId, String versionId, String versionNumber, UpdateChannel updateChannel) {
 		this.projectId = projectId;
 		this.versionId = versionId;
@@ -21,6 +28,11 @@ public boolean isUpdateAvailable() {
 		return true;
 	}
 
+	@Override
+	public @Nullable Text getUpdateMessage() {
+		return Text.translatable("modmenu.updateText", VersionUtil.stripPrefix(this.versionNumber), MODRINTH_TEXT);
+	}
+
 	@Override
 	public String getDownloadLink() {
 		return "https://modrinth.com/project/%s/version/%s".formatted(projectId, versionId);