From 2d4d9b30bbaaee9ef8c5f8243c9316f24f6d1eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 1 Dec 2013 00:54:34 +0100 Subject: [PATCH] keyboard part graphics --- .../opencomputers/textures/items/arrow_keys.png | Bin 0 -> 287 bytes .../opencomputers/textures/items/button_group.png | Bin 0 -> 292 bytes assets/opencomputers/textures/items/numpad.png | Bin 0 -> 294 bytes li/cil/oc/Items.scala | 4 ++-- li/cil/oc/common/item/ArrowKeys.scala | 9 ++++++++- li/cil/oc/common/item/ButtonGroup.scala | 12 ++++++++++-- li/cil/oc/common/item/Card.scala | 5 ++--- li/cil/oc/common/item/IronCutter.scala | 3 +-- li/cil/oc/common/item/IronNugget.scala | 7 +++---- li/cil/oc/common/item/Numpad.scala | 9 ++++++++- li/cil/oc/common/item/Platine.scala | 3 +-- li/cil/oc/common/item/PlatineBody.scala | 5 ++--- 12 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 assets/opencomputers/textures/items/arrow_keys.png create mode 100644 assets/opencomputers/textures/items/button_group.png create mode 100644 assets/opencomputers/textures/items/numpad.png diff --git a/assets/opencomputers/textures/items/arrow_keys.png b/assets/opencomputers/textures/items/arrow_keys.png new file mode 100644 index 0000000000000000000000000000000000000000..7d79aae7c0e06634c4c5699bbdeab89b28d2a71d GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!forvRT2*Oe<*PM$p3(b3Vz$A_Pvzr4I$RaG@CEUdk~U0z;( z)~s1NIy!}gh0@Z}F)=aS-QDi)?j9Z!Uq5uE2I!>;X*zvGUT1PUReIIk2g-qJB zLs74vH9sgx%wJ{mTq21_#p6V!n(aa#Zq7x?UMe2!b@P<-7}*%KlX#YWl_)a;8qVP9 L>gTe~DWM4fn-^<; literal 0 HcmV?d00001 diff --git a/assets/opencomputers/textures/items/button_group.png b/assets/opencomputers/textures/items/button_group.png new file mode 100644 index 0000000000000000000000000000000000000000..b7081b7ab764621c8ec87b66ee313cb69d4182dc GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo*8rao*Oe<*PM$ouu&~h4(NR@Zm7kwKCML$m$EUo!yt})* zva(WITDrZxT}MYpUS8hA!(-O0StceXHa0fy?(Sh>VV#|w|NsBDObfjRG*G-G$S)Yk z#R3?fIXsI4Dhcv*aSW-r)pFjP?|=c1bKt3I(N)Fo>aSFsa5%yEsolIlIZt@k!u*1B zf(~oGy68Mz%G)%T;hOW*A1}O43Jc8t?6W2DmK)O|Zw{6tE&q$lDp({KzAWIR`{}i$VEsFPaaSW-rm2<*UtU*D5<>EX>kvrdG-`D$a^88vU`e#9d z|MFEr4rQ^rn^skII2Q;U*ka-S=SszVfe9+-%a!_aV>mmcdlVJcD-_QvV_CwnP-TH@ ld^A&(R5s^})zJ-%47)e8GeytHEeBe~;OXk;vd$@?2>`4~UU&ci literal 0 HcmV?d00001 diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala index 84f7ec5dc..b0daf4c7d 100644 --- a/li/cil/oc/Items.scala +++ b/li/cil/oc/Items.scala @@ -40,7 +40,7 @@ object Items { var circuitBoard: item.Platine = null var ironCutter: item.IronCutter = 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) diff --git a/li/cil/oc/common/item/ArrowKeys.scala b/li/cil/oc/common/item/ArrowKeys.scala index 493dc25e6..8d0c769ff 100644 --- a/li/cil/oc/common/item/ArrowKeys.scala +++ b/li/cil/oc/common/item/ArrowKeys.scala @@ -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") + } } diff --git a/li/cil/oc/common/item/ButtonGroup.scala b/li/cil/oc/common/item/ButtonGroup.scala index c5d6a1a2c..fd312a60f 100644 --- a/li/cil/oc/common/item/ButtonGroup.scala +++ b/li/cil/oc/common/item/ButtonGroup.scala @@ -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 { - val unlocalizedName = "buttonGroup" +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") + } } diff --git a/li/cil/oc/common/item/Card.scala b/li/cil/oc/common/item/Card.scala index 170d28002..6013eb98c 100644 --- a/li/cil/oc/common/item/Card.scala +++ b/li/cil/oc/common/item/Card.scala @@ -2,8 +2,7 @@ package li.cil.oc.common.item import net.minecraft.item.ItemStack - -class Card(val parent: Delegator,val tier:Int) extends Delegate { +class Card(val parent: Delegator, val tier: Int) extends Delegate { val unlocalizedName = "Card" override def displayName(stack: ItemStack) = { @@ -16,7 +15,7 @@ class Card(val parent: Delegator,val tier:Int) extends Delegate { else if (tier == 2) { Option("Diamond Card") } - else{ + else { Option(unlocalizedName) } } diff --git a/li/cil/oc/common/item/IronCutter.scala b/li/cil/oc/common/item/IronCutter.scala index b537120a8..0dda73c5b 100644 --- a/li/cil/oc/common/item/IronCutter.scala +++ b/li/cil/oc/common/item/IronCutter.scala @@ -1,6 +1,5 @@ package li.cil.oc.common.item - -class IronCutter (val parent: Delegator) extends Delegate { +class IronCutter(val parent: Delegator) extends Delegate { val unlocalizedName = "IronCutter" } diff --git a/li/cil/oc/common/item/IronNugget.scala b/li/cil/oc/common/item/IronNugget.scala index 439284345..b24c07089 100644 --- a/li/cil/oc/common/item/IronNugget.scala +++ b/li/cil/oc/common/item/IronNugget.scala @@ -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") } } diff --git a/li/cil/oc/common/item/Numpad.scala b/li/cil/oc/common/item/Numpad.scala index 74b835647..fd9390fb8 100644 --- a/li/cil/oc/common/item/Numpad.scala +++ b/li/cil/oc/common/item/Numpad.scala @@ -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") + } } diff --git a/li/cil/oc/common/item/Platine.scala b/li/cil/oc/common/item/Platine.scala index fe44bc747..25e8e0b9a 100644 --- a/li/cil/oc/common/item/Platine.scala +++ b/li/cil/oc/common/item/Platine.scala @@ -1,6 +1,5 @@ package li.cil.oc.common.item - -class Platine (val parent: Delegator) extends Delegate { +class Platine(val parent: Delegator) extends Delegate { val unlocalizedName = "Platine" } diff --git a/li/cil/oc/common/item/PlatineBody.scala b/li/cil/oc/common/item/PlatineBody.scala index c5e924ed6..4f9f86f40 100644 --- a/li/cil/oc/common/item/PlatineBody.scala +++ b/li/cil/oc/common/item/PlatineBody.scala @@ -1,6 +1,5 @@ package li.cil.oc.common.item - -class PlatineBody (val parent: Delegator) extends Delegate { -val unlocalizedName = "PlatineBody" +class PlatineBody(val parent: Delegator) extends Delegate { + val unlocalizedName = "PlatineBody" }