AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Not making mod integration depend on whether power use is enabled or not... closes #992.

Browse Source
This commit is contained in:
Florian Nücke 2015-03-31 18:09:08 +02:00
parent ef86ca01c8
commit 221f42bb2e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/integration/Mod.java
View File

@ -3,7 +3,7 @@ package li.cil.oc.integration;
public interface Mod { public interface Mod {
String id(); String id();
boolean isAvailable(); boolean isModAvailable();
boolean providesPower(); boolean providesPower();
} }

16
src/main/scala/li/cil/oc/integration/Mods.scala
View File

@ -56,10 +56,12 @@ object Mods {
val StargateTech2 = new ModBase { val StargateTech2 = new ModBase {
def id = IDs.StargateTech2 def id = IDs.StargateTech2
protected override lazy val isModAvailable = Loader.isModLoaded(IDs.StargateTech2) && { private lazy val isModAvailable_ = Loader.isModLoaded(IDs.StargateTech2) && {
val mod = Loader.instance.getIndexedModList.get(IDs.StargateTech2) val mod = Loader.instance.getIndexedModList.get(IDs.StargateTech2)
mod.getVersion.startsWith("0.7.") mod.getVersion.startsWith("0.7.")
} }
override def isModAvailable: Boolean = isModAvailable_
} }
val Thaumcraft = new SimpleMod(IDs.Thaumcraft) val Thaumcraft = new SimpleMod(IDs.Thaumcraft)
val ThermalExpansion = new SimpleMod(IDs.ThermalExpansion, providesPower = true) val ThermalExpansion = new SimpleMod(IDs.ThermalExpansion, providesPower = true)
@ -121,7 +123,7 @@ object Mods {
private def tryInit(mod: ModProxy) { private def tryInit(mod: ModProxy) {
val isBlacklisted = Settings.get.modBlacklist.contains(mod.getMod.id) val isBlacklisted = Settings.get.modBlacklist.contains(mod.getMod.id)
val alwaysEnabled = mod.getMod == null || mod.getMod == Mods.Minecraft val alwaysEnabled = mod.getMod == null || mod.getMod == Mods.Minecraft
if (!isBlacklisted && (alwaysEnabled || mod.getMod.isAvailable) && handlers.add(mod)) { if (!isBlacklisted && (alwaysEnabled || mod.getMod.isModAvailable) && handlers.add(mod)) {
li.cil.oc.OpenComputers.log.info(s"Initializing mod integration for '${mod.getMod.id}'.") li.cil.oc.OpenComputers.log.info(s"Initializing mod integration for '${mod.getMod.id}'.")
try mod.initialize() catch { try mod.initialize() catch {
case e: Throwable => case e: Throwable =>
@ -188,7 +190,7 @@ object Mods {
protected lazy val isPowerModEnabled = !providesPower || (!Settings.get.pureIgnorePower && !Settings.get.powerModBlacklist.contains(id)) protected lazy val isPowerModEnabled = !providesPower || (!Settings.get.pureIgnorePower && !Settings.get.powerModBlacklist.contains(id))
protected def isModAvailable: Boolean def isModAvailable: Boolean
def id: String def id: String
@ -206,18 +208,22 @@ object Mods {
} }
class SimpleMod(val id: String, override val providesPower: Boolean = false, version: String = "") extends ModBase { class SimpleMod(val id: String, override val providesPower: Boolean = false, version: String = "") extends ModBase {
override protected lazy val isModAvailable = { private lazy val isModAvailable_ = {
val version = VersionParser.parseVersionReference(id + this.version) val version = VersionParser.parseVersionReference(id + this.version)
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)
} }
def isModAvailable = isModAvailable_
} }
class ClassBasedMod(val id: String, val classNames: String*)(override val providesPower: Boolean = false) extends ModBase { class ClassBasedMod(val id: String, val classNames: String*)(override val providesPower: Boolean = false) extends ModBase {
override protected lazy val isModAvailable = classNames.forall(className => try Class.forName(className) != null catch { private lazy val isModAvailable_ = classNames.forall(className => try Class.forName(className) != null catch {
case _: Throwable => false case _: Throwable => false
}) })
def isModAvailable = isModAvailable_
} }
} }