AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -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:
Johannes Lohrer 2013-12-01 00:59:13 +01:00
commit 012a4bd12b
11 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/opencomputers/textures/items/arrow_keys.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 287 B

BIN
assets/opencomputers/textures/items/button_group.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

BIN
assets/opencomputers/textures/items/numpad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 B

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

@ -40,7 +40,7 @@ object Items {
var circuitBoard: item.PrintedCircuitBoard = null
var ironCutter: item.CuttingWire = null
var chip1, chip2, chip3: item.Chip = null
var numPad: item.Numpad = null
var numPad: item.NumPad = null
var arrowKeys: item.ArrowKeys = null
var buttonGroup: item.ButtonGroup = null
var cpu: item.CPU = null
@ -85,7 +85,7 @@ object Items {
chip2 = new item.Chip(multi, 1)
chip3 = new item.Chip(multi, 2)
numPad = new item.Numpad(multi)
numPad = new item.NumPad(multi)
arrowKeys = new item.ArrowKeys(multi)
buttonGroup = new item.ButtonGroup(multi)

9
li/cil/oc/common/item/ArrowKeys.scala
View File

@ -1,7 +1,14 @@
package li.cil.oc.common.item
import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister
class ArrowKeys (val parent: Delegator) extends Delegate {
class ArrowKeys(val parent: Delegator) extends Delegate {
val unlocalizedName = "ArrowKeys"
override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister)
icon = iconRegister.registerIcon(Settings.resourceDomain + ":arrow_keys")
}
}

10
li/cil/oc/common/item/ButtonGroup.scala
View File

@ -1,6 +1,14 @@
package li.cil.oc.common.item
import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister
class ButtonGroup (val parent: Delegator) extends Delegate {
class ButtonGroup(val parent: Delegator) extends Delegate {
val unlocalizedName = "ButtonGroup"
override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister)
icon = iconRegister.registerIcon(Settings.resourceDomain + ":button_group")
}
}

3
li/cil/oc/common/item/Chip.scala
View File

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

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

@ -1,6 +1,5 @@
package li.cil.oc.common.item
class CircuitBoard (val parent: Delegator) extends Delegate {
val unlocalizedName = "CircuitBoard"
class CircuitBoard(val parent: Delegator) extends Delegate {
val unlocalizedName = "CircuitBoard"
}

3
li/cil/oc/common/item/CuttingWire.scala
View File

@ -1,6 +1,5 @@
package li.cil.oc.common.item
class CuttingWire (val parent: Delegator) extends Delegate {
class CuttingWire(val parent: Delegator) extends Delegate {
val unlocalizedName = "CuttingWire"
}

7
li/cil/oc/common/item/IronNugget.scala
View File

@ -1,15 +1,14 @@
package li.cil.oc.common.item
import net.minecraft.client.renderer.texture.IconRegister
import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister
class IronNugget (val parent: Delegator) extends Delegate {
class IronNugget(val parent: Delegator) extends Delegate {
val unlocalizedName = "IronNugget"
override def registerIcons(iconRegister: IconRegister) = {
super.registerIcons(iconRegister)
icon = iconRegister.registerIcon(Settings.resourceDomain + ":iron_nugget" )
icon = iconRegister.registerIcon(Settings.resourceDomain + ":iron_nugget")
}
}

9
li/cil/oc/common/item/Numpad.scala
View File

@ -1,7 +1,14 @@
package li.cil.oc.common.item
import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister
class Numpad (val parent: Delegator) extends Delegate {
class NumPad(val parent: Delegator) extends Delegate {
val unlocalizedName = "NumPad"
override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister)
icon = iconRegister.registerIcon(Settings.resourceDomain + ":numpad")
}
}