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

Conflicts:
	src/main/scala/li/cil/oc/util/mods/Mods.scala
This commit is contained in:
Florian Nücke 2014-07-29 14:50:53 +02:00
commit a5711aba3b

View File

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