Skip to content

Keep server-side mods in client-hosted (LAN) packs #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
McCal-Codes wants to merge 1 commit into from
Closed

Keep server-side mods in client-hosted (LAN) packs #570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion core/src/main/java/pl/skidam/automodpack_core/modpack/ModpackExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.function.Supplier;

import pl.skidam.automodpack_core.config.ServerConfigJsons;
import pl.skidam.automodpack_core.loader.LoaderManagerService;
import pl.skidam.automodpack_core.loader.ModFileCache;
import pl.skidam.automodpack_core.modpack.PackAbsence.Kind;
import pl.skidam.automodpack_core.modpack.candidate.CandidateBuildException;
Expand Down Expand Up @@ -455,9 +456,15 @@ private ModpackCandidate buildCandidate(GenerationStore.Current previous, boolea
// Unadvertised versions leave the manifest fields empty, so clients see a files-only pack instead of a
// pack whose versions they must switch to.
boolean advertiseVersions = serverConfig.advertiseVersionsToSync;
// A client hosting its world to LAN loads every "server-side" mod itself, and Forge's login handshake
// rejects any joiner whose mod list differs ("mismatched mod list"). Those mods must ship to joiners.
boolean clientHost = LOADER_MANAGER != null && LOADER_MANAGER.getEnvironmentType() == LoaderManagerService.EnvironmentType.CLIENT;
boolean excludeServerSideMods = serverConfig.autoExcludeServerSideMods && !clientHost;
if (serverConfig.autoExcludeServerSideMods && clientHost)
LOGGER.info("Client-hosted pack: keeping server-side mods in the pack because LAN joiners must match the host's mod list");
ModpackCandidateScanner.Request request = new ModpackCandidateScanner.Request(modpackId, serverConfig.modpack.name, AM_VERSION,
advertiseVersions ? LOADER : null, advertiseVersions ? LOADER_VERSION : null, advertiseVersions ? MC_VERSION : null, serverRoot, groupRoot,
serverConfig.modpack.categories, serverConfig.autoExcludeServerSideMods, generationRoot.resolve(SERVER_STAGING_DIR.getFileName()),
serverConfig.modpack.categories, excludeServerSideMods, generationRoot.resolve(SERVER_STAGING_DIR.getFileName()),
creationExecutor, generationStore.objectRoot(), fileCache, modFileCache, materializeMissingObjects);
ModpackCandidate candidate = candidateScan.scan(request);
for (ExcludedCandidate exclusion : candidate.exclusions())
Expand Down