diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java index ded93792c4..c19c4a0b2f 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java @@ -170,10 +170,12 @@ public class ModFileInfo implements IModFileInfo, IConfigurable return Strings.isNullOrEmpty(license); } + /* This data can only be trusted for the manifest and signature file itself. We do not validate each entry in the jar. Coremods exists, it would be useless */ public Optional getCodeSigners() { return this.signers; } + /* This data can only be trusted for the manifest and signature file itself. We do not validate each entry in the jar. Coremods exists, it would be useless */ public Optional getCodeSigningFingerprint() { return Java9BackportUtils.toStream(this.signers) .flatMap(csa->csa[0].getSignerCertPath().getCertificates().stream()) @@ -184,6 +186,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable .map(str-> String.join(":", str.split("(?<=\\G.{2})"))); } + /* This data can only be trusted for the manifest and signature file itself. We do not validate each entry in the jar. Coremods exists, it would be useless */ public Optional getTrustData() { return Java9BackportUtils.toStream(this.signers) .flatMap(csa->csa[0].getSignerCertPath().getCertificates().stream()) diff --git a/src/main/java/net/minecraftforge/fml/ModList.java b/src/main/java/net/minecraftforge/fml/ModList.java index 0f71ca0b13..889bc557d3 100644 --- a/src/main/java/net/minecraftforge/fml/ModList.java +++ b/src/main/java/net/minecraftforge/fml/ModList.java @@ -82,7 +82,7 @@ public class ModList } private String fileToLine(ModFile mf) { - return String.format("%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|%s", mf.getFileName(), + return String.format("%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(), mf.getModInfos().get(0).getDisplayName(), mf.getModInfos().get(0).getModId(), mf.getModInfos().get(0).getVersion(), diff --git a/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java b/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java index eac96a17f7..f8023c72d4 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java @@ -462,6 +462,8 @@ public class ModListScreen extends Screen lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.license", selectedMod.getOwningFile().getLicense())); lines.add(null); lines.add(selectedMod.getDescription()); + + /* Removed because people bitched that this information was misleading. lines.add(null); if (FMLEnvironment.secureJarsEnabled) { lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.signature", selectedMod.getOwningFile().getCodeSigningFingerprint().orElse(ForgeI18n.parseMessage("fml.menu.mods.info.signature.unsigned")))); @@ -469,6 +471,7 @@ public class ModListScreen extends Screen } else { lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.securejardisabled")); } + */ if ((vercheck.status == VersionChecker.Status.OUTDATED || vercheck.status == VersionChecker.Status.BETA_OUTDATED) && vercheck.changes.size() > 0) {