Skip to content

Commit f002699

Browse files
committed
Merge remote-tracking branch 'PufferTeam-ModArchive/master' into dev
2 parents 120722e + 0264479 commit f002699

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

dependencies.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ dependencies {
44
implementation('com.github.GTNewHorizons:GTNHLib:0.7.0:dev')
55
implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev")
66
compileOnly("curse.maven:cofh-core-69162:2388750-dev:dev")
7-
7+
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.4:dev') {transitive=false}
8+
compileOnly("com.github.GTNewHorizons:Chisel:2.16.5-GTNH:dev") { transitive = false }
89
// for testing
910
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.9.26:dev") { transitive = false }
1011
}

src/main/java/com/enderio/core/client/handlers/SpecialTooltipHandler.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
import com.enderio.core.common.util.ItemUtil;
2626
import com.google.common.collect.Lists;
2727

28+
import codechicken.microblock.ItemSaw;
29+
import cpw.mods.fml.common.Loader;
2830
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
31+
import team.chisel.item.chisel.ItemChisel;
2932

3033
@Handler
3134
public enum SpecialTooltipHandler {
@@ -94,6 +97,18 @@ public void addDurabilityTooltip(List<String> toolTip, ItemStack itemStack) {
9497
|| item instanceof ItemBow) {
9598
toolTip.add(ItemUtil.getDurabilityString(itemStack));
9699
}
100+
101+
if (Loader.isModLoaded("chisel")) {
102+
if (item instanceof ItemChisel) {
103+
toolTip.add(ItemUtil.getDurabilityString(itemStack));
104+
}
105+
}
106+
107+
if (Loader.isModLoaded("ForgeMultipart")) {
108+
if (item instanceof ItemSaw) {
109+
toolTip.add(ItemUtil.getDurabilityString(itemStack));
110+
}
111+
}
97112
}
98113

99114
public void addInformation(IResourceTooltipProvider item, ItemTooltipEvent evt) {

0 commit comments

Comments
 (0)