diff --git a/dependencies.gradle b/dependencies.gradle index f3d3f6cd..8075b9fb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -20,6 +20,7 @@ dependencies { compileOnlyApi("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") compileOnlyApi("com.github.GTNewHorizons:Natura:2.8.16:dev") compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev') + compileOnly('com.github.GTNewHorizons:SpecialMobs:3.7.2') runtimeOnly('com.github.GTNewHorizons:TiC-Tooltips:1.4.1:dev'){transitive = false} runtimeOnly("com.github.GTNewHorizons:ServerUtilities:2.2.18:dev") diff --git a/src/main/java/tconstruct/compat/LoadedMods.java b/src/main/java/tconstruct/compat/LoadedMods.java index 6703b4e8..545e3a94 100644 --- a/src/main/java/tconstruct/compat/LoadedMods.java +++ b/src/main/java/tconstruct/compat/LoadedMods.java @@ -8,5 +8,6 @@ public class LoadedMods { public static final boolean baubles = Loader.isModLoaded("Baubles"); public static final boolean baublesExpanded = Loader.isModLoaded("Baubles|Expanded"); public static final boolean tiCTooltips = Loader.isModLoaded("TiCTooltips"); + public static final boolean specialMobs = Loader.isModLoaded("SpecialMobs"); } diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 80d31fdc..5b338e7c 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -45,11 +45,13 @@ import mantle.blocks.iface.IMasterLogic; import mantle.blocks.iface.IServantLogic; import mantle.world.CoordTuple; import tconstruct.TConstruct; +import tconstruct.compat.LoadedMods; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.SmelteryDamageSource; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.util.config.PHConstruct; +import toast.specialMobs.entity.creeper.EntityEnderCreeper; /* * Simple class for storing items in the block @@ -342,7 +344,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (o instanceof EntityVillager villager && PHConstruct.meltableVillagers) { fluid = TinkerSmeltery.moltenEmeraldFluid; amount = villager.isChild() ? 5 : 40; - } else if (o instanceof EntityEnderman) { + } else if (o instanceof EntityEnderman || (LoadedMods.specialMobs && o instanceof EntityEnderCreeper)) { fluid = TinkerSmeltery.moltenEnderFluid; amount = 125; } else if (o instanceof EntityIronGolem) {