Skip to content

Commit

Permalink
Fix #2426 Error when importing MDG 2.0 project
Browse files Browse the repository at this point in the history
  • Loading branch information
RedNesto committed Jan 19, 2025
1 parent 5c6891e commit 5a6e07f
Showing 1 changed file with 19 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -47,8 +49,23 @@ final class NeoModDevGradleModelBuilderImpl implements ModelBuilderService {
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
Expand Down

0 comments on commit 5a6e07f

Please sign in to comment.