mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-18 19:56:17 -04:00
Using OreDict for dyeing screens and cases.
This commit is contained in:
parent
7d9b50adad
commit
c0dd2fe113
@ -1,33 +1,55 @@
|
|||||||
package li.cil.oc.util
|
package li.cil.oc.util
|
||||||
|
|
||||||
import net.minecraft.item.{ItemDye, ItemStack}
|
import net.minecraft.item.ItemStack
|
||||||
|
import net.minecraftforge.oredict.OreDictionary
|
||||||
|
|
||||||
object Color {
|
object Color {
|
||||||
def Black = 0x444444 // 0x1E1B1B
|
val Black = 0x444444
|
||||||
def Red = 0xB3312C
|
// 0x1E1B1B
|
||||||
def Green = 0x339911 // 0x3B511A
|
val Red = 0xB3312C
|
||||||
def Brown = 0x51301A
|
val Green = 0x339911
|
||||||
def Blue = 0x6666FF // 0x253192
|
// 0x3B511A
|
||||||
def Purple = 0x7B2FBE
|
val Brown = 0x51301A
|
||||||
def Cyan = 0x66FFFF // 0x287697
|
val Blue = 0x6666FF
|
||||||
def Silver = 0xABABAB
|
// 0x253192
|
||||||
def Gray = 0x666666 // 0x434343
|
val Purple = 0x7B2FBE
|
||||||
def Pink = 0xD88198
|
val Cyan = 0x66FFFF
|
||||||
def Lime = 0x66FF66 // 0x41CD34
|
// 0x287697
|
||||||
def Yellow = 0xFFFF66 // 0xDECF2A
|
val LightGray = 0xABABAB
|
||||||
def LightBlue = 0xAAAAFF // 0x6689D3
|
val Gray = 0x666666
|
||||||
def Magenta = 0xC354CD
|
// 0x434343
|
||||||
def Orange = 0xEB8844
|
val Pink = 0xD88198
|
||||||
def White = 0xF0F0F0
|
val Lime = 0x66FF66
|
||||||
|
// 0x41CD34
|
||||||
|
val Yellow = 0xFFFF66
|
||||||
|
// 0xDECF2A
|
||||||
|
val LightBlue = 0xAAAAFF
|
||||||
|
// 0x6689D3
|
||||||
|
val Magenta = 0xC354CD
|
||||||
|
val Orange = 0xEB8844
|
||||||
|
val White = 0xF0F0F0
|
||||||
|
|
||||||
def byDyeNumber = Array(Black, Red, Green, Brown, Blue, Purple, Cyan, Silver, Gray, Pink, Lime, Yellow, LightBlue, Magenta, Orange, White)
|
val byOreName = Map(
|
||||||
|
"dyeBlack" -> Black,
|
||||||
|
"dyeRed" -> Red,
|
||||||
|
"dyeGreen" -> Green,
|
||||||
|
"dyeBrown" -> Brown,
|
||||||
|
"dyeBlue" -> Blue,
|
||||||
|
"dyePurple" -> Purple,
|
||||||
|
"dyeCyan" -> Cyan,
|
||||||
|
"dyeLightGray" -> LightGray,
|
||||||
|
"dyeGray" -> Gray,
|
||||||
|
"dyePink" -> Pink,
|
||||||
|
"dyeLime" -> Lime,
|
||||||
|
"dyeYellow" -> Yellow,
|
||||||
|
"dyeLightBlue" -> LightBlue,
|
||||||
|
"dyeMagenta" -> Magenta,
|
||||||
|
"dyeOrange" -> Orange,
|
||||||
|
"dyeWhite" -> White)
|
||||||
|
|
||||||
val byTier = Array(Silver, Yellow, Cyan)
|
val byTier = Array(LightGray, Yellow, Cyan)
|
||||||
|
|
||||||
def isDye(stack: ItemStack) = stack != null && stack.getItem.isInstanceOf[ItemDye]
|
def isDye(stack: ItemStack) = byOreName.contains(OreDictionary.getOreName(OreDictionary.getOreID(stack)))
|
||||||
|
|
||||||
def dyeColor(stack: ItemStack) = stack.getItem match {
|
def dyeColor(stack: ItemStack) = byOreName.get(OreDictionary.getOreName(OreDictionary.getOreID(stack))).getOrElse(0xFF00FF)
|
||||||
case dye: ItemDye => byDyeNumber(math.max(0, math.min(15, stack.getItemDamage)))
|
|
||||||
case _ => 0xFF00FF
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user