Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

This commit is contained in:
Florian Nücke 2014-07-29 14:51:19 +02:00
commit e38309df8b

View File

@ -56,13 +56,15 @@ object Mods {
def isAvailable: Boolean def isAvailable: Boolean
} }
class SimpleMod(val id: String) { class SimpleMod(val id: String) extends Mod {
val isAvailable = { protected val isModLoaded = {
val version = VersionParser.parseVersionReference(id) val version = VersionParser.parseVersionReference(id)
if (Loader.isModLoaded(version.getLabel)) if (Loader.isModLoaded(version.getLabel))
version.containsVersion(Loader.instance.getIndexedModList.get(version.getLabel).getProcessedVersion) version.containsVersion(Loader.instance.getIndexedModList.get(version.getLabel).getProcessedVersion)
else ModAPIManager.INSTANCE.hasAPI(version.getLabel) else ModAPIManager.INSTANCE.hasAPI(version.getLabel)
} }
override def isAvailable = isModLoaded
} }
} }