A few tweaks, things are starting to work now..

This commit is contained in:
cpw committed 2015-11-13 02:59:43 -05:00
1 parent da03639bd7
commit fe7f713b67
8 files changed
+22 -59

No files matched your search

@@ -89,14 +89,14 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC
ModMetadata meta = getMetadata();
meta.modId = "Forge";
meta.name = "Minecraft Forge";
meta.version = String.format("%d.%d.%d.%d", majorVersion, minorVersion, revisionVersion, buildVersion);
meta.version = ForgeVersion.getVersion();
meta.credits = "Made possible with help from many people";
meta.authorList = Arrays.asList("LexManos", "Cpw");
meta.authorList = Arrays.asList("LexManos", "cpw");
meta.description = "Minecraft Forge is a common open source API allowing a broad range of mods " +
"to work cooperatively together. It allows many mods to be created without " +
"them editing the main Minecraft code.";
meta.url = "http://MinecraftForge.net";
meta.updateUrl = "http://MinecraftForge.net/forum/index.php/topic,5.0.html";
meta.url = "http://minecraftforge.net";
meta.updateUrl = "http://minecraftforge.net/forum/index.php/topic,5.0.html";
meta.screenshots = new String[0];
meta.logoFile = "/forge_logo.png";
try {
@@ -39,9 +39,9 @@ public class ForgeVersion
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
public static final int buildVersion = 0;
// This is the minecraft version we're building for - used in various places in Forge/FML code
public static final String mcVersion = "1.8";
public static final String mcVersion = "1.8.8";
// This is the MCP data version we're using
public static final String mcpVersion = "9.10";
public static final String mcpVersion = "9.18";
private static Status status = PENDING;
private static String target = null;
@@ -166,9 +166,4 @@ public class MinecraftForge
// Load before all the mods, so MC owns the MC fluids
FluidRegistry.validateFluidRegistry();
}
public static String getBrandingVersion()
{
return "Minecraft Forge "+ ForgeVersion.getVersion();
}
}
@@ -49,6 +49,8 @@ import net.minecraft.util.IThreadListener;
import net.minecraft.world.World;
import net.minecraft.world.storage.SaveHandler;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.EventBus;
import net.minecraftforge.fml.common.gameevent.InputEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
@@ -143,10 +145,8 @@ public class FMLCommonHandler
public void beginLoading(IFMLSidedHandler handler)
{
sidedDelegate = handler;
FMLLog.log("MinecraftForge", Level.INFO, "Attempting early MinecraftForge initialization");
callForgeMethod("initialize");
callForgeMethod("registerCrashCallable");
FMLLog.log("MinecraftForge", Level.INFO, "Completed early MinecraftForge initialization");
MinecraftForge.initialize();
// MinecraftForge.registerCrashCallable();
}
/**
@@ -213,34 +213,6 @@ public class FMLCommonHandler
}
private Class<?> findMinecraftForge()
{
if (forge==null && !noForge)
{
try {
forge = Class.forName("net.minecraftforge.common.MinecraftForge");
} catch (Exception ex) {
noForge = true;
}
}
return forge;
}
private Object callForgeMethod(String method)
{
if (noForge)
return null;
try
{
return findMinecraftForge().getMethod(method).invoke(null);
}
catch (Exception e)
{
// No Forge installation
return null;
}
}
public void computeBranding()
{
if (brandings == null)
@@ -248,12 +220,7 @@ public class FMLCommonHandler
Builder<String> brd = ImmutableList.<String>builder();
brd.add(Loader.instance().getMCVersionString());
brd.add(Loader.instance().getMCPVersionString());
brd.add("FML v"+Loader.instance().getFMLVersionString());
String forgeBranding = (String) callForgeMethod("getBrandingVersion");
if (!Strings.isNullOrEmpty(forgeBranding))
{
brd.add(forgeBranding);
}
brd.add("Powered by Forge " + ForgeVersion.getVersion());
if (sidedDelegate!=null)
{
brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
@@ -114,7 +114,7 @@ import com.google.gson.JsonParser;
*/
public class Loader
{
public static final String MC_VERSION = "1.8";
public static final String MC_VERSION = "1.8.8";
private static final Splitter DEPENDENCYPARTSPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
private static final Splitter DEPENDENCYSPLITTER = Splitter.on(";").omitEmptyStrings().trimResults();
/**
@@ -833,7 +833,7 @@ public class Loader
public String getMCPVersionString()
{
return String.format("MCP v%s", mcpversion);
return String.format("MCP %s", mcpversion);
}
public void serverStopped()