From 23b02cca4c12d6cccc46591b0aabd29a2cf30bdf Mon Sep 17 00:00:00 2001 From: Mathias Boulay Date: Tue, 15 Aug 2023 19:43:14 +0200 Subject: [PATCH] Refactor[modDetail]: Move mc version auto addition to model constructor --- .../pojavlaunch/modloaders/modpacks/api/ModrinthApi.java | 3 --- .../pojavlaunch/modloaders/modpacks/models/ModDetail.java | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java index cff583219..5e88940f0 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java @@ -77,9 +77,6 @@ public class ModrinthApi implements ModpackApi{ names[i] = version.get("name").getAsString(); mcNames[i] = version.get("game_versions").getAsJsonArray().get(0).getAsString(); urls[i] = version.get("files").getAsJsonArray().get(0).getAsJsonObject().get("url").getAsString(); - - if (!names[i].contains(mcNames[i])) - names[i] += " - " + mcNames[i]; } return new ModDetail(item, names, mcNames, urls); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java index da571b591..12f9ec5e1 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java @@ -15,6 +15,12 @@ public class ModDetail extends ModItem { this.versionNames = versionNames; this.mcVersionNames = mcVersionNames; this.versionUrls = versionUrls; + + // Add the mc version to the version model + for (int i=0; i