AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Why did this still compile earlier .-.

Browse Source
This commit is contained in:
Florian Nücke 2016-07-14 19:01:19 +02:00
parent b4389cc70d
commit a06dbdba3e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/recipe/ColorizeRecipe.scala
View File

@ -42,7 +42,7 @@ class ColorizeRecipe(target: Item, source: Array[Item] = null) extends Container
if (dye.isEmpty) if (dye.isEmpty)
return null return null
val itemColor = EntitySheep.func_175513_a(Color.byOreName(dye.get)) val itemColor = EntitySheep.getDyeRgb(Color.byOreName(dye.get))
val red = (itemColor(0) * 255.0F).toInt val red = (itemColor(0) * 255.0F).toInt
val green = (itemColor(1) * 255.0F).toInt val green = (itemColor(1) * 255.0F).toInt
val blue = (itemColor(2) * 255.0F).toInt val blue = (itemColor(2) * 255.0F).toInt

2
src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.util.StatCollector
class DamageSourceWithRandomCause(name: String, numCauses: Int) extends DamageSource(name) { class DamageSourceWithRandomCause(name: String, numCauses: Int) extends DamageSource(name) {
override def getDeathMessage(damagee: EntityLivingBase): IChatComponent = { override def getDeathMessage(damagee: EntityLivingBase): IChatComponent = {
val damager = damagee.func_94060_bK val damager = damagee.getAttackingEntity
val format = "death.attack." + damageType + "." + (damagee.worldObj.rand.nextInt(numCauses) + 1) val format = "death.attack." + damageType + "." + (damagee.worldObj.rand.nextInt(numCauses) + 1)
val withCauseFormat = format + ".player" val withCauseFormat = format + ".player"
if (damager != null && StatCollector.canTranslate(withCauseFormat)) if (damager != null && StatCollector.canTranslate(withCauseFormat))