keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix ModLoader compilation, and MCPmerger invocation for Forge.

This commit is contained in:
LexManos 2012-08-09 03:04:25 -07:00
parent 3d26511322
commit 859ebae365
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fml/client/net/minecraft/src/ModLoader.java
View File

@ -561,7 +561,7 @@ public class ModLoader
*/
public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id)
{
EntityRegistry.registerEntityID(entityClass, entityName, id);
EntityRegistry.registerGlobalEntityID(entityClass, entityName, id);
}
/**
@ -575,7 +575,7 @@ public class ModLoader
*/
public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground)
{
EntityRegistry.registerEntityID(entityClass, entityName, id, background, foreground);
EntityRegistry.registerGlobalEntityID(entityClass, entityName, id, background, foreground);
}
public static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat)

5
fml/install/fml.py
View File

@ -173,11 +173,6 @@ def setup_fml(fml_dir, mcp_dir):
#Run MCPMerger
forkcmd = ('%s -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.MCPMerger "{mergecfg}" "{client}" "{server}"' % self.cmdjava).format(
classpath=os.pathsep.join([os.path.join(mcp_dir, 'lib', '*'), binDir]), mergecfg=os.path.join(fml_dir, 'mcp_merge.cfg'), client=jars[CLIENT], server=jars[SERVER])
forge_cfg = os.path.join(mcp_dir, 'forge', 'common', 'forge_at.cfg')
if os.path.isfile(forge_cfg):
forkcmd += ' "%s"' % forge_cfg
self.runcmd(forkcmd)
#Run AccessTransformer

4
fml/server/net/minecraft/src/ModLoader.java
View File

@ -538,7 +538,7 @@ public class ModLoader
*/
public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id)
{
EntityRegistry.registerEntityID(entityClass, entityName, id);
EntityRegistry.registerGlobalEntityID(entityClass, entityName, id);
}
/**
@ -552,7 +552,7 @@ public class ModLoader
*/
public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground)
{
EntityRegistry.registerEntityID(entityClass, entityName, id, background, foreground);
EntityRegistry.registerGlobalEntityID(entityClass, entityName, id, background, foreground);
}
public static void registerKey(BaseMod mod, Object keyHandler, boolean allowRepeat)