From d906ae50d845480ae0d64dc64553f49c75c44f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 26 Feb 2015 19:14:17 +0100 Subject: [PATCH] Less ambiguous... -.- --- src/main/scala/li/cil/oc/common/Achievement.scala | 11 ++++++++--- src/main/scala/li/cil/oc/common/Loot.scala | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/Achievement.scala b/src/main/scala/li/cil/oc/common/Achievement.scala index f5d07ba68..499c89b72 100644 --- a/src/main/scala/li/cil/oc/common/Achievement.scala +++ b/src/main/scala/li/cil/oc/common/Achievement.scala @@ -16,7 +16,7 @@ object Achievement { val CraftingMap = mutable.Map.empty[ItemInfo, MCAchievement] val Transistor = new Achievement("oc.transistor", "oc.transistor", - 2, 0, Items.get("transistor").createItemStack(1), null, "transistor").initIndependentStat() + 2, 0, Items.get("transistor").createItemStack(1), null, "transistor").setIndependent() val Disassembler = new Achievement("oc.disassembler", "oc.disassembler", 2, 2, Items.get("disassembler").createItemStack(1), Transistor, "disassembler") val Microchip = new Achievement("oc.chip", "oc.chip", @@ -71,7 +71,7 @@ object Achievement { 8, 10, Items.get("raid").createItemStack(1), DiskDrive, "raid") val Card = new Achievement("oc.card", "oc.card", - 0, -2, Items.get("card").createItemStack(1), null, "card").initIndependentStat() + 0, -2, Items.get("card").createItemStack(1), null, "card").setIndependent() val RedstoneCard = new Achievement("oc.redstoneCard", "oc.redstoneCard", -2, -4, Items.get("redstoneCard1").createItemStack(1), Card, "redstoneCard1", "redstoneCard2") val GraphicsCard = new Achievement("oc.graphicsCard", "oc.graphicsCard", @@ -82,7 +82,7 @@ object Achievement { 2, -6, Items.get("wlanCard").createItemStack(1), NetworkCard, "wlanCard") val Cable = new Achievement("oc.cable", "oc.cable", - -2, 0, Items.get("cable").createItemStack(1), null, "cable").initIndependentStat() + -2, 0, Items.get("cable").createItemStack(1), null, "cable").setIndependent() val PowerDistributor = new Achievement("oc.powerDistributor", "oc.powerDistributor", -4, -1, Items.get("powerDistributor").createItemStack(1), Cable, "powerDistributor") val Switch = new Achievement("oc.switch", "oc.switch", @@ -123,4 +123,9 @@ class Achievement(name: String, description: String, x: Int, y: Int, stack: Item Achievement.CraftingMap += descriptor -> this } } + + def setIndependent() = { + this.asInstanceOf[StatBase].initIndependentStat() + this + } } diff --git a/src/main/scala/li/cil/oc/common/Loot.scala b/src/main/scala/li/cil/oc/common/Loot.scala index 973cbaaa4..9b3ee9048 100644 --- a/src/main/scala/li/cil/oc/common/Loot.scala +++ b/src/main/scala/li/cil/oc/common/Loot.scala @@ -8,7 +8,6 @@ import li.cil.oc.OpenComputers import li.cil.oc.Settings import li.cil.oc.api import li.cil.oc.common.init.Items -import li.cil.oc.common.recipe.Recipes import li.cil.oc.util.Color import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack