From 770658dd2260d911eddd1df93d5877d16cdde5cb Mon Sep 17 00:00:00 2001
From: Johannes Lohrer <johanneslohrer@msn.com>
Date: Sun, 1 Dec 2013 01:48:24 +0100
Subject: [PATCH] removed tiers from cards

---
 li/cil/oc/Items.scala            |  6 ++----
 li/cil/oc/Recipes.scala          | 22 +++++++---------------
 li/cil/oc/common/item/Card.scala |  6 ++----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala
index 856c21282..422ed8f1e 100644
--- a/li/cil/oc/Items.scala
+++ b/li/cil/oc/Items.scala
@@ -35,7 +35,7 @@ object Items {
 
   // ----------------------------------------------------------------------- //
   // Crafting
-  var card1, card2, card3: item.Card = null
+  var card: item.Card = null
   var circuitBoardBody: item.CircuitBoard = null
   var circuitBoard: item.PrintedCircuitBoard = null
   var ironCutter: item.CuttingWire = null
@@ -74,9 +74,7 @@ object Items {
     wlan = new item.WirelessNetworkCard(multi)
     crafting = new item.Crafting(multi)
 
-    card1 = new item.Card(multi, 0)
-    card2 = new item.Card(multi, 1)
-    card3 = new item.Card(multi, 2)
+    card = new item.Card(multi)
     circuitBoardBody = new item.CircuitBoard(multi)
     circuitBoard = new item.PrintedCircuitBoard(multi)
     ironCutter = new item.CuttingWire(multi)
diff --git a/li/cil/oc/Recipes.scala b/li/cil/oc/Recipes.scala
index c2d6d8407..b95b53b0a 100644
--- a/li/cil/oc/Recipes.scala
+++ b/li/cil/oc/Recipes.scala
@@ -28,6 +28,7 @@ object Recipes {
     val transistor = Items.transistor.createItemStack()
     val circuitBoard =Items.circuitBoardBody.createItemStack()
     val rawCircuitBoard =Items.rawCircuitBoard.createItemStack()
+    val card = Items.card.createItemStack()
 
     GameRegistry.addRecipe(Blocks.adapter.createItemStack(),
       "x  ",
@@ -130,38 +131,29 @@ object Recipes {
 
 
 
-    GameRegistry.addRecipe(Items.card1.createItemStack(),
+    GameRegistry.addRecipe(card,
       "xyy",
       "xzz",
       "x  ", 'x': Character, ironStack, 'z': Character, Items.circuitBoard.createItemStack(), 'y': Character, Items.chip1.createItemStack())
 
-    GameRegistry.addRecipe(Items.card2.createItemStack(),
-      "xyy",
-      "xzz",
-      "x  ", 'x': Character, ironStack, 'z': Character, Items.circuitBoard.createItemStack(), 'y': Character, Items.chip2.createItemStack())
-
-    GameRegistry.addRecipe(Items.card3.createItemStack(),
-      "xyy",
-      "xzz",
-      "x  ", 'x': Character, ironStack, 'z': Character, Items.circuitBoard.createItemStack(), 'y': Character, Items.chip3.createItemStack())
 
     GameRegistry.addRecipe(Items.gpu1.createItemStack(),
       "x",
       "y",
-      "x", 'x': Character, Items.chip1.createItemStack(), 'y': Character, Items.card1.createItemStack())
+      "x", 'x': Character, Items.chip1.createItemStack(), 'y': Character, card)
 
     GameRegistry.addRecipe(Items.gpu2.createItemStack(),
       "x",
       "y",
-      "x", 'x': Character, Items.chip2.createItemStack(), 'y': Character, Items.card2.createItemStack())
+      "x", 'x': Character, Items.chip2.createItemStack(), 'y': Character, card)
 
     GameRegistry.addRecipe(Items.gpu3.createItemStack(),
       "x",
       "y",
-      "x", 'x': Character, Items.chip3.createItemStack(), 'y': Character, Items.card3.createItemStack())
+      "x", 'x': Character, Items.chip3.createItemStack(), 'y': Character, card)
 
 
-    GameRegistry.addShapelessRecipe(Items.lan.createItemStack(), Items.card1.createItemStack(), Blocks.cable.createItemStack())
+    GameRegistry.addShapelessRecipe(Items.lan.createItemStack(),card, Blocks.cable.createItemStack())
 
     GameRegistry.addRecipe(Items.ram1.createItemStack(),
       "xxx",
@@ -175,7 +167,7 @@ object Recipes {
       "xxx",
       "yyy", 'x': Character, Items.chip3.createItemStack(), 'y': Character, Items.circuitBoard.createItemStack())
 
-    GameRegistry.addShapelessRecipe(Items.rs.createItemStack(), Items.card1.createItemStack(), new ItemStack(Item.redstone, 1))
+    GameRegistry.addShapelessRecipe(Items.rs.createItemStack(),card, new ItemStack(Item.redstone, 1))
 
     GameRegistry.addRecipe(Items.numPad.createItemStack(),
       "xxx",
diff --git a/li/cil/oc/common/item/Card.scala b/li/cil/oc/common/item/Card.scala
index 03081ee93..c89bb8140 100644
--- a/li/cil/oc/common/item/Card.scala
+++ b/li/cil/oc/common/item/Card.scala
@@ -3,8 +3,6 @@ package li.cil.oc.common.item
 import net.minecraft.item.ItemStack
 
 
-class Card(val parent: Delegator, val tier: Int) extends Delegate {
-  val baseName = "Card"
-  val unlocalizedName = baseName + Array("Basic", "Advanced", "Professional").apply(tier)
-
+class Card(val parent: Delegator) extends Delegate {
+  val unlocalizedName = "Card"
 }