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

Add in the capability to read an internal version as <modid>.version from a file 

in the zip call version.properties. Handy for autobuilding scripts.
This commit is contained in:
Christian 2012-09-16 21:05:11 -04:00
parent e619e00079
commit 83a57f5259
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fml/common/cpw/mods/fml/common/FMLModContainer.java
View File

@ -13,6 +13,7 @@
package cpw.mods.fml.common;
import java.io.File;
import java.io.FileInputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@ -20,8 +21,12 @@ import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.logging.Level;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
import com.google.common.base.Function;
import com.google.common.base.Strings;
@ -150,6 +155,10 @@ public class FMLModContainer implements ModContainer
modMetadata.name = getModId();
}
internalVersion = (String) descriptor.get("version");
if (Strings.isNullOrEmpty(internalVersion) && getSource().isFile())
{
internalVersion = searchForVersionProperties();
}
if (Strings.isNullOrEmpty(internalVersion) && !Strings.isNullOrEmpty(modMetadata.version))
{
FMLLog.warning("Mod %s is missing the required element 'version'. Falling back to metadata version %s", getModId(), modMetadata.version);
@ -162,6 +171,32 @@ public class FMLModContainer implements ModContainer
}
}
private String searchForVersionProperties()
{
try
{
FMLLog.fine("Attempting to load the file version.properties and from %s locate a version", getSource().getName());
String version = null;
ZipFile source = new ZipFile(getSource());
ZipEntry versionFile = source.getEntry("version.properties");
if (versionFile!=null)
{
Properties versionProps = new Properties();
versionProps.load(source.getInputStream(versionFile));
version = versionProps.getProperty(getModId()+".version");
FMLLog.fine("Found version %s for mod %s in version.properties", version, getModId());
}
source.close();
return version;
}
catch (Exception e)
{
Throwables.propagateIfPossible(e);
FMLLog.fine("Failed to find a usable version.properties file");
return null;
}
}
@Override
public void setEnabledState(boolean enabled)
{