diff options
Diffstat (limited to 'src/main/java')
3 files changed, 23 insertions, 22 deletions
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 162b8ac1ab..7cf512cdd5 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -4,6 +4,7 @@ import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; import baubles.common.container.InventoryBaubles; @@ -29,7 +30,7 @@ import gtPlusPlus.core.handler.CompatIntermodStaging; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.handler.events.EnderDragonDeathHandler; import gtPlusPlus.core.handler.events.EntityDeathHandler; -import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler; +import gtPlusPlus.core.handler.events.MolecularTransformerTooltipNotice; import gtPlusPlus.core.handler.events.PlayerSleepEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.bauble.BaseBauble; @@ -79,7 +80,9 @@ public class CommonProxy { public void init(final FMLInitializationEvent e) { CI.init(); - Utils.registerEvent(new GeneralTooltipEventHandler()); + if (Mods.AdvancedSolarPanel.isModLoaded()) { + MinecraftForge.EVENT_BUS.register(new MolecularTransformerTooltipNotice()); + } // Handles Tooltips for items giving custom multiblock behaviour Utils.registerEvent(new SpecialBehaviourTooltipHandler()); // Handles Sleep Benefits diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java deleted file mode 100644 index 650fd70efd..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package gtPlusPlus.core.handler.events; - -import net.minecraft.item.Item; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; - -import advsolar.common.AdvancedSolarPanel; -import cpw.mods.fml.common.Optional; -import gregtech.api.enums.Mods; - -public class GeneralTooltipEventHandler { - - @Optional.Method(modid = Mods.Names.ADVANCED_SOLAR_PANEL) - @SuppressWarnings("unused") - public static void molecularTransformer(ItemTooltipEvent event) { - if (event.itemStack.getItem() == Item.getItemFromBlock(AdvancedSolarPanel.blockMolecularTransformer)) { - event.toolTip.add("" + EnumChatFormatting.RED + "Disabled, Use the multiblock"); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/events/MolecularTransformerTooltipNotice.java b/src/main/java/gtPlusPlus/core/handler/events/MolecularTransformerTooltipNotice.java new file mode 100644 index 0000000000..7471f74624 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/handler/events/MolecularTransformerTooltipNotice.java @@ -0,0 +1,18 @@ +package gtPlusPlus.core.handler.events; + +import net.minecraft.item.Item; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; + +import advsolar.common.AdvancedSolarPanel; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class MolecularTransformerTooltipNotice { + + @SubscribeEvent + public void molecularTransformer(ItemTooltipEvent event) { + if (event.itemStack.getItem() == Item.getItemFromBlock(AdvancedSolarPanel.blockMolecularTransformer)) { + event.toolTip.add(EnumChatFormatting.RED + "Disabled, use the multiblock"); + } + } +} |