From a85bb7bfdb56339f632f55c5368cf61646d10fbd Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 9 Aug 2012 03:04:25 -0700 Subject: [PATCH] Fix ModLoader compilation, and MCPmerger invocation for Forge. --- client/net/minecraft/src/ModLoader.java | 4 ++-- install/fml.py | 5 ----- server/net/minecraft/src/ModLoader.java | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/client/net/minecraft/src/ModLoader.java b/client/net/minecraft/src/ModLoader.java index 4dda3ec4a9..8c82bcbc68 100644 --- a/client/net/minecraft/src/ModLoader.java +++ b/client/net/minecraft/src/ModLoader.java @@ -561,7 +561,7 @@ public class ModLoader */ public static void registerEntityID(Class 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 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) diff --git a/install/fml.py b/install/fml.py index 49f9424e11..38c7d55137 100644 --- a/install/fml.py +++ b/install/fml.py @@ -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 diff --git a/server/net/minecraft/src/ModLoader.java b/server/net/minecraft/src/ModLoader.java index 6359631977..9685b378b4 100644 --- a/server/net/minecraft/src/ModLoader.java +++ b/server/net/minecraft/src/ModLoader.java @@ -538,7 +538,7 @@ public class ModLoader */ public static void registerEntityID(Class 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 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)