diff --git a/fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java b/fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java index 970021a3f0..e922a26f2a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java +++ b/fml/src/main/java/cpw/mods/fml/common/ModContainerFactory.java @@ -13,21 +13,44 @@ package cpw.mods.fml.common; import java.io.File; +import java.lang.reflect.Constructor; +import java.util.Map; import java.util.regex.Pattern; +import org.apache.logging.log4j.Level; import org.objectweb.asm.Type; +import com.google.common.base.Throwables; +import com.google.common.collect.Maps; + import cpw.mods.fml.common.discovery.ModCandidate; import cpw.mods.fml.common.discovery.asm.ASMModParser; import cpw.mods.fml.common.discovery.asm.ModAnnotation; public class ModContainerFactory { + public static Map> modTypes = Maps.newHashMap(); private static Pattern modClass = Pattern.compile(".*(\\.|)(mod\\_[^\\s$]+)$"); private static ModContainerFactory INSTANCE = new ModContainerFactory(); + + private ModContainerFactory() { + // We always know about Mod type + registerContainerType(Type.getType(Mod.class), FMLModContainer.class); + } public static ModContainerFactory instance() { return INSTANCE; } + + public void registerContainerType(Type type, Class container) + { + try { + Constructor constructor = container.getConstructor(new Class[] { String.class, ModCandidate.class, Map.class }); + modTypes.put(type, constructor); + } catch (Exception e) { + FMLLog.log(Level.ERROR, e, "Critical error : cannot register mod container type %s, it has an invalid constructor"); + Throwables.propagate(e); + } + } public ModContainer build(ASMModParser modParser, File modSource, ModCandidate container) { String className = modParser.getASMType().getClassName(); @@ -49,10 +72,15 @@ public class ModContainerFactory for (ModAnnotation ann : modParser.getAnnotations()) { - if (ann.getASMType().equals(Type.getType(Mod.class))) + if (modTypes.containsKey(ann.getASMType())) { - FMLLog.fine("Identified an FMLMod type mod %s", className); - return new FMLModContainer(className, container, ann.getValues()); + FMLLog.fine("Identified a mod of type %s (%s) - loading", ann.getASMType(), className); + try { + return modTypes.get(ann.getASMType()).newInstance(className, container, ann.getValues()); + } catch (Exception e) { + FMLLog.log(Level.ERROR, e, "Unable to construct %s container", ann.getASMType().getClassName()); + return null; + } } }