Skip to content
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.

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

Already on GitHub? Sign in to your account

Make mixin entries from the mods.toml optional. #237

Merged
merged 7 commits into from
Jan 18, 2025
Merged
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
import java.lang.reflect.Type;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;

import net.neoforged.fml.loading.LogMarkers;
import net.neoforged.fml.loading.moddiscovery.readers.JarModsDotTomlModFileReader;
import net.neoforged.neoforgespi.language.IConfigurable;
import net.neoforged.neoforgespi.language.IModFileInfo;
import net.neoforged.neoforgespi.locating.IModFile;
import net.neoforged.neoforgespi.locating.InvalidModFileException;
Expand Down Expand Up @@ -85,17 +88,32 @@ protected static List<CoreModFile> getCoreMods(final ModFile modFile) {
.toList();
}

private record PotentialMixin(String name, boolean optional) {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: PotentialMixinConfig since it's a mixin config we're specifying, not an individual mixin

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, let me fix that.


protected static List<String> getMixinConfigs(IModFileInfo modFileInfo) {
try {
var config = modFileInfo.getConfig();
var mixinsEntries = config.getConfigList("mixins");
return mixinsEntries
.stream()
.map(entry -> entry
.<String>getConfigElement("config")
.orElseThrow(
() -> new InvalidModFileException("Missing \"config\" in [[mixins]] entry", modFileInfo)))
.toList();

var potentialMixins = new ArrayList<PotentialMixin>();
for (IConfigurable mixinsEntry : mixinsEntries) {
var name = mixinsEntry.<String>getConfigElement("config")
.orElseThrow(() -> new InvalidModFileException("Missing \"config\" in [[mixins]] entry", modFileInfo));
var optional = mixinsEntry.<Boolean>getConfigElement("optional").orElse(false);
potentialMixins.add(new PotentialMixin(name, optional));
}

var mixinConfigs = new ArrayList<String>();
for (PotentialMixin potentialMixin : potentialMixins) {
var mixinConfig = modFileInfo.getFile().findResource(potentialMixin.name);
if (Files.exists(mixinConfig)) {
mixinConfigs.add(potentialMixin.name());
} else if (!potentialMixin.optional) {
throw new InvalidModFileException("Missing mixin config " + potentialMixin.name, modFileInfo);
}
}

return mixinConfigs;
} catch (Exception exception) {
LOGGER.error("Failed to load mixin configs from mod file", exception);
return List.of();
Expand Down
Loading