diff --git a/build.gradle b/build.gradle index 96d7a33..6007a6c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,79 +1,88 @@ -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -repositories { - maven { - name = "forestry" - url = "http://maven.ic2.player.to/" - } -} - -apply plugin: 'forge' - -ext.version_mod = "${project.version_major}.${project.version_minor}.${project.version_rev}" -version = project.version_mc + "-" + project.version_mod -group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "magicbees" - -minecraft { - version = project.version_mc + "-" + project.version_forge - runDir = "." - - replace '@VERSION@', project.version_mod - replace '@MCVERSION@', project.version_mc -} - -dependencies { - compile "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:api" - runtime "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:dev" - compile files("/libs/Baubles-deobf-${project.version_mc}-${project.version_baubles}.jar") - compile files("/libs/Botania ${project.version_botania}-deobf.jar") -} - -processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} - -idea { - module { - inheritOutputDirs = true - } -} - -task deobfJar(type: Jar) { // Generate deobfuscated - from sourceSets.main.output - classifier = 'deobf' -} - -task fullBuild(dependsOn: ['build', 'deobfJar']) { +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +repositories { + maven { + name = "forestry" + url = "http://maven.ic2.player.to/" + } + ivy { + name "Thaumcraft" + artifactPattern "https://dl.dropboxusercontent.com/u/47135879/[module]-deobf-${project.version_mc}-[revision].[ext]" + } + ivy { + name "Botania" + artifactPattern "http://botaniamod.net/files/deobf/[module] [revision]-deobf.[ext]" + } +} + +apply plugin: 'forge' + +ext.version_mod = "${project.version_major}.${project.version_minor}.${project.version_rev}" +version = project.version_mc + "-" + project.version_mod +group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "magicbees" + +minecraft { + version = project.version_mc + "-" + project.version_forge + runDir = "." + + replace '@VERSION@', project.version_mod + replace '@MCVERSION@', project.version_mc +} + +dependencies { + compile "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:api" + runtime "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:dev" + compile name: 'Botania', version: "${project.version_botania}", ext: 'jar' + compile name: 'Baubles', version: "${project.version_baubles}", ext: 'jar' + compile name: 'Thaumcraft', version: "${project.version_thaumcraft}", ext: 'jar' +} + +processResources +{ + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} + +idea { + module { + inheritOutputDirs = true + } +} + +task deobfJar(type: Jar) { // Generate deobfuscated + from sourceSets.main.output + classifier = 'deobf' +} + +task fullBuild(dependsOn: ['build', 'deobfJar']) { } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3cd312b..7e30e4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,10 @@ version_major=2 version_minor=4 version_rev=2 -version_forestry=4.2.5.53 +version_forestry=4.2.+ version_botania=r1.8-248 version_baubles=1.0.1.10 +version_thaumcraft=4.2.3.5 version_mc=1.7.10 version_forge=10.13.4.1566-1.7.10 diff --git a/libs/Baubles-deobf-1.7.10-1.0.1.10.jar b/libs/Baubles-deobf-1.7.10-1.0.1.10.jar deleted file mode 100644 index 8585569..0000000 Binary files a/libs/Baubles-deobf-1.7.10-1.0.1.10.jar and /dev/null differ diff --git a/libs/Botania r1.8-248-deobf.jar b/libs/Botania r1.8-248-deobf.jar deleted file mode 100644 index 3857abb..0000000 Binary files a/libs/Botania r1.8-248-deobf.jar and /dev/null differ