Fix intellij run configs not working, due to where they expect the targets, by removing an old setting that seems to still work fine without it
@@ -29,10 +29,8 @@ defaultTasks 'build'
idea {
module {
- // For some reason this is necessary for IDEA 2014 workspaces to recognize assets
- inheritOutputDirs = true
//Exclude directories from being managed
- for (String excludeDirName in ["run", "out", "logs", "gradle"]) {
+ for (String excludeDirName in ["run", "runGameTests", "out", "logs", "gradle"]) {
excludeDirs.add(new File(projectDir, excludeDirName))
}
}
@@ -191,13 +189,11 @@ def setupTasks(SourceSet sourceSet) {
with(modsToml, packMcMeta)
into "$buildDir/resources/${output}/"
//If IntelliJ's output dir exists, copy it there as well
- if (new File("$rootDir/out/production/Mekanism.${output}/").exists()) {
- //Note: This copies it into the correct place, but it still doesn't have the IntelliJ
- // run work by default because of incorrect MOD_CLASSES getting generated.
- // probably related to us setting inheritOutputDirs
+ def intellijPath = sourceSet == project.sourceSets.main ? "production" : output
+ if (new File("$rootDir/out/${intellijPath}/resources/").exists()) {
copy {
with(modsToml, packMcMeta)
- into "$rootDir/out/production/Mekanism.${output}/"
+ into "$rootDir/out/${intellijPath}/resources/"
}
}
//If Eclipse's output dir exists, copy it there as well
@@ -802,7 +798,7 @@ if (System.getenv("CURSEFORGE_KEY") != null || project.hasProperty('curseforgeKe
optionalDependency "ctm"
optionalDependency "curios"
optionalDependency "female-gender-forge"
- //optionalDependency "flux-networks"
+ optionalDependency "flux-networks"
optionalDependency "i-like-wood"
optionalDependency "i-like-wood-biomes-o-plenty-plugin"
optionalDependency "i-like-wood-oh-the-biomes-youll-go-plugin"
