Skip to content

Commit

Permalink
try to correct modpack deps - part 2
Browse files Browse the repository at this point in the history 
#255
  • Loading branch information
@Skidamek
Skidamek committed Nov 16, 2024
1 parent b06b218 commit 7e40b5e
Showing 1 changed file with 31 additions and 20 deletions.
51 changes: 31 additions & 20 deletions loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import static pl.skidam.automodpack_core.GlobalVariables.*;

public class ModpackUtils {

public static List<String> possibleLoaderIDs = List.of("fabricloader", "neoforge", "forge", "quiltloader"); // tier list lmao

public static boolean isUpdate(Jsons.ModpackContentFields serverModpackContent, Path modpackDir) {
if (serverModpackContent == null || serverModpackContent.list == null) {
throw new IllegalArgumentException("Server modpack content list is null");
Expand Down Expand Up @@ -139,25 +142,28 @@ public static boolean correctFilesLocations(Path modpackDir, Jsons.ModpackConten
// if so then force move that modpack mod to the default mods folder and delete the old one from the default mods folder.
public static boolean correctModpackDepsOnDefaultDir(Path modpackDir) throws IOException {
AtomicBoolean needsRestart = new AtomicBoolean(false);
List<LoaderService.Mod> standardModList = Files.list(MODS_DIR)
.map(LOADER_MANAGER::getMod)
.filter(Objects::nonNull)
.toList();
List<LoaderService.Mod> modpackModList = Files.list(modpackDir.resolve("mods"))
.map(LOADER_MANAGER::getMod)
.filter(Objects::nonNull)
.toList();
final List<Path> standardMods = Files.list(MODS_DIR).toList();
final List<Path> modpackMods = Files.list(modpackDir.resolve("mods")).toList();
final Collection<LoaderService.Mod> standardModList = standardMods.stream().map(modPath -> LOADER_MANAGER.getMod(modPath)).filter(Objects::nonNull).toList();
final Collection<LoaderService.Mod> modpackModList = modpackMods.stream().map(modPath -> LOADER_MANAGER.getMod(modPath)).filter(Objects::nonNull).toList();
final Collection<LoaderService.Mod> loaderMods = possibleLoaderIDs.stream().map(LOADER_MANAGER::getMod).filter(Objects::nonNull).toList();

// standardModList + loaderMods
List<LoaderService.Mod> nonModpackModList = new ArrayList<>(standardModList);
nonModpackModList.addAll(loaderMods);

for (LoaderService.Mod modpackMod : modpackModList) {
for (String depId : modpackMod.dependencies()) {
standardModList.stream()
.filter(standardMod -> standardMod.modID().equals(depId) || standardMod.providesIDs().contains(depId))
.filter(standardMod -> standardMod.modVersion().compareTo(modpackMod.modVersion()) < 0)
.forEach(standardMod -> {
LOGGER.info("Moving {} mod to the default mods folder because it is dependent on {} mod and the version is lower", modpackMod.modID(), standardMod.modID());
nonModpackModList.stream()
.filter(nonModpackMod -> nonModpackMod.modID().equals(depId) || nonModpackMod.providesIDs().contains(depId))
.filter(nonModpackMod -> nonModpackMod.modVersion().compareTo(modpackMod.modVersion()) < 0)
.forEach(nonModpackMod -> {
LOGGER.info("Moving {} mod to the default mods folder because it is dependent on {} mod and the version is lower", modpackMod.modID(), nonModpackMod.modID());
try {
CustomFileUtils.copyFile(modpackMod.modPath(), MODS_DIR.resolve(modpackMod.modPath().getFileName()));
CustomFileUtils.forceDelete(standardMod.modPath());
if (!possibleLoaderIDs.contains(nonModpackMod.modID())) {
CustomFileUtils.forceDelete(nonModpackMod.modPath());
}
needsRestart.set(true);
} catch (IOException e) {
e.printStackTrace();
Expand Down Expand Up @@ -198,18 +204,23 @@ public static Map<LoaderService.Mod, LoaderService.Mod> getDupeMods(Path modpack
// If the client mod is a duplicate of what modpack contains then it removes it from client so that you dont need to restart game just when you launched it and modpack get updated - basically having these mods separately allows for seamless updates
// If you have client mods which require specific mod which is also a duplicate of what modpack contains it should stay
public static boolean removeDupeMods(Map<LoaderService.Mod, LoaderService.Mod> dupeMods) throws IOException {
List<Path> standardMods = Files.list(MODS_DIR).toList();
Collection<LoaderService.Mod> standardModList = standardMods.stream().map(modPath -> LOADER_MANAGER.getMod(modPath)).filter(Objects::nonNull).toList();
final List<Path> standardMods = Files.list(MODS_DIR).toList();
final Collection<LoaderService.Mod> standardModList = standardMods.stream().map(modPath -> LOADER_MANAGER.getMod(modPath)).filter(Objects::nonNull).toList();
final Collection<LoaderService.Mod> loaderMods = possibleLoaderIDs.stream().map(LOADER_MANAGER::getMod).filter(Objects::nonNull).toList();

// standardModList + loaderMods
List<LoaderService.Mod> nonModpackModList = new ArrayList<>(standardModList);
nonModpackModList.addAll(loaderMods);

if (standardModList.isEmpty()) return false;

Set<LoaderService.Mod> modsToKeep = new HashSet<>();

// Fill out the sets with mods that are not duplicates and their dependencies
for (LoaderService.Mod standardMod : standardModList) {
if (!dupeMods.containsValue(standardMod)) {
modsToKeep.add(standardMod);
addDependenciesRecursively(standardMod, standardModList, modsToKeep);
for (LoaderService.Mod nonModpackMod : nonModpackModList) {
if (!dupeMods.containsValue(nonModpackMod)) {
modsToKeep.add(nonModpackMod);
addDependenciesRecursively(nonModpackMod, nonModpackModList, modsToKeep);
}
}

Expand Down

0 comments on commit 7e40b5e

Please sign in to comment.