From cb12df41e13da576b781be695f80728b9594c25f Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Sun, 31 Dec 2023 16:04:22 +0000 Subject: [PATCH] Improve mod description formatting in mods screen (#9840) Co-authored-by: Su5eD --- .../net/minecraftforge/fml/loading/moddiscovery/ModInfo.java | 4 +++- src/main/resources/META-INF/mods.toml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java index 6573e4fd94..5e92c9d7c6 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java @@ -64,7 +64,9 @@ public class ModInfo implements IModInfo, IConfigurable .map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null))) .map(DefaultArtifactVersion::new).orElse(DEFAULT_VERSION); this.displayName = config.getConfigElement("displayName").orElse(this.modId); - this.description = config.getConfigElement("description").orElse("MISSING DESCRIPTION"); + this.description = config.getConfigElement("description") + .orElse("MISSING DESCRIPTION") + .replace("\r\n", "\n").stripIndent(); this.logoFile = Optional.ofNullable(config.getConfigElement("logoFile") .orElseGet(() -> ownFile.flatMap(mf -> mf.getConfigElement("logoFile")).orElse(null))); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b1c6aee014..68256e5ce8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,14 +1,14 @@ modLoader="javafml" loaderVersion="[24,]" -issueTrackerURL="http://www.minecraftforge.net/" +issueTrackerURL="https://minecraftforge.net/" logoFile="forge_logo.png" license="LGPL v2.1" [[mods]] modId="forge" - # We use the global forge version version="${global.forgeVersion}" updateJSONURL="https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json" + displayURL="https://minecraftforge.net/" displayName="Forge" credits="Anyone who has contributed on Github and supports our development" authors="LexManos,cpw"