Skip to content

Commit 57cc09d

Browse files
NeoModDevGradleModelBuilderImpl: Only get version if not in vanilla mode
Fixes #2570
1 parent 3e136d0 commit 57cc09d

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,28 @@ final class NeoModDevGradleModelBuilderImpl implements ModelBuilderService {
4949
return null
5050
}
5151

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-
6252
def neoFormVersion
6353
try {
6454
neoFormVersion = extension.neoFormVersion.getOrNull()
6555
} catch (InvalidUserCodeException ignore) {
6656
// Happens when the NeoForm version is not set
6757
neoFormVersion = null
6858
}
59+
60+
def neoforgeVersion
61+
if (neoFormVersion != null) {
62+
neoforgeVersion = null
63+
} else {
64+
def neoforgeVersionProp = extension.version
65+
66+
if (neoforgeVersionProp instanceof String) {
67+
neoforgeVersion = neoforgeVersionProp
68+
} else if (neoforgeVersionProp instanceof Provider) {
69+
neoforgeVersion = neoforgeVersionProp.getOrNull()
70+
} else {
71+
return null
72+
}
73+
}
6974

7075
def accessTransformersRaw = extension.accessTransformers
7176
List<File> accessTransformers

0 commit comments

Comments
 (0)