User: bythepowerofscience (abadhaiku)
Date: 21 Mar 26 20:18
Revision: 95c88298e41359f9ef9571c9b029f2165f9a7305
Summary:
NeoModDevGradleModelBuilderImpl: Only get version if not in vanilla mode (#2594)

Fixes #2570

TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10432&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 3e136d02d3a85988f80f5f637f30131472a351ef)
+++ src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/neomoddev/NeoModDevGradleModelBuilderImpl.groovy	(revision 95c88298e41359f9ef9571c9b029f2165f9a7305)
@@ -49,22 +49,27 @@
             return null
         }
 
-        def neoforgeVersionProp = extension.version
+        def neoFormVersion
+        try {
+            neoFormVersion = extension.neoFormVersion.getOrNull()
+        } catch (InvalidUserCodeException ignore) {
+            // Happens when the NeoForm version is not set
+            neoFormVersion = null
+        }
+        
         def neoforgeVersion
+        if (neoFormVersion != null) {
+            neoforgeVersion = null
+        } else {
+            def neoforgeVersionProp = extension.version
+        
-        if (neoforgeVersionProp instanceof String) {
-            neoforgeVersion = neoforgeVersionProp
-        } else if (neoforgeVersionProp instanceof Provider) {
-            neoforgeVersion = neoforgeVersionProp.getOrNull()
-        } else {
-            return null
-        }
+            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