diff --git a/.gitignore b/.gitignore index 389b51fe..832f4a26 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ MinecraftForge-License.txt README.txt forge-1.7.10-10.13.4.1614-1.7.10-changelog.txt *.bat + +.idea/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 26b5504b..eca4de2d 100644 --- a/build.gradle +++ b/build.gradle @@ -28,13 +28,73 @@ version = "${config.avaritia.version}" group= "fox.spiteful.avaritia" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Avaritia" +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + minecraft { - version = "${config.forge.version}-${config.minecraft.version}" + version = "${config.minecraft.version}-${config.forge.version}-${config.minecraft.version}" runDir = "eclipse" } +idea { module { inheritOutputDirs = true } } + +configurations { + provided + embedded + compile.extendsFrom provided, embedded +} + +repositories { + maven { + name 'Forge maven' + url 'http://files.minecraftforge.net/maven/' + } + maven { //NEI, chicken core and lib + name = "Chickenbones maven" + url = "http://chickenbones.net/maven/" + } + maven { // Forestry + name = "Player IC2 maven" + url = "http://maven.ic2.player.to/" + } + maven { // TConstruct + name 'DVS1 Maven FS' + url 'http://dvs1.progwml6.com/files/maven' + } + maven { // Baubles + name 'MC Mod Dev maven' + url 'https://maven.mcmoddev.com/' + } + maven { // CraftTweaker (aka MineTweaker3) + name 'jared maven' + url "http://maven.blamejared.com/" + } + ivy { //Thaumcraft, CoFHCore, BloodMagic and Witchery + name 'gtnh_download_source_stupid_underscore_typo' + artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]" + } + ivy { // - instead of _ + name 'gtnh_download_source' + artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" + } +} + dependencies { - compile fileTree(dir: 'lib', include: '*.jar') + provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" + provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" + provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" + provided "MineTweaker3:MineTweaker3-MC1710-Main:${config.minecraft.version}-${config.minetweaker3.version}" + provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev" + provided "tconstruct:TConstruct:${config.minecraft.version}-${config.tconstruct.version}:deobf" + provided "com.azanor:Baubles:${config.minecraft.version}-${config.baubles.version}" + //provided "com.azanor:Thaumcraft:${config.minecraft.version}-${config.thaumcraft.version}" + provided name: 'Thaumcraft', version: config.thaumcraft.version, ext: 'jar' + provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' + provided name: 'BloodMagic', version: config.bloodmagic.version, ext: 'jar' + provided name: 'witchery', version: config.witchery.version, ext: 'jar' + compile fileTree(dir: 'lib', include: '*.jar') } processResources diff --git a/build.properties b/build.properties index d3a82157..89ce2c29 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,17 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614 -avaritia.version=1.15 \ No newline at end of file + +avaritia.version=1.15 + +codechickenlib.version=1.1.3.140 +codechickencore.version=1.0.7.47 +nei.version=1.0.5.120 +tconstruct.version=1.8.8.build1003 +baubles.version=1.0.1.10 +//thaumcraft.version=4.2.3.5-deobf +thaumcraft.version=1.7.10-4.2.3.5-deobf +cofhcore.version=[1.7.10]3.1.4-329-dev +bloodmagic.version=1.7.10-1.3.3-17-deobf +witchery.version=1.7.10-0.24.1 +forestry.version=3.6.2.19 +minetweaker3.version=3.0.13.43 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 85855697..00000000 Binary files a/libs/Baubles-deobf-1.7.10-1.0.1.10.jar and /dev/null differ diff --git a/libs/BloodMagic-dev.jar b/libs/BloodMagic-dev.jar deleted file mode 100644 index 39e5ff94..00000000 Binary files a/libs/BloodMagic-dev.jar and /dev/null differ diff --git a/libs/CoFHCore-[1.7.10]3.0.4B1-308-dev.jar b/libs/CoFHCore-[1.7.10]3.0.4B1-308-dev.jar deleted file mode 100644 index c5b1e444..00000000 Binary files a/libs/CoFHCore-[1.7.10]3.0.4B1-308-dev.jar and /dev/null differ diff --git a/libs/CodeChickenCore-1.7.10-1.0.4.29-dev.jar b/libs/CodeChickenCore-1.7.10-1.0.4.29-dev.jar deleted file mode 100644 index 40a38e3a..00000000 Binary files a/libs/CodeChickenCore-1.7.10-1.0.4.29-dev.jar and /dev/null differ diff --git a/libs/CodeChickenLib-1.7.10-1.1.1.99-universal.jar b/libs/CodeChickenLib-1.7.10-1.1.1.99-universal.jar deleted file mode 100644 index ea577600..00000000 Binary files a/libs/CodeChickenLib-1.7.10-1.1.1.99-universal.jar and /dev/null differ diff --git a/libs/Mantle-1.7.10-0.3.2-deobf.jar b/libs/Mantle-1.7.10-0.3.2-deobf.jar deleted file mode 100644 index c0cd8cd7..00000000 Binary files a/libs/Mantle-1.7.10-0.3.2-deobf.jar and /dev/null differ diff --git a/libs/MineTweaker3-Dev-1.7.10-3.0.9C.jar b/libs/MineTweaker3-Dev-1.7.10-3.0.9C.jar deleted file mode 100644 index 7f5b529a..00000000 Binary files a/libs/MineTweaker3-Dev-1.7.10-3.0.9C.jar and /dev/null differ diff --git a/libs/NotEnoughItems-1.7.10-1.0.3.74-dev.jar b/libs/NotEnoughItems-1.7.10-1.0.3.74-dev.jar deleted file mode 100644 index 59aa81fa..00000000 Binary files a/libs/NotEnoughItems-1.7.10-1.0.3.74-dev.jar and /dev/null differ diff --git a/libs/TConstruct-1.7.10-1.8.5-deobf.jar b/libs/TConstruct-1.7.10-1.8.5-deobf.jar deleted file mode 100644 index c673f1dd..00000000 Binary files a/libs/TConstruct-1.7.10-1.8.5-deobf.jar and /dev/null differ diff --git a/libs/Thaumcraft-deobf-1.7.10-4.2.1.4.jar b/libs/Thaumcraft-deobf-1.7.10-4.2.1.4.jar deleted file mode 100644 index 51c38bf3..00000000 Binary files a/libs/Thaumcraft-deobf-1.7.10-4.2.1.4.jar and /dev/null differ diff --git a/libs/forestry_1.7.10-3.6.12.3-dev.jar b/libs/forestry_1.7.10-3.6.12.3-dev.jar deleted file mode 100644 index 1facccdb..00000000 Binary files a/libs/forestry_1.7.10-3.6.12.3-dev.jar and /dev/null differ diff --git a/libs/witchery-1.7.10-0.24.1.jar b/libs/witchery-1.7.10-0.24.1.jar deleted file mode 100644 index 434b02d0..00000000 Binary files a/libs/witchery-1.7.10-0.24.1.jar and /dev/null differ