keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Log info about server list warning (#7209)

Browse source 
Make it easier to figure out what mods are missing or have to be marked as client/server side only.
This commit is contained in:
Philip T 2020-08-21 20:15:44 +02:00 committed by GitHub
parent aaa1deeef2
commit 5a20705f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/minecraftforge/fml/client/ClientHooks.java
View file

@ -92,8 +92,16 @@ public class ClientHooks
boolean fmlNetMatches = fmlver == FMLNetworkConstants.FMLNETVERSION; boolean fmlNetMatches = fmlver == FMLNetworkConstants.FMLNETVERSION;
boolean channelsMatch = NetworkRegistry.checkListPingCompatibilityForClient(remoteChannels); boolean channelsMatch = NetworkRegistry.checkListPingCompatibilityForClient(remoteChannels);
AtomicBoolean result = new AtomicBoolean(true); AtomicBoolean result = new AtomicBoolean(true);
ModList.get().forEachModContainer((modid, mc)-> mc.getCustomExtension(ExtensionPoint.DISPLAYTEST).ifPresent(ext-> final List<String> extraClientMods = new ArrayList<>();
result.compareAndSet(true, ext.getRight().test(mods.get(modid), true)))); 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(); boolean modsMatch = result.get();
final Map<String, String> extraServerMods = mods.entrySet().stream(). final Map<String, String> extraServerMods = mods.entrySet().stream().
@ -107,9 +115,13 @@ public class ClientHooks
if (!extraServerMods.isEmpty()) { if (!extraServerMods.isEmpty()) {
extraReason = "fml.menu.multiplayer.extraservermods"; 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) { if (!modsMatch) {
extraReason = "fml.menu.multiplayer.modsincompatible"; extraReason = "fml.menu.multiplayer.modsincompatible";
LOGGER.info(CLIENTHOOKS, "Client has mods that are missing on server: {}", extraClientMods);
} }
if (!channelsMatch) { if (!channelsMatch) {
extraReason = "fml.menu.multiplayer.networkincompatible"; extraReason = "fml.menu.multiplayer.networkincompatible";