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

Less ambiguous... -.-

Browse Source
This commit is contained in:
Florian Nücke 2015-02-26 19:14:17 +01:00
parent 142ce7edd0
commit d906ae50d8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/common/Achievement.scala
View File

@ -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
}
}

1
src/main/scala/li/cil/oc/common/Loot.scala
View File

@ -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