From a06dbdba3ef8ef1e36a3392375e19e08fa06dd81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 14 Jul 2016 19:01:19 +0200 Subject: [PATCH] Why did this still compile earlier .-. --- src/main/scala/li/cil/oc/common/recipe/ColorizeRecipe.scala | 2 +- .../cil/oc/integration/util/DamageSourceWithRandomCause.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/recipe/ColorizeRecipe.scala b/src/main/scala/li/cil/oc/common/recipe/ColorizeRecipe.scala index 85503e041..7d2fd4c37 100644 --- a/src/main/scala/li/cil/oc/common/recipe/ColorizeRecipe.scala +++ b/src/main/scala/li/cil/oc/common/recipe/ColorizeRecipe.scala @@ -42,7 +42,7 @@ class ColorizeRecipe(target: Item, source: Array[Item] = null) extends Container if (dye.isEmpty) 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 green = (itemColor(1) * 255.0F).toInt val blue = (itemColor(2) * 255.0F).toInt diff --git a/src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala b/src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala index d21ec97f7..a21d9570c 100644 --- a/src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala +++ b/src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala @@ -8,7 +8,7 @@ import net.minecraft.util.StatCollector class DamageSourceWithRandomCause(name: String, numCauses: Int) extends DamageSource(name) { 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 withCauseFormat = format + ".player" if (damager != null && StatCollector.canTranslate(withCauseFormat))