MightyPirates · fnuecke · Jan 4, 2016 · Jan 3, 2016 · Jan 3, 2016 · fnuecke
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -1317,6 +1317,10 @@ opencomputers {
     # such as the redstone card and redstone I/O block. Lowering this can
     # have very negative impact on server TPS, so beware.
     redstoneDelay: 0.1
+
+    # The maximum range between the drone/robot and a villager for a trade to
+    # be performed by the trading upgrade
+    tradingRange: 8.0
   }
 
   # Settings for mod integration (the mod previously known as OpenComponents).

diff --git a/src/main/resources/assets/opencomputers/lang/de_DE.lang b/src/main/resources/assets/opencomputers/lang/de_DE.lang
@@ -145,6 +145,7 @@ item.oc.UpgradeSolarGenerator.name=Solargenerator-Upgrade
 item.oc.UpgradeTank.name=Tank-Upgrade
 item.oc.UpgradeTankController.name=Tankbedienungs-Upgrade
 item.oc.UpgradeTractorBeam.name=Traktorstrahl-Upgrade
+item.oc.UpgradeTrading.name=Handels-Upgrade
 item.oc.WirelessNetworkCard.name=Drahtlosnetzwerkkarte
 item.oc.WorldSensorCard.name=Weltsensorkarte
 item.oc.wrench.name=Schraubenziehschlüssel

diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang
@@ -150,6 +150,7 @@ item.oc.UpgradeSolarGenerator.name=Solar Generator Upgrade
 item.oc.UpgradeTank.name=Tank Upgrade
 item.oc.UpgradeTankController.name=Tank Controller Upgrade
 item.oc.UpgradeTractorBeam.name=Tractor Beam Upgrade
+item.oc.UpgradeTrading.name=Trading Upgrade
 item.oc.WirelessNetworkCard.name=Wireless Network Card
 item.oc.WorldSensorCard.name=World Sensor Card
 item.oc.wrench.name=Scrench

diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes
@@ -367,6 +367,12 @@ upgradeContainer3 {
           [ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
 }
 
+upgradeTrading {
+  input: [[ingotGold, chest, ingotGold]
+          [emerald, "oc:circuitChip2", emerald]
+          [dropper, "oc:materialCircuitBoardPrinted", craftingPiston]]
+}
+
 # Note: iron ingot and nugget recipes are *only* registered if no other mod
 # already provides the same functionality.
 nuggetIron {

diff --git a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
@@ -182,6 +182,12 @@ solarGeneratorUpgrade {
           ["oc:circuitChip3", "oc:generatorUpgrade", "oc:circuitChip3"]]
 }
 
+upgradeTrading {
+  input: [["oc:circuitChip2", chest, "oc:circuitChip2"]
+          [emerald, "oc:circuitChip2", emerald]
+          [dropper, "oc:materialCircuitBoardPrinted", craftingPiston]]
+}
+
 nuggetIron {
   type: shapeless
   input: ingotIron

diff --git a/src/main/resources/assets/opencomputers/textures/items/UpgradeTrading.png b/src/main/resources/assets/opencomputers/textures/items/UpgradeTrading.png
diff --git a/src/main/scala/li/cil/oc/Constants.scala b/src/main/scala/li/cil/oc/Constants.scala
@@ -154,6 +154,7 @@ object Constants {
     final val TerminalServer = "terminalServer"
     final val TexturePicker = "texturePicker"
     final val TractorBeamUpgrade = "tractorBeamUpgrade"
+    final val TradingUpgrade = "upgradeTrading"
     final val Transistor = "transistor"
     final val UpgradeContainerTier1 = "upgradeContainer1"
     final val UpgradeContainerTier2 = "upgradeContainer2"

diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala
@@ -342,6 +342,7 @@ class Settings(val config: Config) {
   val dataCardTimeout = config.getDouble("misc.dataCardTimeout") max 0
   val serverRackSwitchTier = (config.getInt("misc.serverRackSwitchTier") - 1) max Tier.None min Tier.Three
   val redstoneDelay = config.getDouble("misc.redstoneDelay") max 0
+  val tradingRange = config.getDouble("misc.tradingRange") max 0
 
   // ----------------------------------------------------------------------- //
   // nanomachines

diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala
@@ -533,6 +533,8 @@ object Items extends ItemAPI {
     Recipes.addSubItem(new item.TerminalServer(multi), Constants.ItemName.TerminalServer, "oc:terminalServer")
     Recipes.addSubItem(new item.DiskDriveMountable(multi), Constants.ItemName.DiskDriveMountable, "oc:diskDriveMountable")
 
+    Recipes.addSubItem(new item.UpgradeTrading(multi), Constants.ItemName.TradingUpgrade, "oc:upgradeTrading")
+
     // Register aliases.
     for ((k, v) <- aliases) {
       descriptors.getOrElseUpdate(k, descriptors(v))

diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeTrading.scala b/src/main/scala/li/cil/oc/common/item/UpgradeTrading.scala
@@ -0,0 +1,3 @@
+package li.cil.oc.common.item
+
+class UpgradeTrading(val parent: Delegator) extends traits.Delegate with traits.ItemTier
diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverUpgradeTrading.scala b/src/main/scala/li/cil/oc/integration/opencomputers/DriverUpgradeTrading.scala
@@ -0,0 +1,37 @@
+package li.cil.oc.integration.opencomputers
+
+import li.cil.oc.api
+import li.cil.oc.Constants
+import li.cil.oc.api.driver.EnvironmentProvider
+import li.cil.oc.api.network.EnvironmentHost
+import li.cil.oc.api.driver.item.HostAware
+import li.cil.oc.common.{Tier, Slot}
+import li.cil.oc.server.component.UpgradeTrading
+import net.minecraft.item.ItemStack
+import li.cil.oc.common.entity.Drone
+import li.cil.oc.common.tileentity.Robot
+import li.cil.oc.server.component
+
+object DriverUpgradeTrading extends Item with HostAware {
+  override def worksWith(stack: ItemStack) = isOneOf(stack,
+    api.Items.get(Constants.ItemName.TradingUpgrade))
+
+  override def createEnvironment(stack: ItemStack, host: EnvironmentHost) =
+    if (host.world.isRemote) null
+    else host match {
+      case host: EnvironmentHost with Robot => new UpgradeTrading(host)
+      case host: EnvironmentHost with Drone => new UpgradeTrading(host)
+      case _ => null
+    }
+
+  override def slot(stack: ItemStack) = Slot.Upgrade
+
+  override def tier(stack: ItemStack) = Tier.Two
+
+  object Provider extends EnvironmentProvider {
+    override def getEnvironment(stack: ItemStack): Class[_] =
+      if (worksWith(stack))
+        classOf[component.UpgradeTrading]
+      else null
+  }
+}
diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala b/src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
@@ -146,6 +146,7 @@ object ModOpenComputers extends ModProxy {
     api.Driver.add(DriverUpgradeTank)
     api.Driver.add(DriverUpgradeTankController)
     api.Driver.add(DriverUpgradeTractorBeam)
+    api.Driver.add(DriverUpgradeTrading)
 
     api.Driver.add(DriverAPU.Provider)
     api.Driver.add(DriverDataCard.Provider)
@@ -200,7 +201,8 @@ object ModOpenComputers extends ModProxy {
       Constants.ItemName.SolarGeneratorUpgrade,
       Constants.ItemName.TankUpgrade,
       Constants.ItemName.TractorBeamUpgrade,
-      Constants.ItemName.LeashUpgrade)
+      Constants.ItemName.LeashUpgrade,
+      Constants.ItemName.TradingUpgrade)
     blacklistHost(classOf[internal.Drone],
       Constants.BlockName.Keyboard,
       Constants.BlockName.ScreenTier1,
@@ -240,7 +242,8 @@ object ModOpenComputers extends ModProxy {
       Constants.ItemName.TankUpgrade,
       Constants.ItemName.TankControllerUpgrade,
       Constants.ItemName.TractorBeamUpgrade,
-      Constants.ItemName.LeashUpgrade)
+      Constants.ItemName.LeashUpgrade,
+      Constants.ItemName.TradingUpgrade)
     blacklistHost(classOf[internal.Robot],
       Constants.BlockName.Transposer,
       Constants.ItemName.LeashUpgrade)
@@ -263,7 +266,8 @@ object ModOpenComputers extends ModProxy {
       Constants.ItemName.InventoryControllerUpgrade,
       Constants.ItemName.TankUpgrade,
       Constants.ItemName.TankControllerUpgrade,
-      Constants.ItemName.LeashUpgrade)
+      Constants.ItemName.LeashUpgrade,
+      Constants.ItemName.TradingUpgrade)
 
     if (!WirelessRedstone.isAvailable) {
       blacklistHost(classOf[internal.Drone], Constants.ItemName.RedstoneCardTier2)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package li.cil.oc.common.item

		class UpgradeTrading(val parent: Delegator) extends traits.Delegate with traits.ItemTier