From 389778cd2fd65d90bcb75032f4aba191c52a9235 Mon Sep 17 00:00:00 2001 From: payonel Date: Wed, 19 Sep 2018 22:21:33 -0700 Subject: [PATCH] the good build properties and tooltip --- build.gradle | 50 +++++++++++++------ build.properties | 3 ++ .../li/cil/oc/common/block/Redstone.scala | 6 +-- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 155eef291..4fd7d08dd 100644 --- a/build.gradle +++ b/build.gradle @@ -67,8 +67,8 @@ minecraft { } repositories { - maven { url "http://maven.cil.li/" } - maven { url "https://minecraft.curseforge.com/api/maven/" } + maven { url "http://maven.cil.li/" } + maven { url "https://minecraft.curseforge.com/api/maven/" } } configurations { @@ -82,27 +82,45 @@ dependencies { } deobfCompile "com.mod-buildcraft:buildcraft-api:${config.buildcraft.version}" deobfCompile "MCMultiPart2:MCMultiPart-exp:${config.mcmp.version}" - deobfCompile "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}" - deobfCompile ("net.sengir.forestry:forestry_1.12.2:${config.forestry.version}") { + provided ("net.sengir.forestry:forestry_1.12.2:${config.forestry.version}") { exclude module: "jei_1.12" } deobfCompile "net.industrial-craft:industrialcraft-2:${config.ic2.version}" deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla.version}:api" deobfCompile "dan200.computercraft:ComputerCraft:${config.cc.version}" - - provided ("appeng:appliedenergistics2:${config.ae2.version}:api") { - transitive = false - } - provided "extracells2:ExtraCells-api:${config.extracells.version}" - - provided("mekanism:Mekanism:${config.mekanism.version}:api") { - transitive = false - } + + provided ("appeng:appliedenergistics2:${config.ae2.version}:api") { + transitive = false + } + provided "extracells2:ExtraCells-api:${config.extracells.version}" + + provided("mekanism:Mekanism:${config.mekanism.version}:api") { + transitive = false + } - provided ("mrtjp:ProjectRed:${config.projred.version}:all") { - exclude module: 'NotEnoughItems' + provided ("codechicken:ForgeMultipart:${config.minecraft.version}-${config.forgemultipart.version}:universal") { + exclude module: "jei_1.12" exclude module: "CodeChickenLib" - } + } + + provided ("codechicken:ChickenASM:${config.casm.version}") + + provided "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}" + provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:universal" + + provided ("mrtjp:ProjectRed:${config.projred.version}:Base") { + exclude module: "NotEnoughItems" + exclude module: "CodeChickenLib" + exclude module: "jei_1.12" + exclude module: "ForgeMultipart" + } + + provided ("mrtjp:ProjectRed:${config.projred.version}:integration") { + exclude module: "NotEnoughItems" + exclude module: "CodeChickenLib" + exclude module: "jei_1.12" + exclude module: "ForgeMultipart" + } embedded files('libs/OpenComputers-JNLua.jar', 'libs/OpenComputers-LuaJ.jar') diff --git a/build.properties b/build.properties index cf9e4b902..6fd3ce9cc 100644 --- a/build.properties +++ b/build.properties @@ -18,6 +18,9 @@ mcmp.version=2.5.1_66 mekanism.version=1.12.2-9.4.3.330 tis3d.version=1.3.1.18 projred.version=1.12.2-4.9.0.86 +ccl.version=3.2.1.351 +forgemultipart.version=2.4.2.67 +casm.version=1.12-1.0.2.7 curse.project.id=223008 curse.project.releaseType=release diff --git a/src/main/scala/li/cil/oc/common/block/Redstone.scala b/src/main/scala/li/cil/oc/common/block/Redstone.scala index 110c047a9..8e3fef5e3 100644 --- a/src/main/scala/li/cil/oc/common/block/Redstone.scala +++ b/src/main/scala/li/cil/oc/common/block/Redstone.scala @@ -14,9 +14,9 @@ class Redstone extends RedstoneAware { override protected def tooltipTail(metadata: Int, stack: ItemStack, world: World, tooltip: util.List[String], advanced: ITooltipFlag) { super.tooltipTail(metadata, stack, world, tooltip, advanced) // todo more generic way for redstone mods to provide lines -// if (Mods.ProjectRedTransmission.isAvailable) { -// tooltip.addAll(Tooltip.get("RedstoneCard.ProjectRed")) -// } + if (Mods.ProjectRedTransmission.isModAvailable) { + tooltip.addAll(Tooltip.get("RedstoneCard.ProjectRed")) + } } // ----------------------------------------------------------------------- //