From d5860d7cfa8c6a653fbb68a63d0fb5c89fa4e256 Mon Sep 17 00:00:00 2001 From: cpw Date: Mon, 20 Jun 2022 16:24:40 -0400 Subject: [PATCH] Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer Signed-off-by: cpw --- .../fml/loading/moddiscovery/AbstractModProvider.java | 6 ++---- .../fml/loading/moddiscovery/ModDiscoverer.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java index abec568c978..d88cf407ac3 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java @@ -53,10 +53,8 @@ protected IModLocator.ModFileOrException createMod(Path... path) { } else if (type != null) { LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MANIFEST, type, path); mod = new ModFile(sj, this, this::manifestParser, type); - } else { - return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found "+ Arrays.toString(path))); - } catch (InvalidModFileException e) { - return new IModLocator.ModFileOrException(null, e); + } else { + return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found "+ Arrays.toString(path))); } mjm.setModFile(mod); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java index 4b9b8816d13..7e0b36abec7 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java @@ -78,12 +78,12 @@ public ModValidator discoverMods() { LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} invalid mod files", locator, exceptions.size()); brokenFiles.addAll(exceptions.stream().map(e->e instanceof InvalidModFileException ime ? ime.getBrokenFile() : null).filter(Objects::nonNull).toList()); } - var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).toList(); + var locatedFiles = candidates.stream().map(IModLocator.ModFileOrException::file).filter(Objects::nonNull).collect(Collectors.toList()); var badModFiles = locatedFiles.stream().filter(file -> !(file instanceof ModFile)).toList(); if (!badModFiles.isEmpty()) { LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size()); - brokenFiles.addAll(badModFiles.stream().map(mf->mf.getModFileInfo()).toList()); + brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList()); } locatedFiles.removeAll(badModFiles); LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());