Fix up handing corrupt mcmod.info

This commit is contained in:
Christian committed 2012-08-23 16:43:28 -04:00
1 parent 6bc6defb07
commit 6396beaef7
4 files changed
+14 -7

No files matched your search

@@ -124,7 +124,7 @@ public class FMLClientHandler implements IFMLSidedHandler
Class<?> optifineConfig = Class.forName("Config", false, Loader.instance().getModClassLoader()); Class<?> optifineConfig = Class.forName("Config", false, Loader.instance().getModClassLoader());
String optifineVersion = (String) optifineConfig.getField("VERSION").get(null); String optifineVersion = (String) optifineConfig.getField("VERSION").get(null);
Map<String,Object> dummyOptifineMeta = ImmutableMap.<String,Object>builder().put("name", "Optifine").put("version", optifineVersion).build(); Map<String,Object> dummyOptifineMeta = ImmutableMap.<String,Object>builder().put("name", "Optifine").put("version", optifineVersion).build();
ModMetadata optifineMetadata = MetadataCollection.from(getClass().getResourceAsStream("optifinemod.info")).getMetadataForId("optifine", dummyOptifineMeta); ModMetadata optifineMetadata = MetadataCollection.from(getClass().getResourceAsStream("optifinemod.info"),"optifine").getMetadataForId("optifine", dummyOptifineMeta);
optifineContainer = new DummyModContainer(optifineMetadata); optifineContainer = new DummyModContainer(optifineMetadata);
FMLLog.info("Forge Mod Loader has detected optifine %s, enabling compatibility features",optifineContainer.getVersion()); FMLLog.info("Forge Mod Loader has detected optifine %s, enabling compatibility features",optifineContainer.getVersion());
} }
@@ -3,10 +3,12 @@ package cpw.mods.fml.common;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import argo.jdom.JdomParser; import argo.jdom.JdomParser;
import argo.jdom.JsonNode; import argo.jdom.JsonNode;
import argo.jdom.JsonRootNode; import argo.jdom.JsonRootNode;
import argo.saj.InvalidSyntaxException;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@@ -17,13 +19,13 @@ public class MetadataCollection
private Map<String, ModMetadata> metadatas = Maps.newHashMap(); private Map<String, ModMetadata> metadatas = Maps.newHashMap();
private int metadataVersion = 1; private int metadataVersion = 1;
public static MetadataCollection from(InputStream inputStream) public static MetadataCollection from(InputStream inputStream, String sourceName)
{ {
if (inputStream == null) if (inputStream == null)
{ {
return new MetadataCollection(); return new MetadataCollection();
} }
InputStreamReader reader = new InputStreamReader(inputStream); InputStreamReader reader = new InputStreamReader(inputStream);
try try
{ {
@@ -37,6 +39,11 @@ public class MetadataCollection
return parseModInfo(root); return parseModInfo(root);
} }
} }
catch (InvalidSyntaxException e)
{
FMLLog.log(Level.SEVERE, e, "The mcmod.info file in %s cannot be parsed as valid JSON. It will be ignored", sourceName);
return null;
}
catch (Exception e) catch (Exception e)
{ {
throw Throwables.propagate(e); throw Throwables.propagate(e);
@@ -53,13 +53,13 @@ public class DirectoryDiscoverer implements ITypeDiscoverer
try try
{ {
FileInputStream fis = new FileInputStream(metadata); FileInputStream fis = new FileInputStream(metadata);
mc = MetadataCollection.from(fis); mc = MetadataCollection.from(fis,modDir.getName());
fis.close(); fis.close();
FMLLog.fine("Found an mcmod.info file in directory %s", modDir.getName()); FMLLog.fine("Found an mcmod.info file in directory %s", modDir.getName());
} }
catch (Exception e) catch (Exception e)
{ {
mc = MetadataCollection.from(null); mc = MetadataCollection.from(null,"");
FMLLog.info("No mcmod.info file found in directory %s", modDir.getName()); FMLLog.info("No mcmod.info file found in directory %s", modDir.getName());
} }
} }
@@ -33,12 +33,12 @@ public class JarDiscoverer implements ITypeDiscoverer
if (modInfo != null) if (modInfo != null)
{ {
FMLLog.finer("Located mcmod.info file in file %s", candidate.getModContainer().getName()); FMLLog.finer("Located mcmod.info file in file %s", candidate.getModContainer().getName());
mc = MetadataCollection.from(jar.getInputStream(modInfo)); mc = MetadataCollection.from(jar.getInputStream(modInfo), candidate.getModContainer().getName());
} }
else else
{ {
FMLLog.info("The mod container %s appears to be missing an mcmod.info file", candidate.getModContainer().getName()); FMLLog.info("The mod container %s appears to be missing an mcmod.info file", candidate.getModContainer().getName());
mc = MetadataCollection.from(null); mc = MetadataCollection.from(null, "");
} }
for (ZipEntry ze : Collections.list(jar.entries())) for (ZipEntry ze : Collections.list(jar.entries()))
{ {