only compare the paths after shaders to fix issues with symbolic links

IrisShaders · Aug 31, 2024 · 9963dbc · 9963dbc
1 parent fb234aa
commit 9963dbc
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/net/irisshaders/iris/shaderpack/include/IncludeGraph.java b/src/main/java/net/irisshaders/iris/shaderpack/include/IncludeGraph.java
@@ -81,9 +81,15 @@ public IncludeGraph(Path root, ImmutableList<AbsolutePackPath> startingPaths, bo
 
 			try {
 				Path p = next.resolved(root);
-				if (Iris.getIrisConfig().areDebugOptionsEnabled() && !isZip && !p.toAbsolutePath().toString().equals(p.toFile().getCanonicalPath())) {
-					throw new FileIncludeException("'" + next.getPathString() + "' doesn't exist, did you mean '" +
-						root.relativize(p.toFile().getCanonicalFile().toPath()).toString().replace("\\", "/") + "'?");
+				if (Iris.getIrisConfig().areDebugOptionsEnabled() && !isZip) {
+					String absolute = p.toAbsolutePath().toString().replace("\\", "/");
+					absolute = absolute.substring(absolute.lastIndexOf("shaders/") + 8);
+
+					String canonical = p.toFile().getCanonicalPath().replace("\\", "/");
+					canonical = canonical.substring(canonical.lastIndexOf("shaders/") + 8);
+					if (!absolute.equals(canonical)) {
+						throw new FileIncludeException("'" + next.getPathString() + "' doesn't exist, did you mean '" + canonical + "'?");
+					}
 				}
 				source = readFile(p);
 			} catch (IOException e) {