From 03d8ac4e1254cb9376bcf61bf6c6e2622be1254c Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Thu, 24 Jun 2021 16:33:56 +0200 Subject: [PATCH] Treat unexpanded Gradle version property as satisfied dependency --- .../net/fabricmc/loader/impl/discovery/ModResolver.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loader/impl/discovery/ModResolver.java b/src/main/java/net/fabricmc/loader/impl/discovery/ModResolver.java index a16abaf43..d1d041e0e 100644 --- a/src/main/java/net/fabricmc/loader/impl/discovery/ModResolver.java +++ b/src/main/java/net/fabricmc/loader/impl/discovery/ModResolver.java @@ -150,7 +150,13 @@ private Map findCompatibleSet(Map for (ModDependency dep : mod.getInfo().getDepends()) { int[] matchingCandidates = modCandidateMap.getOrDefault(dep.getModId(), Collections.emptyList()) .stream() - .filter((c) -> dep.matches(c.getInfo().getVersion())) + .filter((c) -> { + Version version = c.getInfo().getVersion(); + if (version.toString() == "${version}" || version.toString() == "$version") { + return true; + } + return dep.matches(version); + }) .mapToInt(candidateIntMap::get) .toArray();