Don't warn about mcdev data files that aren't being modified (#241)

PaperMC · Apr 29, 2024 · 381e557 · 381e557
1 parent 3711175
commit 381e557
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/McDev.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/McDev.kt
@@ -45,15 +45,19 @@ object McDev {
         val (javaPatchLines, dataPatchLines) = readPatchLines(patches)
 
         decompJar.openZip().use { zipFile ->
-            val decompFiles = mutableSetOf<String>()
+            val decompSourceFiles = mutableSetOf<String>()
+            val decompDataFiles = mutableSetOf<String>()
 
             zipFile.walk().use { stream ->
                 for (zipEntry in stream) {
                     // substring(1) trims the leading /
                     val path = zipEntry.invariantSeparatorsPathString.substring(1)
 
                     if (path.endsWith(".java")) {
-                        decompFiles += path
+                        decompSourceFiles += path
+                    }
+                    if (path.startsWith("data/")) {
+                        decompDataFiles += path
                     }
 
                     // pull in all package-info classes
@@ -70,9 +74,14 @@ object McDev {
                 }
             }
 
-            val exactJavaImports = javaPatchLines.filter { decompFiles.contains(it) }
+            val exactJavaImports = javaPatchLines.filter { decompSourceFiles.contains(it) }
                 .map { targetDir.resolve(it) }
-            val exactDataImports = if (dataTargetDir != null) dataPatchLines.map { dataTargetDir.resolve("data/minecraft/$it") } else listOf()
+            val exactDataImports = if (dataTargetDir != null) {
+                dataPatchLines.map { "data/minecraft/$it" }.filter { decompDataFiles.contains(it) }
+                    .map { dataTargetDir.resolve(it) }
+            } else {
+                listOf()
+            }
 
             val (additionalSrcImports, additionalDataImports) = readAdditionalImports(importsFile)