Update for release 1.7.10

This commit is contained in:
cpw committed 2014-06-26 14:48:46 -04:00
1 parent 1e0134a1ca
commit 1c5db211af
10 files changed
+4923 -19350

No files matched your search

@@ -104,6 +104,7 @@ import cpw.mods.fml.relauncher.Side;
*/
public class Loader
{
public static final String MC_VERSION = "1.7.10";
private static final Splitter DEPENDENCYPARTSPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
private static final Splitter DEPENDENCYSPLITTER = Splitter.on(";").omitEmptyStrings().trimResults();
/**
@@ -177,14 +178,13 @@ public class Loader
private Loader()
{
modClassLoader = new ModClassLoader(getClass().getClassLoader());
String actualMCVersion = "1.7.10-pre4";
if (!mccversion.equals(actualMCVersion))
if (!mccversion.equals(MC_VERSION))
{
FMLLog.severe("This version of FML is built for Minecraft %s, we have detected Minecraft %s in your minecraft jar file", mccversion, actualMCVersion);
FMLLog.severe("This version of FML is built for Minecraft %s, we have detected Minecraft %s in your minecraft jar file", mccversion, MC_VERSION);
throw new LoaderException();
}
minecraft = new MinecraftDummyContainer(actualMCVersion);
minecraft = new MinecraftDummyContainer(MC_VERSION);
mcp = new MCPDummyContainer(MetadataCollection.from(getClass().getResourceAsStream("/mcpmod.info"), "MCP").getMetadataForId("mcp", null));
}