User: rednesto
Date: 19 Jan 25 23:31
Revision: 5a6e07f62892b23a45af83ca2d1dff4ebdbd5e55
Summary:
Fix #2426 Error when importing MDG 2.0 project


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9815&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 5c6891ed3927a2fbb2459960e9e86c9d839f36e9)
+++ src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy	(revision 5a6e07f62892b23a45af83ca2d1dff4ebdbd5e55)
@@ -21,8 +21,10 @@
 package com.demonwav.mcdev.platform.mcp.gradle.tooling.neomoddev
 
 import com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelNMD
+import org.gradle.api.InvalidUserCodeException
 import org.gradle.api.Project
 import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Provider
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
@@ -47,9 +49,24 @@
             return null
         }
 
-        def neoforgeVersion = extension.version.getOrNull()
-        def neoFormVersion = extension.neoFormVersion.getOrNull()
+        def neoforgeVersionProp = extension.version
+        def neoforgeVersion
+        if (neoforgeVersionProp instanceof String) {
+            neoforgeVersion = neoforgeVersionProp
+        } else if (neoforgeVersionProp instanceof Provider) {
+            neoforgeVersion = neoforgeVersionProp.getOrNull()
+        } else {
+            return null
+        }
 
+        def neoFormVersion
+        try {
+            neoFormVersion = extension.neoFormVersion.getOrNull()
+        } catch (InvalidUserCodeException ignore) {
+            // Happens when the NeoForm version is not set
+            neoFormVersion = null
+        }
+
         def accessTransformersRaw = extension.accessTransformers
         List<File> accessTransformers
         if (accessTransformersRaw instanceof ListProperty) {