From 5a20705f0506627ba1cdd9a701bee69c3b0f716f Mon Sep 17 00:00:00 2001 From: Philip T Date: Fri, 21 Aug 2020 20:15:44 +0200 Subject: [PATCH] Log info about server list warning (#7209) Make it easier to figure out what mods are missing or have to be marked as client/server side only. --- .../minecraftforge/fml/client/ClientHooks.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/client/ClientHooks.java b/src/main/java/net/minecraftforge/fml/client/ClientHooks.java index 79093cc683..c30e47c4ba 100644 --- a/src/main/java/net/minecraftforge/fml/client/ClientHooks.java +++ b/src/main/java/net/minecraftforge/fml/client/ClientHooks.java @@ -92,8 +92,16 @@ public class ClientHooks boolean fmlNetMatches = fmlver == FMLNetworkConstants.FMLNETVERSION; boolean channelsMatch = NetworkRegistry.checkListPingCompatibilityForClient(remoteChannels); AtomicBoolean result = new AtomicBoolean(true); - ModList.get().forEachModContainer((modid, mc)-> mc.getCustomExtension(ExtensionPoint.DISPLAYTEST).ifPresent(ext-> - result.compareAndSet(true, ext.getRight().test(mods.get(modid), true)))); + final List extraClientMods = new ArrayList<>(); + ModList.get().forEachModContainer((modid, mc) -> + mc.getCustomExtension(ExtensionPoint.DISPLAYTEST).ifPresent(ext-> { + boolean foundModOnServer = ext.getRight().test(mods.get(modid), true); + result.compareAndSet(true, foundModOnServer); + if (!foundModOnServer) { + extraClientMods.add(modid); + } + }) + ); boolean modsMatch = result.get(); final Map extraServerMods = mods.entrySet().stream(). @@ -107,9 +115,13 @@ public class ClientHooks if (!extraServerMods.isEmpty()) { extraReason = "fml.menu.multiplayer.extraservermods"; + LOGGER.info(CLIENTHOOKS, ForgeI18n.parseMessage(extraReason) + ": {}", extraServerMods.entrySet().stream() + .map(e -> e.getKey() + "@" + e.getValue()) + .collect(Collectors.joining(", "))); } if (!modsMatch) { extraReason = "fml.menu.multiplayer.modsincompatible"; + LOGGER.info(CLIENTHOOKS, "Client has mods that are missing on server: {}", extraClientMods); } if (!channelsMatch) { extraReason = "fml.menu.multiplayer.networkincompatible";