diff options
4 files changed, 23 insertions, 1 deletions
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index 9a1b551d30..166c0f228b 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import gtPlusPlus.xmod.advsolar.HANDLER_AdvSolar; import gtPlusPlus.xmod.bartcrops.HANDLER_CropsPlusPlus; import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; import gtPlusPlus.xmod.computronics.HANDLER_Computronics; @@ -81,6 +82,7 @@ public class COMPAT_IntermodStaging { HANDLER_Reliquary.postInit(); HANDLER_OpenBlocks.postInit(); HANDLER_SpiceOfLife.postInit(); + HANDLER_AdvSolar.postInit(); } public static void onLoadComplete(FMLLoadCompleteEvent event) { diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java index 10dea8a7bf..de3e958b2d 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -1,16 +1,22 @@ package gtPlusPlus.core.handler.events; +import static gregtech.api.enums.GT_Values.MOD_ID_APC; + +import advsolar.common.AdvancedSolarPanel; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.api.enums.ItemList; import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.entity.player.ItemTooltipEvent; @@ -80,6 +86,10 @@ public class GeneralTooltipEventHandler { event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(32000)+"L"); } + if (LoadedMods.AdvancedSolarPanel) { + molecularTransformer(event); + } + if (CORE.ConfigSwitches.enableAnimatedTurbines) { boolean shift = false; @@ -114,4 +124,11 @@ public class GeneralTooltipEventHandler { } + @Optional.Method(modid = "AdvancedSolarPanel") + 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/item/general/ItemSunnariumBit.java b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java index fb713d4962..0b61a06934 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java @@ -9,7 +9,7 @@ import net.minecraft.util.EnumChatFormatting; public class ItemSunnariumBit extends CoreItem { public ItemSunnariumBit() { - super("item.SunnariumBit", "Sunnarium Bit", AddToCreativeTab.tabMisc, 64, 0, new String[] {}, EnumRarity.uncommon, EnumChatFormatting.GOLD, false, null); + super("SunnariumBit", "Sunnarium Bit", AddToCreativeTab.tabMisc, 64, 0, new String[] {}, EnumRarity.uncommon, EnumChatFormatting.GOLD, false, null); this.setTextureName(CORE.MODID+":"+"itemSunnariumBit"); } diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 679211cbf1..a4b2b8c5a3 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3370,3 +3370,6 @@ item.itemGearPraseodymium.name=Praseodymium Gear item.itemCellPraseodymium.name=Praseodymium Cell item.milledMonazite.name=Milled Monazite item.FrothMonaziteflotation.name=Monazite Flotation Froth Cell + +//Added 19/01/22 +item.SunnariumBit.name=Sunnarium Bit |