diff --git a/build.gradle.kts b/build.gradle.kts index 97a23718f..0c4f4264a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -87,9 +87,9 @@ repositories { dependencies { + // since this build env isn't portable as a multi-project repo, we're just gonna do this: implementation(rfg.deobf("curse.maven:MysticalWorld-282940:3460961")) implementation(rfg.deobf("curse.maven:MysticalLib-277064:3483816")) - compileOnly(rfg.deobf("curse.maven:JustEnoughResources-240630:2728585")) compileOnly(rfg.deobf("curse.maven:JustEnoughResources-240630:2728585") as String) { exclude("mezz.jei") @@ -98,19 +98,21 @@ dependencies { implementation(rfg.deobf("curse.maven:SimpleHarvest-240783:2897811")) implementation("vazkii.patchouli:Patchouli:${property("patchouli_version")}") + compileOnly(rfg.deobf("curse.maven:Baubles-227083:2518667")) compileOnly(rfg.deobf("mezz.jei:jei_${property("minecraft_version")}:${property("jei_version")}")) - implementation(rfg.deobf("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-${property("ct_version")}")) - compileOnly(rfg.deobf("CraftTweaker2:CraftTweaker2-API:4.+")) - compileOnly("CraftTweaker2:ZenScript:4.0.+") + implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-${property("ct_version")}") + compileOnly("CraftTweaker2:CraftTweaker2-API:${property("ct_version")}") + compileOnly("CraftTweaker2:ZenScript:${property("ct_version")}") compileOnly(rfg.deobf("vazkii.botania:Botania:${property("botania_version")}") as String){ exclude("mezz.jei") } + // compiling against thaumcraft directly because the weird API-module-thing workaround used previously wasn't working compileOnly(rfg.deobf("curse.maven:Thaumcraft6-223628:2629023")) compileOnly(rfg.deobf("curse.maven:Hwyla-253449:2568751") as String) { @@ -146,6 +148,15 @@ tasks.javadoc.configure { tasks.deobfuscateMergedJarToSrg.configure { accessTransformerFiles.from("src/main/resources/META-INF/roots_at.cfg") } +tasks.jar { + manifest { + attributes( + mapOf( + "FMLAT" to "roots_at.cfg" + ) + ) + } +} idea { @@ -213,6 +224,8 @@ idea { } } + + tasks.processIdeaSettings.configure { dependsOn(tasks.injectTags) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8d5a2a473..800a1f772 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ minecraft_version=1.12.2 -mod_version=3.1.9 -patchouli_version=1.0-21.5 -jei_version=4.15.0.268 -jer_version=0.9.2 -ct_version=4.1.11.494 -mt_lib_version=3.0.4.8 -botania_version=r1.10-360.47 -thaumcraft_version=6.1.BETA26 -# Set this to true to enable dependencies [Haiku: afaik this is never used] +mod_version=3.1.9.1 +# Set this to true to enable dependencies // comment: afaik this is never used dev_env=true # Dependencies version_baubles=1.12-1.5.2 hwyla_version=1.8.26-B41_1.12.2 +thaumcraft_version=6.1.BETA26 top_version=1.12:1.12-1.4.23-16 depends=required-before:mysticallib@[1.12.2-1.13,);required-before:mysticalworld@[1.12.2-1.11,);before:harvest;before:chisel;before:endercore;required:patchouli +patchouli_version=1.0-21.5 +jei_version=4.15.0.268 +jer_version=0.9.2 +ct_version=4.1.11.494 +mt_lib_version=3.0.4.8 +botania_version=r1.10-360.47