From 9c29142e6ad1f9142ffd427fb701547568e34fc6 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Thu, 19 Mar 2020 13:33:34 +0000 Subject: [PATCH] Maven-ify all the things and update Antique Atlas --- build.gradle | 42 +++++++----------------------------------- gradle.properties | 5 ++++- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 6ebcef05..e4be675b 100644 --- a/build.gradle +++ b/build.gradle @@ -31,15 +31,10 @@ repositories { name = "ModMaven" url = "modmaven.k-4u.nl" } - flatDir { - // evErYthINg hAS tO Be a mAVeN rEPoSiTOrY... (to use deobfProvided, for some reason) - // The lack of documentation is actually quite impressive, see the following threads: - // http://www.minecraftforge.net/forum/topic/44262-solved-how-to-build-mod-with-dependencies/ - // https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/mapping-and-modding-tutorials/2866817-setting-up-dependencies-in-minecraft-forge-with - // http://www.minecraftforge.net/forum/topic/44534-adding-dependencies-to-a-forge-project/ - dirs "libsfordeobf" // Don't put src jars in libs or forge will think you have duplicate mods + maven { + name = "Curseforge Maven" + url = "https://minecraft.curseforge.com/api/maven/" } - } minecraft { @@ -56,37 +51,14 @@ minecraft { } dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - // compile against the JEI API but do not include it at runtime + // Compile against the JEI API but do not include it at runtime deobfProvided "mezz.jei:jei_${mc_version}:${jei_version}:api" - // at runtime, use the full JEI jar + // At runtime, use the full JEI jar runtime "mezz.jei:jei_${mc_version}:${jei_version}" - //deobfProvided "baubles:baubles-1.12:1.5.2:api" // #ihavenoideawhatimdoing #itjustworks - //runtime "baubles:baubles-1.12:1.5.2" // If in doubt, copy what already works - - //deobfProvided "antiqueatlas:antiqueatlas-1.12.2:4.5.1:src" - //runtime "antiqueatlas:antiqueatlas-1.12.2:4.5.1" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html + deobfCompile "baubles:Baubles:${mc_version_short}:${baubles_version}" + deobfCompile "antique-atlas:antiqueatlas:${mc_version}:${antique_atlas_version}" } diff --git a/gradle.properties b/gradle.properties index b4ec0fb3..a4e7eb14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,7 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G mc_version=1.12.2 -jei_version=4.13.1.225 \ No newline at end of file +mc_version_short=1.12 +jei_version=4.13.1.225 +baubles_version=1.5.2 +antique_atlas_version=4.6.3 \ No newline at end of file