User: rednesto
Date: 27 Jul 24 19:32
Revision: 03fb693644f3cfc2dd2e0fa46a67e2ab2aca2a94
Summary:
Fix recent NeoModDev import errors


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=9516&personal=false

Index: src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy
===================================================================
--- src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy	(revision 88a475af50d03711db5afb579b6b53d3d5876381)
+++ src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy	(revision 03fb693644f3cfc2dd2e0fa46a67e2ab2aca2a94)
@@ -22,6 +22,7 @@
 
 import com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelNMD
 import org.gradle.api.Project
+import org.gradle.api.provider.ListProperty
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
@@ -51,16 +52,26 @@
             return null
         }
 
-        def accessTransformers = extension.accessTransformers.get().collect { project.file(it) }
+        def accessTransformersRaw = extension.accessTransformers
+        List<File> accessTransformers
+        if (accessTransformersRaw instanceof ListProperty) {
+            accessTransformers = accessTransformersRaw.get().collect { project.file(it) }
+        } else {
+            accessTransformers = accessTransformersRaw.files.files.toList()
+        }
 
+        File mappingsFile = null
+        try {
-        // Hacky way to guess where the mappings file is, but I could not find a proper way to find it
-        def neoformDir = project.buildDir.toPath().resolve("neoForm")
+            // Hacky way to guess where the mappings file is, but I could not find a proper way to find it
+            def neoformDir = project.buildDir.toPath().resolve("neoForm")
-        def mappingsFile = Files.list(neoformDir)
+            mappingsFile = Files.list(neoformDir)
-                .map { it.resolve("config/joined.tsrg") }
-                .filter { Files.exists(it) }
-                .findFirst()
-                .orElse(null)
-                ?.toFile()
+                    .map { it.resolve("config/joined.tsrg") }
+                    .filter { Files.exists(it) }
+                    .findFirst()
+                    .orElse(null)
+                    ?.toFile()
+        } catch (Exception ignore) {
+        }
 
         //noinspection GroovyAssignabilityCheck
         return new NeoModDevGradleModelImpl(neoforgeVersion, mappingsFile, accessTransformers)