Skip to content

Commit 5a6e07f

Browse files
committed
Fix #2426 Error when importing MDG 2.0 project
1 parent 5c6891e commit 5a6e07f

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
package com.demonwav.mcdev.platform.mcp.gradle.tooling.neomoddev
2222

2323
import com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelNMD
24+
import org.gradle.api.InvalidUserCodeException
2425
import org.gradle.api.Project
2526
import org.gradle.api.provider.ListProperty
27+
import org.gradle.api.provider.Provider
2628
import org.jetbrains.annotations.NotNull
2729
import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
2830
import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
@@ -47,8 +49,23 @@ final class NeoModDevGradleModelBuilderImpl implements ModelBuilderService {
4749
return null
4850
}
4951

50-
def neoforgeVersion = extension.version.getOrNull()
51-
def neoFormVersion = extension.neoFormVersion.getOrNull()
52+
def neoforgeVersionProp = extension.version
53+
def neoforgeVersion
54+
if (neoforgeVersionProp instanceof String) {
55+
neoforgeVersion = neoforgeVersionProp
56+
} else if (neoforgeVersionProp instanceof Provider) {
57+
neoforgeVersion = neoforgeVersionProp.getOrNull()
58+
} else {
59+
return null
60+
}
61+
62+
def neoFormVersion
63+
try {
64+
neoFormVersion = extension.neoFormVersion.getOrNull()
65+
} catch (InvalidUserCodeException ignore) {
66+
// Happens when the NeoForm version is not set
67+
neoFormVersion = null
68+
}
5269

5370
def accessTransformersRaw = extension.accessTransformers
5471
List<File> accessTransformers

0 commit comments

Comments
 (0)