Pulling a bunch of constants (item and block names for now) into a single class.

Minor rendering adjustments after updating Forge version.

(cherry picked from commit 707a5c728c9a7eba2648c2f3b89f6138e99c878a)

Conflicts:
	build.properties
	src/main/scala/li/cil/oc/CreativeTab.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/ExtendedBlockModel.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/PacketHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/component/Terminal.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/common/template/DroneTemplate.scala
	src/main/scala/li/cil/oc/common/template/MicrocontrollerTemplate.scala
	src/main/scala/li/cil/oc/common/template/NavigationUpgradeTemplate.scala
	src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
	src/main/scala/li/cil/oc/common/template/ServerTemplate.scala
	src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverLootDisk.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala

src/main/scala/li/cil/oc/Constants.scala

@@ -14,6 +14,7 @@ object Constants {
     final val CaseTier1 = "case1"
     final val CaseTier2 = "case2"
     final val CaseTier3 = "case3"
+    final val Chamelium = "chameliumBlock"
     final val Charger = "charger"
     final val Disassembler = "disassembler"
     final val DiskDrive = "diskDrive"
@@ -25,6 +26,8 @@ object Constants {
     final val MotionSensor = "motionSensor"
     final val PowerConverter = "powerConverter"
     final val PowerDistributor = "powerDistributor"
+    final val Print = "print"
+    final val Printer = "printer"
     final val Raid = "raid"
     final val Redstone = "redstone"
     final val Robot = "robot"
@@ -53,6 +56,7 @@ object Constants {
     final val CardContainerTier1 = "cardContainer1"
     final val CardContainerTier2 = "cardContainer2"
     final val CardContainerTier3 = "cardContainer3"
+    final val Chamelium = "chamelium"
     final val Chip1 = "chip1"
     final val Chip2 = "chip2"
     final val Chip3 = "chip3"
@@ -87,6 +91,8 @@ object Constants {
     final val HDDTier1 = "hdd1"
     final val HDDTier2 = "hdd2"
     final val HDDTier3 = "hdd3"
+    final val InkCartridge = "inkCartridge"
+    final val InkCartridgeEmpty = "inkCartridgeEmpty"
     final val InternetCard = "internetCard"
     final val Interweb = "interweb"
     final val InventoryControllerUpgrade = "inventoryControllerUpgrade"
@@ -94,6 +100,7 @@ object Constants {
     final val IronNugget = "nuggetIron"
     final val LeashUpgrade = "leashUpgrade"
     final val LinkedCard = "linkedCard"
+    final val LootDisk = "lootDisk"
     final val LuaBios = "luaBios"
     final val MicrocontrollerCaseCreative = "microcontrollerCaseCreative"
     final val MicrocontrollerCaseTier1 = "microcontrollerCase1"
@@ -101,7 +108,6 @@ object Constants {
     final val NavigationUpgrade = "navigationUpgrade"
     final val NetworkCard = "lanCard"
     final val NumPad = "numPad"
-    final val OpenOS = "openOS"
     final val PistonUpgrade = "pistonUpgrade"
     final val Present = "present"
     final val PrintedCircuitBoard = "printedCircuitBoard"

src/main/scala/li/cil/oc/OpenComputers.scala

@@ -21,7 +21,7 @@ object OpenComputers {
 
   final val Version = "@VERSION@"
 
-  var log = LogManager.getLogger("OpenComputers")
+  var log = LogManager.getLogger(Name)
 
   @SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy")
   var proxy: Proxy = null

src/main/scala/li/cil/oc/client/renderer/block/Print.scala

@@ -1,5 +1,6 @@
 package li.cil.oc.client.renderer.block
 
+import li.cil.oc.Constants
 import li.cil.oc.api.Items
 import li.cil.oc.common.block
 import li.cil.oc.common.item.data.PrintData
@@ -12,7 +13,7 @@ import net.minecraft.util.IIcon
 import net.minecraftforge.common.util.ForgeDirection
 
 object Print {
-  lazy val printBlock = Items.get("print").block().asInstanceOf[block.Print]
+  lazy val printBlock = Items.get(Constants.BlockName.Print).block().asInstanceOf[block.Print]
 
   def render(data: PrintData, state: Boolean, facing: ForgeDirection, x: Int, y: Int, z: Int, block: Block, renderer: RenderBlocks): Unit = {
     val shapes = if (state) data.stateOn else data.stateOff

src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala

@@ -38,8 +38,8 @@ object ItemRenderer extends IItemRenderer {
   lazy val drone = api.Items.get(Constants.ItemName.Drone)
 
   lazy val floppy = api.Items.get(Constants.ItemName.Floppy)
-  lazy val lootDisk = api.Items.get("lootDisk")
+  lazy val lootDisk = api.Items.get(Constants.ItemName.LootDisk)
-  lazy val print = api.Items.get("print")
+  lazy val print = api.Items.get(Constants.BlockName.Print)
 
   lazy val nullShape = new PrintData.Shape(ExtendedAABB.unitBounds, Settings.resourceDomain + ":White", Some(Color.Lime))
 

src/main/scala/li/cil/oc/common/Loot.scala

@@ -4,6 +4,7 @@ import java.io
 import java.util.Random
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent
+import li.cil.oc.Constants
 import li.cil.oc.OpenComputers
 import li.cil.oc.Settings
 import li.cil.oc.api
@@ -106,7 +107,7 @@ object Loot extends WeightedRandomChestContent(Items.createOpenOS(), 1, 1, Setti
       case _ =>
     }
 
-    val disk = api.Items.get("lootDisk").createItemStack(1)
+    val disk = api.Items.get(Constants.ItemName.LootDisk).createItemStack(1)
     disk.setTagCompound(tag)
 
     disk

src/main/scala/li/cil/oc/common/block/Item.scala

@@ -50,7 +50,7 @@ class Item(value: Block) extends ItemBlock(value) {
   override def getMetadata(itemDamage: Int) = itemDamage
 
   override def getItemStackDisplayName(stack: ItemStack): String = {
-    if (api.Items.get(stack) == api.Items.get("print")) {
+    if (api.Items.get(stack) == api.Items.get(Constants.BlockName.Print)) {
       val data = new PrintData(stack)
       data.label.getOrElse(super.getItemStackDisplayName(stack))
     }

src/main/scala/li/cil/oc/common/block/Microcontroller.scala

@@ -2,6 +2,7 @@ package li.cil.oc.common.block
 
 import java.util
 
+import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api
 import li.cil.oc.client.KeyBindings
@@ -82,7 +83,7 @@ class Microcontroller(protected implicit val tileTag: ClassTag[tileentity.Microc
         }
         true
       }
-      else if (api.Items.get(player.getHeldItem) == api.Items.get("eeprom")) {
+      else if (api.Items.get(player.getHeldItem) == api.Items.get(Constants.ItemName.EEPROM)) {
         if (!world.isRemote) {
           world.getTileEntity(x, y, z) match {
             case mcu: tileentity.Microcontroller =>

src/main/scala/li/cil/oc/common/item/InkCartridge.scala

@@ -1,5 +1,6 @@
 package li.cil.oc.common.item
 
+import li.cil.oc.Constants
 import li.cil.oc.api
 import net.minecraft.item.ItemStack
 
@@ -7,8 +8,8 @@ class InkCartridge(val parent: Delegator) extends Delegate {
   override def maxStackSize = 1
 
   override def getContainerItem(stack: ItemStack): ItemStack = {
-    if (api.Items.get(stack) == api.Items.get("inkCartridge"))
+    if (api.Items.get(stack) == api.Items.get(Constants.ItemName.InkCartridge))
-      api.Items.get("inkCartridgeEmpty").createItemStack(1)
+      api.Items.get(Constants.ItemName.InkCartridgeEmpty).createItemStack(1)
     else
       super.getContainerItem(stack)
   }

src/main/scala/li/cil/oc/common/item/data/MicrocontrollerData.scala

@@ -30,7 +30,7 @@ class MicrocontrollerData extends ItemData {
 
     // Reserve slot for EEPROM if necessary, avoids having to resize the
     // components array in the MCU tile entity, which isn't possible currently.
-    if (!components.exists(stack => api.Items.get(stack) == api.Items.get("eeprom"))) {
+    if (!components.exists(stack => api.Items.get(stack) == api.Items.get(Constants.ItemName.EEPROM))) {
       components :+= null
     }
   }

src/main/scala/li/cil/oc/common/item/data/PrintData.scala

@@ -1,5 +1,6 @@
 package li.cil.oc.common.item.data
 
+import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api
 import li.cil.oc.util.Color
@@ -72,7 +73,7 @@ class PrintData extends ItemData {
   }
 
   def createItemStack() = {
-    val stack = api.Items.get("print").createItemStack(1)
+    val stack = api.Items.get(Constants.BlockName.Print).createItemStack(1)
     save(stack)
     stack
   }
@@ -125,9 +126,9 @@ object PrintData {
   private val inkPerCartridge = Settings.get.printInkValue
 
   def materialValue(stack: ItemStack) = {
-    if (api.Items.get(stack) == api.Items.get("chamelium"))
+    if (api.Items.get(stack) == api.Items.get(Constants.ItemName.Chamelium))
       materialPerItem
-    else if (api.Items.get(stack) == api.Items.get("print")) {
+    else if (api.Items.get(stack) == api.Items.get(Constants.BlockName.Print)) {
       val data = new PrintData(stack)
       computeCosts(data) match {
         case Some((materialRequired, inkRequired)) => (materialRequired * Settings.get.printRecycleRate).toInt
@@ -138,7 +139,7 @@ object PrintData {
   }
 
   def inkValue(stack: ItemStack) = {
-    if (api.Items.get(stack) == api.Items.get("inkCartridge"))
+    if (api.Items.get(stack) == api.Items.get(Constants.ItemName.InkCartridge))
       inkPerCartridge
     else if (Color.isDye(stack))
       inkPerCartridge / 10

src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala

@@ -38,7 +38,7 @@ object ExtendedRecipe {
   )
   private lazy val robot = api.Items.get(Constants.BlockName.Robot)
   private lazy val tablet = api.Items.get(Constants.ItemName.Tablet)
-  private lazy val print = api.Items.get("print")
+  private lazy val print = api.Items.get(Constants.BlockName.Print)
   private lazy val disabled = {
     val stack = new ItemStack(Blocks.dirt)
     val tag = new NBTTagCompound()

src/main/scala/li/cil/oc/common/recipe/Recipes.scala

@@ -125,14 +125,14 @@ object Recipes {
       val navigationUpgrade = api.Items.get(Constants.ItemName.NavigationUpgrade)
       val mcu = api.Items.get(Constants.BlockName.Microcontroller)
       val floppy = api.Items.get(Constants.ItemName.Floppy)
-      val lootDisk = api.Items.get("lootDisk")
+      val lootDisk = api.Items.get(Constants.ItemName.LootDisk)
       val drone = api.Items.get(Constants.ItemName.Drone)
       val eeprom = api.Items.get(Constants.ItemName.EEPROM)
       val robot = api.Items.get(Constants.BlockName.Robot)
       val tablet = api.Items.get(Constants.ItemName.Tablet)
-      val chamelium = api.Items.get("chamelium")
+      val chamelium = api.Items.get(Constants.ItemName.Chamelium)
-      val chameliumBlock = api.Items.get("chameliumBlock")
+      val chameliumBlock = api.Items.get(Constants.BlockName.Chamelium)
-      val print = api.Items.get("print")
+      val print = api.Items.get(Constants.BlockName.Print)
 
       // Navigation upgrade recrafting.
       GameRegistry.addRecipe(new ExtendedShapelessOreRecipe(
@@ -215,9 +215,9 @@ object Recipes {
 
       // Hard disk formatting.
       val hdds = Array(
-        api.Items.get("hdd1"),
+        api.Items.get(Constants.ItemName.HDDTier1),
-        api.Items.get("hdd2"),
+        api.Items.get(Constants.ItemName.HDDTier2),
-        api.Items.get("hdd3")
+        api.Items.get(Constants.ItemName.HDDTier3)
       )
       for (hdd <- hdds) {
         GameRegistry.addRecipe(new ExtendedShapelessOreRecipe(hdd.createItemStack(1), hdd.createItemStack(1)))

src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala

@@ -2,6 +2,7 @@ package li.cil.oc.common.tileentity
 
 import cpw.mods.fml.relauncher.Side
 import cpw.mods.fml.relauncher.SideOnly
+import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api
 import li.cil.oc.api.internal
@@ -237,7 +238,7 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
 
   // For hotswapping EEPROMs.
   def changeEEPROM(newEeprom: ItemStack) = {
-    val oldEepromIndex = info.components.indexWhere(api.Items.get(_) == api.Items.get("eeprom"))
+    val oldEepromIndex = info.components.indexWhere(api.Items.get(_) == api.Items.get(Constants.ItemName.EEPROM))
     if (oldEepromIndex >= 0) {
       val oldEeprom = info.components(oldEepromIndex)
       super.setInventorySlotContents(oldEepromIndex, newEeprom)

src/main/scala/li/cil/oc/integration/fmp/CablePart.scala

@@ -7,6 +7,7 @@ import codechicken.lib.vec.Vector3
 import codechicken.multipart._
 import cpw.mods.fml.relauncher.Side
 import cpw.mods.fml.relauncher.SideOnly
+import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api
 import li.cil.oc.api.Items
@@ -55,9 +56,9 @@ class CablePart(val original: Option[tileentity.Cable] = None) extends SimpleBlo
 
   // ----------------------------------------------------------------------- //
 
-  override def simpleBlock = Items.get("cable").block().asInstanceOf[Cable]
+  override def simpleBlock = Items.get(Constants.BlockName.Cable).block().asInstanceOf[Cable]
 
-  def getType = Settings.namespace + "cable"
+  def getType = Settings.namespace + Constants.BlockName.Cable
 
   override def doesTick = false
 

src/main/scala/li/cil/oc/integration/fmp/EventHandler.scala

@@ -6,6 +6,7 @@ import codechicken.lib.vec.BlockCoord
 import codechicken.lib.vec.Vector3
 import codechicken.multipart.TileMultipart
 import cpw.mods.fml.common.eventhandler.SubscribeEvent
+import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api.Items
 import li.cil.oc.client.PacketSender
@@ -51,10 +52,10 @@ object EventHandler {
       case itemBlock: ItemBlock =>
         itemBlock.field_150939_a match {
           case simpleBlock: SimpleBlock =>
-            if (simpleBlock == Items.get("cable").block()) {
+            if (simpleBlock == Items.get(Constants.BlockName.Cable).block()) {
               placeDelegatePart(player, hit, new CablePart())
             }
-            else if (simpleBlock == Items.get("print").block()) {
+            else if (simpleBlock == Items.get(Constants.BlockName.Print).block()) {
               val part = new PrintPart()
               part.data.load(player.getHeldItem)
               part.facing = yaw2Direction((player.rotationYaw / 360 * 4).round & 3).getOpposite

src/main/scala/li/cil/oc/integration/fmp/MultipartConverter.scala

@@ -5,6 +5,7 @@ import java.util
 import codechicken.lib.vec.BlockCoord
 import codechicken.multipart.MultiPartRegistry
 import codechicken.multipart.MultiPartRegistry.IPartConverter
+import li.cil.oc.Constants
 import li.cil.oc.api.Items
 import li.cil.oc.common.tileentity.Cable
 import li.cil.oc.common.tileentity.Print
@@ -16,8 +17,8 @@ object MultipartConverter extends IPartConverter {
   }
 
   override def blockTypes = util.Arrays.asList(
-    Items.get("cable").block,
+    Items.get(Constants.BlockName.Cable).block,
-    Items.get("print").block
+    Items.get(Constants.BlockName.Print).block
   )
 
   override def convert(world: World, pos: BlockCoord) = {

src/main/scala/li/cil/oc/integration/fmp/PrintPart.scala

@@ -18,6 +18,7 @@ import codechicken.multipart.TSlottedPart
 import codechicken.multipart.scalatraits.TSlottedTile
 import cpw.mods.fml.relauncher.Side
 import cpw.mods.fml.relauncher.SideOnly
+import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api.Items
 import li.cil.oc.client.renderer.block.Print
@@ -104,9 +105,9 @@ class PrintPart(val original: Option[tileentity.Print] = None) extends SimpleBlo
 
   // ----------------------------------------------------------------------- //
 
-  override def simpleBlock = Items.get("print").block().asInstanceOf[Print]
+  override def simpleBlock = Items.get(Constants.BlockName.Print).block().asInstanceOf[Print]
 
-  def getType = Settings.namespace + "print"
+  def getType = Settings.namespace + Constants.BlockName.Print
 
   override def doesTick = false
 

src/main/scala/li/cil/oc/integration/gc/DriverWorldSensorCard.scala

@@ -1,5 +1,6 @@
 package li.cil.oc.integration.gc
 
+import li.cil.oc.Constants
 import li.cil.oc.api
 import li.cil.oc.api.driver.EnvironmentAware
 import li.cil.oc.api.driver.EnvironmentHost
@@ -11,7 +12,7 @@ import net.minecraft.item.ItemStack
 
 object DriverWorldSensorCard extends Item with HostAware with EnvironmentAware {
   override def worksWith(stack: ItemStack) =
-    isOneOf(stack, api.Items.get("worldSensorCard"))
+    isOneOf(stack, api.Items.get(Constants.ItemName.WorldSensorCard))
 
   override def createEnvironment(stack: ItemStack, host: EnvironmentHost) =
     if (Mods.Galacticraft.isAvailable) new WorldSensorCard(host)

src/main/scala/li/cil/oc/integration/opencomputers/DriverLootDisk.scala

@@ -13,7 +13,7 @@ import net.minecraftforge.common.DimensionManager
 
 object DriverLootDisk extends Item {
   override def worksWith(stack: ItemStack) =
-    isOneOf(stack, api.Items.get("lootDisk"))
+    isOneOf(stack, api.Items.get(Constants.ItemName.LootDisk))
 
   override def createEnvironment(stack: ItemStack, host: EnvironmentHost) =
     if (stack.hasTagCompound) {

src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala

@@ -1,5 +1,6 @@
 package li.cil.oc.integration.stargatetech2
 
+import li.cil.oc.Constants
 import li.cil.oc.api
 import li.cil.oc.api.driver.EnvironmentAware
 import li.cil.oc.api.driver.EnvironmentHost
@@ -12,7 +13,7 @@ import net.minecraft.item.ItemStack
 
 object DriverAbstractBusCard extends Item with HostAware with EnvironmentAware {
   override def worksWith(stack: ItemStack) =
-    isOneOf(stack, api.Items.get("abstractBusCard"))
+    isOneOf(stack, api.Items.get(Constants.ItemName.AbstractBusCard))
 
   override def worksWith(stack: ItemStack, host: Class[_ <: EnvironmentHost]) =
     worksWith(stack) && (isComputer(host) || isRobot(host) || isServer(host) || isMicrocontroller(host))