diff --git a/src/main/java/com/enderio/core/EnderCore.java b/src/main/java/com/enderio/core/EnderCore.java index c849b1f..3a5bbd6 100644 --- a/src/main/java/com/enderio/core/EnderCore.java +++ b/src/main/java/com/enderio/core/EnderCore.java @@ -4,6 +4,8 @@ import java.io.File; import java.util.List; import lombok.SneakyThrows; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiErrorScreen; import net.minecraft.command.CommandHandler; import net.minecraft.server.MinecraftServer; import net.minecraftforge.client.ClientCommandHandler; @@ -29,6 +31,8 @@ import com.enderio.core.common.util.PermanentCache; import com.enderio.core.common.util.TextureErrorRemover; import com.google.common.collect.Lists; +import cpw.mods.fml.client.CustomModLoadingErrorDisplayException; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -39,7 +43,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; -@Mod(modid = EnderCore.MODID, name = EnderCore.NAME, version = EnderCore.VERSION, guiFactory = "com.enderio.core.common.config.BaseConfigFactory") +@Mod(modid = EnderCore.MODID, name = EnderCore.NAME, version = EnderCore.VERSION, dependencies = "after:ttCore", guiFactory = "com.enderio.core.common.config.BaseConfigFactory") public class EnderCore implements IEnderMod { public static final String MODID = "endercore"; @@ -58,9 +62,26 @@ public class EnderCore implements IEnderMod { public List configs = Lists.newArrayList(); + @SuppressWarnings("serial") @EventHandler @SneakyThrows public void preInit(FMLPreInitializationEvent event) { + if (Loader.isModLoaded("ttCore")) { + throw new CustomModLoadingErrorDisplayException() { + + @Override + public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) { + } + + @Override + public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY, float tickTime) { + errorScreen.drawCenteredString(fontRenderer, lang.localize("error.ttcore.1"), errorScreen.width / 2, errorScreen.height / 2 - 20, 0xFFFFFF); + errorScreen.drawCenteredString(fontRenderer, lang.localize("error.ttcore.2"), errorScreen.width / 2, errorScreen.height / 2 - 10, 0xFFFFFF); + errorScreen.drawCenteredString(fontRenderer, lang.localize("error.ttcore.3"), errorScreen.width / 2, errorScreen.height / 2, 0xFFFFFF); + } + }; + } + if (event.getSide().isClient()) { TextureErrorRemover.beginIntercepting(); } diff --git a/src/main/resources/assets/endercore/lang/en_US.lang b/src/main/resources/assets/endercore/lang/en_US.lang index fe87818..c83fcfc 100644 --- a/src/main/resources/assets/endercore/lang/en_US.lang +++ b/src/main/resources/assets/endercore/lang/en_US.lang @@ -20,4 +20,8 @@ endercore.resourcepack.readme2=Do not edit this, it will be created/deleted by t endercore.gui.normal=Normal endercore.gui.search=Search: endercore.gui.modlistinfo1=OMG everything is different! -endercore.gui.modlistinfo2=New layout provided by: \ No newline at end of file +endercore.gui.modlistinfo2=New layout provided by: + +endercore.error.ttcore.1=EnderCore cannot reliably be run alongside ttCore. +endercore.error.ttcore.2=All ttCore features/utils are now included in EnderCore. +endercore.error.ttcore.3=Please remove ttCore from your instance and try launching again. \ No newline at end of file