Fix ModLoader compilation, and MCPmerger invocation for Forge.
This commit is contained in:
parent
3d26511322
commit
859ebae365
|
@ -561,7 +561,7 @@ public class ModLoader
|
||||||
*/
|
*/
|
||||||
public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id)
|
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)
|
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)
|
public static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat)
|
||||||
|
|
|
@ -173,11 +173,6 @@ def setup_fml(fml_dir, mcp_dir):
|
||||||
#Run MCPMerger
|
#Run MCPMerger
|
||||||
forkcmd = ('%s -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.MCPMerger "{mergecfg}" "{client}" "{server}"' % self.cmdjava).format(
|
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])
|
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)
|
self.runcmd(forkcmd)
|
||||||
|
|
||||||
#Run AccessTransformer
|
#Run AccessTransformer
|
||||||
|
|
|
@ -538,7 +538,7 @@ public class ModLoader
|
||||||
*/
|
*/
|
||||||
public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id)
|
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)
|
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)
|
public static void registerKey(BaseMod mod, Object keyHandler, boolean allowRepeat)
|
||||||
|
|
Loading…
Reference in New Issue