Fix version prefixes not being stripped in the update checker message (…

…#624) - Strip version prefixes in update checker message
TerraformersMC · Jul 17, 2023 · 31f645e · 31f645e
1 parent 06c7bf9
commit 31f645e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 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
@@ -5,6 +5,7 @@
 import com.terraformersmc.modmenu.config.ModMenuConfig;
 import com.terraformersmc.modmenu.gui.ModsScreen;
 import com.terraformersmc.modmenu.gui.widget.entries.ModListEntry;
+import com.terraformersmc.modmenu.util.VersionUtil;
 import com.terraformersmc.modmenu.util.mod.Mod;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
@@ -110,7 +111,7 @@ public void render(DrawContext DrawContext, int mouseX, int mouseY, float delta)
 							children().add(new DescriptionEntry(line, 8));
 						}
 
-						Text updateText = Text.translatable("modmenu.updateText", mod.getModrinthData().versionNumber(), MODRINTH_TEXT)
+						Text updateText = Text.translatable("modmenu.updateText", VersionUtil.stripPrefix(mod.getModrinthData().versionNumber()), MODRINTH_TEXT)
 							.formatted(Formatting.BLUE)
 							.formatted(Formatting.UNDERLINE);
 

diff --git a/src/main/java/com/terraformersmc/modmenu/util/VersionUtil.java b/src/main/java/com/terraformersmc/modmenu/util/VersionUtil.java
@@ -0,0 +1,27 @@
+package com.terraformersmc.modmenu.util;
+
+import java.util.List;
+
+public final class VersionUtil {
+	private static final List<String> PREFIXES = List.of("version", "ver", "v");
+
+	private VersionUtil() {
+		return;
+	}
+
+	public static String stripPrefix(String version) {
+		version = version.trim();
+
+		for (String prefix : PREFIXES) {
+			if (version.startsWith(prefix)) {
+				return version.substring(prefix.length());
+			}
+		}
+
+		return version;
+	}
+
+	public static String getPrefixedVersion(String version) {
+		return "v" + stripPrefix(version);
+	}
+}
diff --git a/src/main/java/com/terraformersmc/modmenu/util/mod/fabric/FabricMod.java b/src/main/java/com/terraformersmc/modmenu/util/mod/fabric/FabricMod.java
@@ -7,6 +7,7 @@
 import com.terraformersmc.modmenu.ModMenu;
 import com.terraformersmc.modmenu.config.ModMenuConfig;
 import com.terraformersmc.modmenu.util.OptionalUtil;
+import com.terraformersmc.modmenu.util.VersionUtil;
 import com.terraformersmc.modmenu.util.mod.Mod;
 import com.terraformersmc.modmenu.util.mod.ModrinthData;
 import net.fabricmc.loader.api.FabricLoader;
@@ -191,15 +192,7 @@ public FabricMod(ModContainer modContainer, Set<String> modpackMods) {
 	}
 
 	public @NotNull String getPrefixedVersion() {
-		String version = getVersion().trim();
-		if (version.startsWith("version")) {
-			version = "v" + version.substring("version".length());
-		} else if (version.startsWith("ver")) {
-			version = "v" + version.substring("ver".length());
-		} else if (!version.startsWith("v")) {
-			version = "v" + version;
-		}
-		return version.trim();
+		return VersionUtil.getPrefixedVersion(getVersion());
 	}
 
 	@Override