AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian Nücke 2014-07-29 14:50:21 +02:00
commit e05c66e098
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/scala/li/cil/oc/util/mods/Mods.scala
View File

@ -29,15 +29,15 @@ object Mods {
val BattleGear2 = new SimpleMod(IDs.BattleGear2) val BattleGear2 = new SimpleMod(IDs.BattleGear2)
val BuildCraftPower = new SimpleMod(IDs.BuildCraftPower) val BuildCraftPower = new SimpleMod(IDs.BuildCraftPower)
val ComputerCraft15 = new Mod { val ComputerCraft15 = new SimpleMod(IDs.ComputerCraft) {
val isAvailable = try Class.forName("dan200.computer.api.ComputerCraftAPI") != null catch { override val isAvailable = isModLoaded && (try Class.forName("dan200.computer.api.ComputerCraftAPI") != null catch {
case _: Throwable => false case _: Throwable => false
} })
} }
val ComputerCraft16 = new Mod { val ComputerCraft16 = new SimpleMod(IDs.ComputerCraft) {
val isAvailable = try Class.forName("dan200.computercraft.api.ComputerCraftAPI") != null catch { override val isAvailable = isModLoaded && (try Class.forName("dan200.computercraft.api.ComputerCraftAPI") != null catch {
case _: Throwable => false case _: Throwable => false
} })
} }
val ComputerCraft = new Mod { val ComputerCraft = new Mod {
override def isAvailable = ComputerCraft15.isAvailable || ComputerCraft16.isAvailable override def isAvailable = ComputerCraft15.isAvailable || ComputerCraft16.isAvailable
@ -68,13 +68,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
} }
} }