AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of cil.li:oc

Browse Source 
Conflicts:
	li/cil/oc/common/item/Card.scala
This commit is contained in:
Florian Nücke 2013-12-01 01:49:13 +01:00
commit 432c20f6b4
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
li/cil/oc/Items.scala
View File

@ -35,7 +35,7 @@ object Items {
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
// Crafting // Crafting
var card1, card2, card3: item.Card = null var card: item.Card = null
var circuitBoardBody: item.CircuitBoard = null var circuitBoardBody: item.CircuitBoard = null
var circuitBoard: item.PrintedCircuitBoard = null var circuitBoard: item.PrintedCircuitBoard = null
var ironCutter: item.CuttingWire = null var ironCutter: item.CuttingWire = null
@ -74,9 +74,7 @@ object Items {
wlan = new item.WirelessNetworkCard(multi) wlan = new item.WirelessNetworkCard(multi)
crafting = new item.Crafting(multi) crafting = new item.Crafting(multi)
card1 = new item.Card(multi, 0) card = new item.Card(multi)
card2 = new item.Card(multi, 1)
card3 = new item.Card(multi, 2)
circuitBoardBody = new item.CircuitBoard(multi) circuitBoardBody = new item.CircuitBoard(multi)
circuitBoard = new item.PrintedCircuitBoard(multi) circuitBoard = new item.PrintedCircuitBoard(multi)
ironCutter = new item.CuttingWire(multi) ironCutter = new item.CuttingWire(multi)

24
li/cil/oc/Recipes.scala
View File

@ -28,6 +28,7 @@ object Recipes {
val transistor = Items.transistor.createItemStack() val transistor = Items.transistor.createItemStack()
val circuitBoard =Items.circuitBoardBody.createItemStack() val circuitBoard =Items.circuitBoardBody.createItemStack()
val rawCircuitBoard =Items.rawCircuitBoard.createItemStack() val rawCircuitBoard =Items.rawCircuitBoard.createItemStack()
val card = Items.card.createItemStack()
GameRegistry.addRecipe(Blocks.adapter.createItemStack(), GameRegistry.addRecipe(Blocks.adapter.createItemStack(),
"x ", "x ",
@ -130,38 +131,29 @@ object Recipes {
GameRegistry.addRecipe(Items.card1.createItemStack(), GameRegistry.addRecipe(card,
"xyy", "xyy",
"xzz", "xzz",
"x ", 'x': Character, ironStack, 'z': Character, Items.circuitBoard.createItemStack(), 'y': Character, Items.chip1.createItemStack()) "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(), GameRegistry.addRecipe(Items.gpu1.createItemStack(),
"x", "x",
"y", "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(), GameRegistry.addRecipe(Items.gpu2.createItemStack(),
"x", "x",
"y", "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(), GameRegistry.addRecipe(Items.gpu3.createItemStack(),
"x", "x",
"y", "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(), GameRegistry.addRecipe(Items.ram1.createItemStack(),
"xxx", "xxx",
@ -175,7 +167,7 @@ object Recipes {
"xxx", "xxx",
"yyy", 'x': Character, Items.chip3.createItemStack(), 'y': Character, Items.circuitBoard.createItemStack()) "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(), GameRegistry.addRecipe(Items.numPad.createItemStack(),
"xxx", "xxx",
@ -231,7 +223,7 @@ object Recipes {
GameRegistry.addShapelessRecipe(Items.ironCutter.createItemStack(16), new ItemStack(Item.shears, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Item.ingotIron)) GameRegistry.addShapelessRecipe(Items.ironCutter.createItemStack(16), new ItemStack(Item.shears, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Item.ingotIron),new ItemStack(Item.stick))
GameRegistry.addShapelessRecipe(rawCircuitBoard, Items.ironCutter.createItemStack(), new ItemStack(Block.blockClay),cactusGreen) GameRegistry.addShapelessRecipe(rawCircuitBoard, Items.ironCutter.createItemStack(), new ItemStack(Block.blockClay),cactusGreen)
FurnaceRecipes.smelting().addSmelting(rawCircuitBoard.itemID,rawCircuitBoard.getItemDamage,circuitBoard,1) FurnaceRecipes.smelting().addSmelting(rawCircuitBoard.itemID,rawCircuitBoard.getItemDamage,circuitBoard,1)
GameRegistry.addRecipe(new ShapelessOreRecipe(Items.circuitBoard.createItemStack(), "potionPoison", Item.goldNugget, circuitBoard)) GameRegistry.addRecipe(new ShapelessOreRecipe(Items.circuitBoard.createItemStack(), "potionPoison", Item.goldNugget, circuitBoard))

5
li/cil/oc/common/item/Card.scala
View File

@ -3,9 +3,8 @@ package li.cil.oc.common.item
import li.cil.oc.Settings import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister import net.minecraft.client.renderer.texture.IconRegister
class Card(val parent: Delegator, val tier: Int) extends Delegate { class Card(val parent: Delegator) extends Delegate {
val baseName = "Card" val unlocalizedName = "Card"
val unlocalizedName = baseName + Array("Basic", "Advanced", "Professional").apply(tier)
override def registerIcons(iconRegister: IconRegister) { override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister) super.registerIcons(iconRegister)