From 78d6ea15d2323a723ed9d9fae81848de800807c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Wed, 28 Jan 2015 22:17:01 +0100
Subject: [PATCH] Added setting for whether to enable command block driver or
 not; defaulting to false.

---
 src/main/resources/application.conf                          | 5 +++++
 src/main/scala/li/cil/oc/Settings.scala                      | 1 +
 .../scala/li/cil/oc/integration/vanilla/ModVanilla.scala     | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index ec5211626..dbb7c3e1d 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -1039,6 +1039,11 @@ opencomputers {
       # an adapter has pretty much the same effect.
       enableTankDriver: false
 
+      # Whether to enable the command block driver. Enabling this allows
+      # computers to set and execute commands via command blocks next to
+      # adapter blocks. The commands are run using OC's general fake player.
+      enableCommandBlockDriver: false
+
       # Whether to allow the item stack converter to push NBT data in
       # compressed format (GZIP'ed). This can be useful for pushing this
       # data back to other callbacks. However, given a sophisticated
diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala
index dac54c017..8f78d37e3 100644
--- a/src/main/scala/li/cil/oc/Settings.scala
+++ b/src/main/scala/li/cil/oc/Settings.scala
@@ -304,6 +304,7 @@ class Settings(val config: Config) {
   // integration.vanilla
   val enableInventoryDriver = config.getBoolean("integration.vanilla.enableInventoryDriver")
   val enableTankDriver = config.getBoolean("integration.vanilla.enableTankDriver")
+  val enableCommandBlockDriver = config.getBoolean("integration.vanilla.enableCommandBlockDriver")
   val allowItemStackNBTTags = config.getBoolean("integration.vanilla.allowItemStackNBTTags")
 
   // ----------------------------------------------------------------------- //
diff --git a/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala b/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
index 27550d357..cf98113bf 100644
--- a/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
+++ b/src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
@@ -11,7 +11,6 @@ object ModVanilla extends ModProxy {
   def initialize() {
     Driver.add(new DriverBeacon)
     Driver.add(new DriverBrewingStand)
-    Driver.add(new DriverCommandBlock)
     Driver.add(new DriverComparator)
     Driver.add(new DriverFurnace)
     Driver.add(new DriverMobSpawner)
@@ -25,6 +24,9 @@ object ModVanilla extends ModProxy {
       Driver.add(new DriverFluidHandler)
       Driver.add(new DriverFluidTank)
     }
+    if (Settings.get.enableCommandBlockDriver) {
+      Driver.add(new DriverCommandBlock)
+    }
 
     Driver.add(ConverterFluidStack)
     Driver.add(ConverterFluidTankInfo)