Merge branch 'master' into GTPR

This commit is contained in:
DrParadox7 authored and GitHub committed 2026-01-24 10:01:55 +01:00
commit a167afdb6b
2 files changed
+17

No files matched your search

+2
View File
@@ -7,6 +7,8 @@ dependencies {
compileOnly("curse.maven:redstone-arsenal-70631:2277490-dev:dev")
compileOnly("curse.maven:magia-naturalis-1365176:7156285-dev")
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.4:dev') {transitive=false}
compileOnly("com.github.GTNewHorizons:Chisel:2.16.5-GTNH:dev") { transitive = false }
// for testing
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.10.12:dev") { transitive = false }
}
@@ -25,7 +25,10 @@ import com.enderio.core.common.Handlers.Handler;
import com.enderio.core.common.util.ItemUtil;
import com.google.common.collect.Lists;
import codechicken.microblock.ItemSaw;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import team.chisel.item.chisel.ItemChisel;
@Handler
public enum SpecialTooltipHandler {
@@ -94,6 +97,18 @@ public enum SpecialTooltipHandler {
|| item instanceof ItemBow) {
toolTip.add(ItemUtil.getDurabilityString(itemStack));
}
if (Loader.isModLoaded("chisel")) {
if (item instanceof ItemChisel) {
toolTip.add(ItemUtil.getDurabilityString(itemStack));
}
}
if (Loader.isModLoaded("ForgeMultipart")) {
if (item instanceof ItemSaw) {
toolTip.add(ItemUtil.getDurabilityString(itemStack));
}
}
}
public void addInformation(IResourceTooltipProvider item, ItemTooltipEvent evt) {