diff --git a/build.gradle b/build.gradle index d8d0084e..6bed347c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -buildscript { + buildscript { repositories { mavenCentral() maven { @@ -12,12 +12,20 @@ buildscript { maven { url 'https://oss.sonatype.org/content/groups/public' } + maven { url 'https://plugins.gradle.org/m2/' } mavenLocal() } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'com.gradle:build-scan-plugin:1.3' } } +apply plugin: 'com.gradle.build-scan' + +buildScan { + licenseAgreementUrl = 'https://gradle.com/terms-of-service' + licenseAgree = 'yes' +} repositories { ivy { @@ -37,19 +45,27 @@ repositories { name 'DVS1 Maven FS' url 'http://dvs1.progwml6.com/files/maven' } + maven { // the repo from which to get NEI and stuff + name 'CB Repo' + url "http://chickenbones.net/maven/" + } + maven { // The repo from which to get waila + name "Mobius Repo" + url "http://mobiusstrip.eu/maven" + } + maven { + + url 'http://maven.cil.li/' + } + + } String changelogLoc = 'https://raw.github.com/Thaumic-Tinkerer/ThaumicTinkerer/changelog/web/changelog' -//apply plugin: 'curseforge' apply plugin: 'forge' +//apply plugin: "curseforge" -version = "2.5-1.7.10" -if (project.hasProperty("buildnum")) - version = "2.5-1.7.10-" + project.buildnum -if (project.hasProperty("releaseType")) - if (project.releaseType == "ALPHA") - version = "alpha-" + version group = "thaumic.tinkerer" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "ThaumicTinkerer" @@ -65,28 +81,53 @@ minecraft { } +version = "2.5-${minecraft.version}" +if (System.getenv("BUILD_NUMBER")!=null) + version = "$version-${System.getenv().BUILD_NUMBER}" +if (project.hasProperty("releaseType")) + if (project.releaseType == "ALPHA") + version = "alpha-" + version //curse { -// projectId="75598" -// if(project.hasProperty("apiKey")) -// apiKey=project.apiKey -// changelog="test" -// if(project.hasProperty("releaseType")) -// releaseType=project.releaseType +// projectId="75598" +// version = "2.5-${minecraft.version}" +// if (System.getenv("BUILD_NUMBER")!=null) +// version = "$version-${System.getenv().BUILD_NUMBER}" +// if(project.hasProperty("apiKey")) +// apiKey=project.apiKey +// changelog=" " +// releaseType="release" +// addGameVersion "{minecraft.version}" //} -dependencies { - compile files( - 'TCDEOBF.jar' - ) - compile files("libs/Mantle-1.7.10-0.3.2.jar") - compile files("libs/TConstruct-1.7.10-1.8.9-GTNH.jar") { - //exclude module: 'CodeChickenCore' - //exclude module: 'Waila' - //exclude module: 'NotEnoughItems' - } -} + dependencies { + compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev" + compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev" + compile "mcp.mobius.waila:Waila:1.5.10_1.7.10" + compile "codechicken:ForgeMultipart:1.7.10-1.1.2.331:dev" + compile 'com.mod-buildcraft:buildcraft:6.4.8:dev' + compile "codechicken:NotEnoughItems:1.7.10-1.0.5.118:dev" + compile "codechicken:EnderStorage:1.7.10-1.4.7.37:dev" + compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf" + compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.7.536-dev:api" + compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.7.536-dev:dev" + compile("tconstruct:TConstruct:1.7.10-1.8.3.build927:deobf") { + } + } +// some crazy stuff to make sure the chicken stuff is in the mods folder... +// because it wont work otherwise... because FML doesnt laod coremods from the classpath +task copyChicken(type: Copy, dependsOn: "extractUserDev") { + from { configurations.compile } + include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar" + exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_- + into file(minecraft.runDir + "/mods") + + mustRunAfter "deobfBinJar" + mustRunAfter "repackMinecraft" +} +//tasks.setupDevWorkspace.dependsOn copyChicken +//tasks.setupDecompWorkspace.dependsOn copyChicken processResources { // replace stuff in mcmod.info, nothing else @@ -110,4 +151,4 @@ jar { task deobfJar(type: Jar) { from sourceSets.main.output classifier = 'dev' -} \ No newline at end of file +}