From 14d3c189450eaafa0af3ba54c7c25692b5058715 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 19 Aug 2021 20:30:43 +0200 Subject: [PATCH] Small Mod Sync fixes --- src/main/java/ru/bclib/util/ModUtil.java | 2 +- src/main/java/ru/bclib/util/PathUtil.java | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/ru/bclib/util/ModUtil.java b/src/main/java/ru/bclib/util/ModUtil.java index 6529cef4..5d7420e8 100644 --- a/src/main/java/ru/bclib/util/ModUtil.java +++ b/src/main/java/ru/bclib/util/ModUtil.java @@ -85,7 +85,7 @@ public class ModUtil { public static ModInfo getModInfo(String modID, boolean matchVersion) { getMods(); final ModInfo mi = mods.get(modID); - if (mi == null || !getModVersion(modID).equals(mi.getVersion())) return null; + if (mi == null || (matchVersion && !getModVersion(modID).equals(mi.getVersion()))) return null; return mi; } diff --git a/src/main/java/ru/bclib/util/PathUtil.java b/src/main/java/ru/bclib/util/PathUtil.java index ce3a7628..f3ba08dc 100644 --- a/src/main/java/ru/bclib/util/PathUtil.java +++ b/src/main/java/ru/bclib/util/PathUtil.java @@ -1,24 +1,10 @@ package ru.bclib.util; import net.fabricmc.loader.api.FabricLoader; -import net.fabricmc.loader.api.ModContainer; -import net.fabricmc.loader.api.metadata.ModMetadata; -import net.fabricmc.loader.metadata.ModMetadataParser; -import net.fabricmc.loader.metadata.ParseMetadataException; -import org.apache.logging.log4j.LogManager; -import ru.bclib.BCLib; import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Path; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; import java.util.function.Consumer; -import java.util.jar.JarFile; public class PathUtil { public final static Path GAME_FOLDER = FabricLoader.getInstance() @@ -79,7 +65,7 @@ public class PathUtil { if (f.getName() .startsWith(".")) continue; if (f.isDirectory()) { - fileWalker(f, pathConsumer); + if (recursive) fileWalker(f, pathConsumer); } else if (f.isFile()) { pathConsumer.accept(f.toPath());