From 76e3afd528d2ea35afcc3222d304916fb48ed904 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Thu, 2 Nov 2023 20:18:57 +0000 Subject: [PATCH] Improve mod description formatting in mods screen (#9770) Co-authored-by: Su5eD --- .../minecraftforge/fml/loading/moddiscovery/ModInfo.java | 6 ++++-- src/main/resources/META-INF/mods.toml | 5 ++--- 2 files changed, 6 insertions(+), 5 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 3542685ccf..285918eabc 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 @@ -69,7 +69,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))); @@ -196,7 +198,7 @@ public class ModInfo implements IModInfo, IConfigurable private final boolean mandatory; private final Ordering ordering; private final DependencySide side; - private Optional referralUrl; + private final Optional referralUrl; public ModVersion(final IModInfo owner, final IConfigurable config) { this.owner = owner; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b1c6aee014..0b0fa9927b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,18 +1,17 @@ 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" description=''' Forge, a broad compatibility API. ''' - \ No newline at end of file