diff --git a/src/main/java/com/enderio/core/EnderCore.java b/src/main/java/com/enderio/core/EnderCore.java index bbd5c8d..b50608f 100644 --- a/src/main/java/com/enderio/core/EnderCore.java +++ b/src/main/java/com/enderio/core/EnderCore.java @@ -64,13 +64,9 @@ public class EnderCore implements IEnderMod { @SneakyThrows public void preInit(FMLPreInitializationEvent event) { if (Loader.isModLoaded("ttCore")) { - if (event.getSide().isClient()) { - throw new EnderCoreModConflictExceptionClient(); - } else { - throw new RuntimeException(lang.localize("error.ttcore.1") + "\n" + lang.localize("error.ttcore.2") + "\n" + lang.localize("error.ttcore.3")); - } + proxy.throwModCompatibilityError(lang.localize("error.ttcore.1"), lang.localize("error.ttcore.2"), lang.localize("error.ttcore.3")); } - + if (event.getSide().isClient()) { TextureErrorRemover.beginIntercepting(); } diff --git a/src/main/java/com/enderio/core/EnderCoreModConflictExceptionClient.java b/src/main/java/com/enderio/core/EnderCoreModConflictExceptionClient.java deleted file mode 100644 index ea99ece..0000000 --- a/src/main/java/com/enderio/core/EnderCoreModConflictExceptionClient.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.enderio.core; - -import cpw.mods.fml.client.CustomModLoadingErrorDisplayException; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiErrorScreen; - -import static com.enderio.core.EnderCore.lang; - -@SideOnly(Side.CLIENT) -public class EnderCoreModConflictExceptionClient extends 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); - } -} diff --git a/src/main/java/com/enderio/core/client/ClientProxy.java b/src/main/java/com/enderio/core/client/ClientProxy.java index 7f947ef..2591151 100644 --- a/src/main/java/com/enderio/core/client/ClientProxy.java +++ b/src/main/java/com/enderio/core/client/ClientProxy.java @@ -18,4 +18,11 @@ public class ClientProxy extends CommonProxy { public World getClientWorld() { return Minecraft.getMinecraft().theWorld; } + + @Override + public void throwModCompatibilityError(String... msgs) { + super.throwModCompatibilityError(msgs); //To change body of generated methods, choose Tools | Templates. + } + + } diff --git a/src/main/java/com/enderio/core/client/EnderCoreModConflictException.java b/src/main/java/com/enderio/core/client/EnderCoreModConflictException.java new file mode 100644 index 0000000..5e077d7 --- /dev/null +++ b/src/main/java/com/enderio/core/client/EnderCoreModConflictException.java @@ -0,0 +1,31 @@ +package com.enderio.core.client; + +import cpw.mods.fml.client.CustomModLoadingErrorDisplayException; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiErrorScreen; + +@SideOnly(Side.CLIENT) +public class EnderCoreModConflictException extends CustomModLoadingErrorDisplayException { + + private final String[] msgs; + + public EnderCoreModConflictException(String[] msgs) { + this.msgs = msgs; + } + + @Override + public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) { + } + + @Override + public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY, float tickTime) { + int y = errorScreen.height / 2 - msgs.length * 5; + for(String msg : msgs) { + errorScreen.drawCenteredString(fontRenderer, msg, errorScreen.width / 2, y, 0xFFFFFF); + y += 10; + } + } +} diff --git a/src/main/java/com/enderio/core/common/CommonProxy.java b/src/main/java/com/enderio/core/common/CommonProxy.java index cb02f6c..2bb7241 100644 --- a/src/main/java/com/enderio/core/common/CommonProxy.java +++ b/src/main/java/com/enderio/core/common/CommonProxy.java @@ -20,4 +20,15 @@ public class CommonProxy { public World getClientWorld() { return null; } + + public void throwModCompatibilityError(String ... msgs) { + StringBuilder sb = new StringBuilder(); + for(String msg : msgs) { + if(sb.length() > 0) { + sb.append("\n"); + } + sb.append(msg); + } + throw new RuntimeException(sb.toString()); + } }