diff --git a/build.gradle b/build.gradle index dbe3e457de..a979decd1f 100644 --- a/build.gradle +++ b/build.gradle @@ -219,45 +219,47 @@ project(':mcp') { } } -project(':clean') { - evaluationDependsOn(':mcp') - apply plugin: 'net.minecraftforge.gradle.patcher' - tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything +if (!System.env.TEAMCITY_VERSION) { + project(':clean') { + evaluationDependsOn(':mcp') + apply plugin: 'net.minecraftforge.gradle.patcher' + tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything - dependencies { - implementation 'net.minecraftforge:forgespi:' + SPI_VERSION - } + dependencies { + implementation 'net.minecraftforge:forgespi:' + SPI_VERSION + } - patcher { - parent = project(':mcp') - mcVersion = MC_VERSION - patchedSrc = file('src/main/java') + patcher { + parent = project(':mcp') + mcVersion = MC_VERSION + patchedSrc = file('src/main/java') - mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION + mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION - runs { - clean_client { - client true - taskName 'clean_client' - ideaModule "${rootProject.name}.${project.name}.main" + runs { + clean_client { + client true + taskName 'clean_client' + ideaModule "${rootProject.name}.${project.name}.main" - main 'net.minecraft.client.main.Main' - workingDirectory project.file('run') + main 'net.minecraft.client.main.Main' + workingDirectory project.file('run') - args '--gameDir', '.' - args '--version', MC_VERSION - args '--assetsDir', downloadAssets.output - args '--assetIndex', '{asset_index}' - args '--accessToken', '0' - } + args '--gameDir', '.' + args '--version', MC_VERSION + args '--assetsDir', downloadAssets.output + args '--assetIndex', '{asset_index}' + args '--accessToken', '0' + } - clean_server { - client false - taskName 'clean_server' - ideaModule "${rootProject.name}.${project.name}.main" + clean_server { + client false + taskName 'clean_server' + ideaModule "${rootProject.name}.${project.name}.main" - main 'net.minecraft.server.Main' - workingDirectory project.file('run') + main 'net.minecraft.server.Main' + workingDirectory project.file('run') + } } } } @@ -883,7 +885,7 @@ project(':fmlonly') { } project(':forge') { - evaluationDependsOn(':clean') + evaluationDependsOn(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean') apply plugin: 'java-library' apply plugin: 'net.minecraftforge.gradle.patcher' apply plugin: 'org.cadixdev.licenser' @@ -961,13 +963,19 @@ project(':forge') { patcher { excs.from file("$rootDir/src/main/resources/forge.exc") - parent = project(':clean') + parent = project(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean') patches = file("$rootDir/patches/minecraft") patchedSrc = file('src/main/java') srgPatches = true accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg") sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas") + // the clean project provides these. if we're not using it, we need to provide them ourselves + if (System.env.TEAMCITY_VERSION) { + mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION + mcVersion = MC_VERSION + } + runs { forge_client { property 'eventbus.checkTypesOnDispatch', 'true' @@ -1784,7 +1792,8 @@ project(':forge') { //evaluationDependsOnChildren() task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above - dependsOn ':clean:extractMapped' + if (!System.env.TEAMCITY_VERSION) + dependsOn ':clean:extractMapped' if (symlinkValid) dependsOn ':fmlonly:extractMapped' dependsOn ':forge:extractMapped' diff --git a/settings.gradle b/settings.gradle index 51f6efbd2d..f2ed2c4bb9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -29,11 +29,14 @@ include 'javafmllanguage' include 'lowcodelanguage' include ':mcp' -include ':clean' include ':fmlonly' include ':forge' project(":mcp").projectDir = file("projects/mcp") -project(":clean").projectDir = file("projects/clean") project(":fmlonly").projectDir = file("projects/fmlonly") project(":forge").projectDir = file("projects/forge") + +if (!System.env.TEAMCITY_VERSION) { + include ':clean' + project(":clean").projectDir = file("projects/clean") +}