From b59a01ffa7cd78fb0e21625dfce2f033556b5a8f Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Tue, 29 Jun 2021 13:43:14 +0300 Subject: [PATCH] Simplify patch version checks --- .../providers/forge/MinecraftPatchedProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java index 4104d91c..20e8cf11 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java @@ -178,7 +178,7 @@ public class MinecraftPatchedProvider extends DependencyProvider { minecraftMergedPatchedJar = new File(projectDir, "merged-patched.jar"); if (isRefreshDeps() || Stream.of(getGlobalCaches()).anyMatch(Predicates.not(File::exists)) - || !isPatchedSrgJarUpdateToDate(minecraftClientPatchedSrgJar) || !isPatchedSrgJarUpdateToDate(minecraftServerPatchedSrgJar)) { + || !isPatchedJarUpToDate(minecraftMergedPatchedJar)) { cleanAllCache(); } else if (atDirty || Stream.of(getProjectCache()).anyMatch(Predicates.not(File::exists))) { cleanProjectCache(); @@ -346,7 +346,7 @@ public class MinecraftPatchedProvider extends DependencyProvider { }); } - private boolean isPatchedSrgJarUpdateToDate(File jar) { + private boolean isPatchedJarUpToDate(File jar) { if (!jar.exists()) return false; boolean[] upToDate = {false};