diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 4 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index c266d55cac..788e4d6d9f 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -6,13 +6,10 @@ import java.lang.reflect.Field; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import gregtech.api.enums.Materials; -import gtPlusPlus.core.handler.events.BlockEventHandler; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; @@ -130,26 +127,6 @@ public class HandlerTooltip_EIO { } } - if (!BlockEventHandler.blockLimestone.isEmpty()) { - for (ItemStack h : BlockEventHandler.blockLimestone) { - if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { - if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { - event.toolTip.add("May contain Fluorite Ore"); - } - } - } - } - if (!BlockEventHandler.oreLimestone.isEmpty()) { - for (ItemStack h : BlockEventHandler.oreLimestone) { - if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { - if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { - event.toolTip.add("May contain Fluorite Ore"); - } - } - } - } - - } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 41651ad479..b4aa2080f9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -88,7 +88,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps){ Logger.INFO("Adding a Cell for "+fluidNameWithCaps); - if (LoadedMods.IndustrialCraft2){ + if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic){ return Utils.createInternalNameAndFluidCell(fluidNameWithCaps); } return null; @@ -96,7 +96,7 @@ public class GregtechFluidHandler { private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps){ Logger.INFO("Adding a Cell for "+fluidNameWithCaps); - if (LoadedMods.IndustrialCraft2){ + if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic){ return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps); } return null; diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index 06ae8a48bb..558b134ea9 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java @@ -53,10 +53,10 @@ public class HANDLER_Thaumcraft { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) { List<TC_AspectStack_Ex> list = Arrays.asList(j.getValue()); if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) { - Logger.INFO("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); + Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); } else { - Logger.INFO("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); + Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); } } } |