From 654749c17a76d105bc0e613a236b95983dd564f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 7 Apr 2015 15:12:19 +0200 Subject: [PATCH] Did I mention constants, yet? >_> --- src/main/scala/li/cil/oc/Constants.scala | 1 + src/main/scala/li/cil/oc/common/Proxy.scala | 20 +- .../scala/li/cil/oc/common/init/Items.scala | 217 +++++++++--------- 3 files changed, 118 insertions(+), 120 deletions(-) diff --git a/src/main/scala/li/cil/oc/Constants.scala b/src/main/scala/li/cil/oc/Constants.scala index 8f2453699..6b168a9b9 100644 --- a/src/main/scala/li/cil/oc/Constants.scala +++ b/src/main/scala/li/cil/oc/Constants.scala @@ -133,6 +133,7 @@ object Constants { final val TankControllerUpgrade = "tankControllerUpgrade" final val TankUpgrade = "tankUpgrade" final val Terminal = "terminal" + final val TexturePicker = "texturePicker" final val TractorBeamUpgrade = "tractorBeamUpgrade" final val Transistor = "transistor" final val UpgradeContainerTier1 = "upgradeContainer1" diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index 92f049a1a..e155b3329 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -34,14 +34,20 @@ class Proxy { registerExclusive("craftingPiston", new ItemStack(net.minecraft.init.Blocks.piston), new ItemStack(net.minecraft.init.Blocks.sticky_piston)) registerExclusive("torchRedstoneActive", new ItemStack(net.minecraft.init.Blocks.redstone_torch)) registerExclusive("nuggetGold", new ItemStack(net.minecraft.init.Items.gold_nugget)) - registerExclusive("nuggetIron", Items.ironNugget.createItemStack()) - if (OreDictionary.getOres("nuggetIron").exists(Items.ironNugget.createItemStack().isItemEqual)) { - Recipes.addMultiItem(Items.ironNugget, "nuggetIron") - Recipes.addItem(net.minecraft.init.Items.iron_ingot, "ingotIron") - } - else { - Items.ironNugget.showInItemList = false + val nuggetIron = Items.get(Constants.ItemName.IronNugget).createItemStack(1) + registerExclusive("nuggetIron", nuggetIron) + + Items.multi.subItem(nuggetIron) match { + case Some(subItem: item.IronNugget) => + if (OreDictionary.getOres("nuggetIron").exists(nuggetIron.isItemEqual)) { + Recipes.addMultiItem(subItem, "nuggetIron") + Recipes.addItem(net.minecraft.init.Items.iron_ingot, "ingotIron") + } + else { + Items.ironNugget.showInItemList = false + } + case _ => } // Avoid issues with Extra Utilities registering colored obsidian as `obsidian` diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala index c560c8723..0adcb39ca 100644 --- a/src/main/scala/li/cil/oc/common/init/Items.scala +++ b/src/main/scala/li/cil/oc/common/init/Items.scala @@ -122,7 +122,7 @@ object Items extends ItemAPI { nbt.setString(Settings.namespace + "lootPath", "OpenOS") nbt.setInteger(Settings.namespace + "color", Color.dyes.indexOf("dyeGreen")) - val stack = get("lootDisk").createItemStack(amount) + val stack = get(Constants.ItemName.LootDisk).createItemStack(amount) stack.setTagCompound(nbt) stack @@ -165,10 +165,7 @@ object Items extends ItemAPI { get(Constants.ItemName.RAMTier6).createItemStack(1) ) - val stack = get(Constants.ItemName.Drone).createItemStack(1) - data.save(stack) - - stack + data.createItemStack() } def createConfiguredMicrocontroller() = { @@ -188,10 +185,7 @@ object Items extends ItemAPI { get(Constants.ItemName.RAMTier6).createItemStack(1) ) - val stack = get(Constants.BlockName.Microcontroller).createItemStack(1) - data.save(stack) - - stack + data.createItemStack() } def createConfiguredRobot() = { @@ -229,13 +223,10 @@ object Items extends ItemAPI { data.containers = Array( get(Constants.ItemName.CardContainerTier3).createItemStack(1), get(Constants.ItemName.UpgradeContainerTier3).createItemStack(1), - get("diskDrive").createItemStack(1) + get(Constants.BlockName.DiskDrive).createItemStack(1) ) - val stack = get("robot").createItemStack(1) - data.save(stack) - - stack + data.createItemStack() } def createConfiguredTablet() = { @@ -263,7 +254,7 @@ object Items extends ItemAPI { Option(createOpenOS()), Option(get(Constants.ItemName.HDDTier3).createItemStack(1)) ) - data.container = Option(get("diskDrive").createItemStack(1)) + data.container = Option(get(Constants.BlockName.DiskDrive).createItemStack(1)) val stack = get(Constants.ItemName.Tablet).createItemStack(1) data.save(stack) @@ -301,93 +292,93 @@ object Items extends ItemAPI { GameRegistry.registerItem(multi, "item") - Recipes.addMultiItem(new item.Analyzer(multi), "analyzer", "oc:analyzer") + Recipes.addMultiItem(new item.Analyzer(multi), Constants.ItemName.Analyzer, "oc:analyzer") - Recipes.addMultiItem(new item.Memory(multi, Tier.One), "ram1", "oc:ram1") - Recipes.addMultiItem(new item.Memory(multi, Tier.Three), "ram3", "oc:ram3") - Recipes.addMultiItem(new item.Memory(multi, Tier.Four), "ram4", "oc:ram4") + Recipes.addMultiItem(new item.Memory(multi, Tier.One), Constants.ItemName.RAMTier1, "oc:ram1") + Recipes.addMultiItem(new item.Memory(multi, Tier.Three), Constants.ItemName.RAMTier3, "oc:ram3") + Recipes.addMultiItem(new item.Memory(multi, Tier.Four), Constants.ItemName.RAMTier4, "oc:ram4") - Recipes.addMultiItem(new item.FloppyDisk(multi), "floppy", "oc:floppy") - Recipes.addMultiItem(new item.HardDiskDrive(multi, Tier.One), "hdd1", "oc:hdd1") - Recipes.addMultiItem(new item.HardDiskDrive(multi, Tier.Two), "hdd2", "oc:hdd2") - Recipes.addMultiItem(new item.HardDiskDrive(multi, Tier.Three), "hdd3", "oc:hdd3") + Recipes.addMultiItem(new item.FloppyDisk(multi), Constants.ItemName.Floppy, "oc:floppy") + Recipes.addMultiItem(new item.HardDiskDrive(multi, Tier.One), Constants.ItemName.HDDTier1, "oc:hdd1") + Recipes.addMultiItem(new item.HardDiskDrive(multi, Tier.Two), Constants.ItemName.HDDTier2, "oc:hdd2") + Recipes.addMultiItem(new item.HardDiskDrive(multi, Tier.Three), Constants.ItemName.HDDTier3, "oc:hdd3") - Recipes.addMultiItem(new item.GraphicsCard(multi, Tier.One), "graphicsCard1", "oc:graphicsCard1") - Recipes.addMultiItem(new item.GraphicsCard(multi, Tier.Two), "graphicsCard2", "oc:graphicsCard2") - Recipes.addMultiItem(new item.GraphicsCard(multi, Tier.Three), "graphicsCard3", "oc:graphicsCard3") - Recipes.addMultiItem(new item.NetworkCard(multi), "lanCard", "oc:lanCard") - Recipes.addMultiItem(new item.RedstoneCard(multi, Tier.Two), "redstoneCard2", "oc:redstoneCard2") - Recipes.addMultiItem(new item.WirelessNetworkCard(multi), "wlanCard", "oc:wlanCard") + Recipes.addMultiItem(new item.GraphicsCard(multi, Tier.One), Constants.ItemName.GraphicsCardTier1, "oc:graphicsCard1") + Recipes.addMultiItem(new item.GraphicsCard(multi, Tier.Two), Constants.ItemName.GraphicsCardTier2, "oc:graphicsCard2") + Recipes.addMultiItem(new item.GraphicsCard(multi, Tier.Three), Constants.ItemName.GraphicsCardTier3, "oc:graphicsCard3") + Recipes.addMultiItem(new item.NetworkCard(multi), Constants.ItemName.NetworkCard, "oc:lanCard") + Recipes.addMultiItem(new item.RedstoneCard(multi, Tier.Two), Constants.ItemName.RedstoneCardTier2, "oc:redstoneCard2") + Recipes.addMultiItem(new item.WirelessNetworkCard(multi), Constants.ItemName.WirelessNetworkCard, "oc:wlanCard") - Recipes.addMultiItem(new item.UpgradeCrafting(multi), "craftingUpgrade", "oc:craftingUpgrade") - Recipes.addMultiItem(new item.UpgradeGenerator(multi), "generatorUpgrade", "oc:generatorUpgrade") + Recipes.addMultiItem(new item.UpgradeCrafting(multi), Constants.ItemName.CraftingUpgrade, "oc:craftingUpgrade") + Recipes.addMultiItem(new item.UpgradeGenerator(multi), Constants.ItemName.GeneratorUpgrade, "oc:generatorUpgrade") ironNugget = new item.IronNugget(multi) - Recipes.addMultiItem(new item.CuttingWire(multi), "cuttingWire", "oc:materialCuttingWire") - Recipes.addMultiItem(new item.Acid(multi), "acid", "oc:materialAcid") - Recipes.addMultiItem(new item.Disk(multi), "disk", "oc:materialDisk") + Recipes.addMultiItem(new item.CuttingWire(multi), Constants.ItemName.CuttingWire, "oc:materialCuttingWire") + Recipes.addMultiItem(new item.Acid(multi), Constants.ItemName.Acid, "oc:materialAcid") + Recipes.addMultiItem(new item.Disk(multi), Constants.ItemName.Disk, "oc:materialDisk") - Recipes.addMultiItem(new item.ButtonGroup(multi), "buttonGroup", "oc:materialButtonGroup") - Recipes.addMultiItem(new item.ArrowKeys(multi), "arrowKeys", "oc:materialArrowKey") - Recipes.addMultiItem(new item.NumPad(multi), "numPad", "oc:materialNumPad") + Recipes.addMultiItem(new item.ButtonGroup(multi), Constants.ItemName.ButtonGroup, "oc:materialButtonGroup") + Recipes.addMultiItem(new item.ArrowKeys(multi), Constants.ItemName.ArrowKeys, "oc:materialArrowKey") + Recipes.addMultiItem(new item.NumPad(multi), Constants.ItemName.NumPad, "oc:materialNumPad") - Recipes.addMultiItem(new item.Transistor(multi), "transistor", "oc:materialTransistor") - Recipes.addMultiItem(new item.Microchip(multi, Tier.One), "chip1", "oc:circuitChip1") - Recipes.addMultiItem(new item.Microchip(multi, Tier.Two), "chip2", "oc:circuitChip2") - Recipes.addMultiItem(new item.Microchip(multi, Tier.Three), "chip3", "oc:circuitChip3") - Recipes.addMultiItem(new item.ALU(multi), "alu", "oc:materialALU") - Recipes.addMultiItem(new item.ControlUnit(multi), "cu", "oc:materialCU") - Recipes.addMultiItem(new item.CPU(multi, Tier.One), "cpu1", "oc:cpu1") + Recipes.addMultiItem(new item.Transistor(multi), Constants.ItemName.Transistor, "oc:materialTransistor") + Recipes.addMultiItem(new item.Microchip(multi, Tier.One), Constants.ItemName.ChipTier1, "oc:circuitChip1") + Recipes.addMultiItem(new item.Microchip(multi, Tier.Two), Constants.ItemName.ChipTier2, "oc:circuitChip2") + Recipes.addMultiItem(new item.Microchip(multi, Tier.Three), Constants.ItemName.ChipTier3, "oc:circuitChip3") + Recipes.addMultiItem(new item.ALU(multi), Constants.ItemName.Alu, "oc:materialALU") + Recipes.addMultiItem(new item.ControlUnit(multi), Constants.ItemName.ControlUnit, "oc:materialCU") + Recipes.addMultiItem(new item.CPU(multi, Tier.One), Constants.ItemName.CPUTier1, "oc:cpu1") - Recipes.addMultiItem(new item.RawCircuitBoard(multi), "rawCircuitBoard", "oc:materialCircuitBoardRaw") - Recipes.addMultiItem(new item.CircuitBoard(multi), "circuitBoard", "oc:materialCircuitBoard") - Recipes.addMultiItem(new item.PrintedCircuitBoard(multi), "printedCircuitBoard", "oc:materialCircuitBoardPrinted") - Recipes.addMultiItem(new item.CardBase(multi), "card", "oc:materialCard") + Recipes.addMultiItem(new item.RawCircuitBoard(multi), Constants.ItemName.RawCircuitBoard, "oc:materialCircuitBoardRaw") + Recipes.addMultiItem(new item.CircuitBoard(multi), Constants.ItemName.CircuitBoard, "oc:materialCircuitBoard") + Recipes.addMultiItem(new item.PrintedCircuitBoard(multi), Constants.ItemName.PrintedCircuitBoard, "oc:materialCircuitBoardPrinted") + Recipes.addMultiItem(new item.CardBase(multi), Constants.ItemName.Card, "oc:materialCard") // v1.1.0 - Recipes.addMultiItem(new item.UpgradeSolarGenerator(multi), "solarGeneratorUpgrade", "oc:solarGeneratorUpgrade") - Recipes.addMultiItem(new item.UpgradeSign(multi), "signUpgrade", "oc:signUpgrade") - Recipes.addMultiItem(new item.UpgradeNavigation(multi), "navigationUpgrade", "oc:navigationUpgrade") + Recipes.addMultiItem(new item.UpgradeSolarGenerator(multi), Constants.ItemName.SolarGeneratorUpgrade, "oc:solarGeneratorUpgrade") + Recipes.addMultiItem(new item.UpgradeSign(multi), Constants.ItemName.SignUpgrade, "oc:signUpgrade") + Recipes.addMultiItem(new item.UpgradeNavigation(multi), Constants.ItemName.NavigationUpgrade, "oc:navigationUpgrade") // Always create, to avoid shifting IDs. val abstractBus = new item.AbstractBusCard(multi) if (Mods.StargateTech2.isAvailable) { - Recipes.addMultiItem(abstractBus, "abstractBusCard", "oc:abstractBusCard") + Recipes.addMultiItem(abstractBus, Constants.ItemName.AbstractBusCard, "oc:abstractBusCard") } - Recipes.addMultiItem(new item.Memory(multi, Tier.Five), "ram5", "oc:ram5") - Recipes.addMultiItem(new item.Memory(multi, Tier.Six), "ram6", "oc:ram6") + Recipes.addMultiItem(new item.Memory(multi, Tier.Five), Constants.ItemName.RAMTier5, "oc:ram5") + Recipes.addMultiItem(new item.Memory(multi, Tier.Six), Constants.ItemName.RAMTier6, "oc:ram6") // v1.2.0 - Recipes.addMultiItem(new item.Server(multi, Tier.Three), "server3", "oc:server3") - Recipes.addMultiItem(new item.Terminal(multi), "terminal", "oc:terminal") - Recipes.addMultiItem(new item.CPU(multi, Tier.Two), "cpu2", "oc:cpu2") - Recipes.addMultiItem(new item.CPU(multi, Tier.Three), "cpu3", "oc:cpu3") - Recipes.addMultiItem(new item.InternetCard(multi), "internetCard", "oc:internetCard") - Recipes.addMultiItem(new item.Server(multi, Tier.One), "server1", "oc:server1") - Recipes.addMultiItem(new item.Server(multi, Tier.Two), "server2", "oc:server2") + Recipes.addMultiItem(new item.Server(multi, Tier.Three), Constants.ItemName.ServerTier3, "oc:server3") + Recipes.addMultiItem(new item.Terminal(multi), Constants.ItemName.Terminal, "oc:terminal") + Recipes.addMultiItem(new item.CPU(multi, Tier.Two), Constants.ItemName.CPUTier2, "oc:cpu2") + Recipes.addMultiItem(new item.CPU(multi, Tier.Three), Constants.ItemName.CPUTier3, "oc:cpu3") + Recipes.addMultiItem(new item.InternetCard(multi), Constants.ItemName.InternetCard, "oc:internetCard") + Recipes.addMultiItem(new item.Server(multi, Tier.One), Constants.ItemName.ServerTier1, "oc:server1") + Recipes.addMultiItem(new item.Server(multi, Tier.Two), Constants.ItemName.ServerTier2, "oc:server2") // v1.2.3 registerItem(new item.FloppyDisk(multi) { showInItemList = false - }, "lootDisk") + }, Constants.ItemName.LootDisk) // v1.2.6 - Recipes.addMultiItem(new item.Interweb(multi), "interweb", "oc:materialInterweb") - Recipes.addMultiItem(new item.UpgradeAngel(multi), "angelUpgrade", "oc:angelUpgrade") - Recipes.addMultiItem(new item.Memory(multi, Tier.Two), "ram2", "oc:ram2") + Recipes.addMultiItem(new item.Interweb(multi), Constants.ItemName.Interweb, "oc:materialInterweb") + Recipes.addMultiItem(new item.UpgradeAngel(multi), Constants.ItemName.AngelUpgrade, "oc:angelUpgrade") + Recipes.addMultiItem(new item.Memory(multi, Tier.Two), Constants.ItemName.RAMTier2, "oc:ram2") // v1.3.0 - Recipes.addMultiItem(new item.LinkedCard(multi), "linkedCard", "oc:linkedCard") - Recipes.addMultiItem(new item.UpgradeExperience(multi), "experienceUpgrade", "oc:experienceUpgrade") - Recipes.addMultiItem(new item.UpgradeInventory(multi), "inventoryUpgrade", "oc:inventoryUpgrade") - Recipes.addMultiItem(new item.UpgradeContainerUpgrade(multi, Tier.One), "upgradeContainer1", "oc:upgradeContainer1") - Recipes.addMultiItem(new item.UpgradeContainerUpgrade(multi, Tier.Two), "upgradeContainer2", "oc:upgradeContainer2") - Recipes.addMultiItem(new item.UpgradeContainerUpgrade(multi, Tier.Three), "upgradeContainer3", "oc:upgradeContainer3") - Recipes.addMultiItem(new item.UpgradeContainerCard(multi, Tier.One), "cardContainer1", "oc:cardContainer1") - Recipes.addMultiItem(new item.UpgradeContainerCard(multi, Tier.Two), "cardContainer2", "oc:cardContainer2") - Recipes.addMultiItem(new item.UpgradeContainerCard(multi, Tier.Three), "cardContainer3", "oc:cardContainer3") + Recipes.addMultiItem(new item.LinkedCard(multi), Constants.ItemName.LinkedCard, "oc:linkedCard") + Recipes.addMultiItem(new item.UpgradeExperience(multi), Constants.ItemName.ExperienceUpgrade, "oc:experienceUpgrade") + Recipes.addMultiItem(new item.UpgradeInventory(multi), Constants.ItemName.InventoryUpgrade, "oc:inventoryUpgrade") + Recipes.addMultiItem(new item.UpgradeContainerUpgrade(multi, Tier.One), Constants.ItemName.UpgradeContainerTier1, "oc:upgradeContainer1") + Recipes.addMultiItem(new item.UpgradeContainerUpgrade(multi, Tier.Two), Constants.ItemName.UpgradeContainerTier2, "oc:upgradeContainer2") + Recipes.addMultiItem(new item.UpgradeContainerUpgrade(multi, Tier.Three), Constants.ItemName.UpgradeContainerTier3, "oc:upgradeContainer3") + Recipes.addMultiItem(new item.UpgradeContainerCard(multi, Tier.One), Constants.ItemName.CardContainerTier1, "oc:cardContainer1") + Recipes.addMultiItem(new item.UpgradeContainerCard(multi, Tier.Two), Constants.ItemName.CardContainerTier2, "oc:cardContainer2") + Recipes.addMultiItem(new item.UpgradeContainerCard(multi, Tier.Three), Constants.ItemName.CardContainerTier3, "oc:cardContainer3") // Special case loot disk because this one's craftable and having it have // the same item damage would confuse NEI and the item costs computation. @@ -399,78 +390,78 @@ object Items extends ItemAPI { override def createItemStack(amount: Int) = createOpenOS(amount) override def onItemRightClick(stack: ItemStack, world: World, player: EntityPlayer) = { - if (player.isSneaking) get("floppy").createItemStack(1) + if (player.isSneaking) get(Constants.ItemName.Floppy).createItemStack(1) else super.onItemRightClick(stack, world, player) } } Recipes.addRecipe(createOpenOS(), "openOS") - Recipes.addMultiItem(new item.UpgradeInventoryController(multi), "inventoryControllerUpgrade", "oc:inventoryControllerUpgrade") - Recipes.addMultiItem(new item.UpgradeChunkloader(multi), "chunkloaderUpgrade", "oc:chunkloaderUpgrade") - Recipes.addMultiItem(new item.UpgradeBattery(multi, Tier.One), "batteryUpgrade1", "oc:batteryUpgrade1") - Recipes.addMultiItem(new item.UpgradeBattery(multi, Tier.Two), "batteryUpgrade2", "oc:batteryUpgrade2") - Recipes.addMultiItem(new item.UpgradeBattery(multi, Tier.Three), "batteryUpgrade3", "oc:batteryUpgrade3") - Recipes.addMultiItem(new item.RedstoneCard(multi, Tier.One), "redstoneCard1", "oc:redstoneCard1") + Recipes.addMultiItem(new item.UpgradeInventoryController(multi), Constants.ItemName.InventoryControllerUpgrade, "oc:inventoryControllerUpgrade") + Recipes.addMultiItem(new item.UpgradeChunkloader(multi), Constants.ItemName.ChunkloaderUpgrade, "oc:chunkloaderUpgrade") + Recipes.addMultiItem(new item.UpgradeBattery(multi, Tier.One), Constants.ItemName.BatteryUpgradeTier1, "oc:batteryUpgrade1") + Recipes.addMultiItem(new item.UpgradeBattery(multi, Tier.Two), Constants.ItemName.BatteryUpgradeTier2, "oc:batteryUpgrade2") + Recipes.addMultiItem(new item.UpgradeBattery(multi, Tier.Three), Constants.ItemName.BatteryUpgradeTier3, "oc:batteryUpgrade3") + Recipes.addMultiItem(new item.RedstoneCard(multi, Tier.One), Constants.ItemName.RedstoneCardTier1, "oc:redstoneCard1") // 1.3.2 - Recipes.addMultiItem(new item.UpgradeTractorBeam(multi), "tractorBeamUpgrade", "oc:tractorBeamUpgrade") + Recipes.addMultiItem(new item.UpgradeTractorBeam(multi), Constants.ItemName.TractorBeamUpgrade, "oc:tractorBeamUpgrade") // 1.3.? - registerItem(new item.Tablet(multi), "tablet") + registerItem(new item.Tablet(multi), Constants.ItemName.Tablet) // 1.3.2 (cont.) - registerItem(new item.Server(multi, Tier.Four), "serverCreative") + registerItem(new item.Server(multi, Tier.Four), Constants.ItemName.ServerCreative) // 1.3.3 - Recipes.addMultiItem(new item.ComponentBus(multi, Tier.One), "componentBus1", "oc:componentBus1") - Recipes.addMultiItem(new item.ComponentBus(multi, Tier.Two), "componentBus2", "oc:componentBus2") - Recipes.addMultiItem(new item.ComponentBus(multi, Tier.Three), "componentBus3", "oc:componentBus3") - registerItem(new item.DebugCard(multi), "debugCard") + Recipes.addMultiItem(new item.ComponentBus(multi, Tier.One), Constants.ItemName.ComponentBusTier1, "oc:componentBus1") + Recipes.addMultiItem(new item.ComponentBus(multi, Tier.Two), Constants.ItemName.ComponentBusTier2, "oc:componentBus2") + Recipes.addMultiItem(new item.ComponentBus(multi, Tier.Three), Constants.ItemName.ComponentBusTier3, "oc:componentBus3") + registerItem(new item.DebugCard(multi), Constants.ItemName.DebugCard) // 1.3.5 - Recipes.addMultiItem(new item.TabletCase(multi, Tier.One), "tabletCase1", "oc:tabletCase1") - Recipes.addMultiItem(new item.UpgradePiston(multi), "pistonUpgrade", "oc:pistonUpgrade") - Recipes.addMultiItem(new item.UpgradeTank(multi), "tankUpgrade", "oc:tankUpgrade") - Recipes.addMultiItem(new item.UpgradeTankController(multi), "tankControllerUpgrade", "oc:tankControllerUpgrade") + Recipes.addMultiItem(new item.TabletCase(multi, Tier.One), Constants.ItemName.TabletCaseTier1, "oc:tabletCase1") + Recipes.addMultiItem(new item.UpgradePiston(multi), Constants.ItemName.PistonUpgrade, "oc:pistonUpgrade") + Recipes.addMultiItem(new item.UpgradeTank(multi), Constants.ItemName.TankUpgrade, "oc:tankUpgrade") + Recipes.addMultiItem(new item.UpgradeTankController(multi), Constants.ItemName.TankControllerUpgrade, "oc:tankControllerUpgrade") // 1.4.0 - Recipes.addMultiItem(new item.UpgradeDatabase(multi, Tier.One), "databaseUpgrade1", "oc:databaseUpgrade1") - Recipes.addMultiItem(new item.UpgradeDatabase(multi, Tier.Two), "databaseUpgrade2", "oc:databaseUpgrade2") - Recipes.addMultiItem(new item.UpgradeDatabase(multi, Tier.Three), "databaseUpgrade3", "oc:databaseUpgrade3") - registerItem(new item.Debugger(multi), "debugger") + Recipes.addMultiItem(new item.UpgradeDatabase(multi, Tier.One), Constants.ItemName.DatabaseUpgradeTier1, "oc:databaseUpgrade1") + Recipes.addMultiItem(new item.UpgradeDatabase(multi, Tier.Two), Constants.ItemName.DatabaseUpgradeTier2, "oc:databaseUpgrade2") + Recipes.addMultiItem(new item.UpgradeDatabase(multi, Tier.Three), Constants.ItemName.DatabaseUpgradeTier3, "oc:databaseUpgrade3") + registerItem(new item.Debugger(multi), Constants.ItemName.Debugger) // 1.4.2 val eeprom = new item.EEPROM() - Recipes.addItem(eeprom, "eeprom", "oc:eeprom") + Recipes.addItem(eeprom, Constants.ItemName.EEPROM, "oc:eeprom") Recipes.addRecipe(createLuaBios(), "luaBios") - Recipes.addMultiItem(new item.MicrocontrollerCase(multi, Tier.One), "microcontrollerCase1", "oc:microcontrollerCase1") + Recipes.addMultiItem(new item.MicrocontrollerCase(multi, Tier.One), Constants.ItemName.MicrocontrollerCaseTier1, "oc:microcontrollerCase1") // 1.4.3 - Recipes.addMultiItem(new item.DroneCase(multi, Tier.One), "droneCase1", "oc:droneCase1") - registerItem(new item.Drone(multi), "drone") - Recipes.addMultiItem(new UpgradeLeash(multi), "leashUpgrade", "oc:leashUpgrade") - Recipes.addMultiItem(new item.MicrocontrollerCase(multi, Tier.Two), "microcontrollerCase2", "oc:microcontrollerCase2") - Recipes.addMultiItem(new item.DroneCase(multi, Tier.Two), "droneCase2", "oc:droneCase2") - registerItem(new item.Present(multi), "present") + Recipes.addMultiItem(new item.DroneCase(multi, Tier.One), Constants.ItemName.DroneCaseTier1, "oc:droneCase1") + registerItem(new item.Drone(multi), Constants.ItemName.Drone) + Recipes.addMultiItem(new UpgradeLeash(multi), Constants.ItemName.LeashUpgrade, "oc:leashUpgrade") + Recipes.addMultiItem(new item.MicrocontrollerCase(multi, Tier.Two), Constants.ItemName.MicrocontrollerCaseTier2, "oc:microcontrollerCase2") + Recipes.addMultiItem(new item.DroneCase(multi, Tier.Two), Constants.ItemName.DroneCaseTier2, "oc:droneCase2") + registerItem(new item.Present(multi), Constants.ItemName.Present) // Always create, to avoid shifting IDs. val worldSensorCard = new item.WorldSensorCard(multi) if (Mods.Galacticraft.isAvailable) { - Recipes.addMultiItem(worldSensorCard, "worldSensorCard", "oc:worldSensorCard") + Recipes.addMultiItem(worldSensorCard, Constants.ItemName.WorldSensorCard, "oc:worldSensorCard") } // 1.4.4 - registerItem(new item.MicrocontrollerCase(multi, Tier.Four), "microcontrollerCaseCreative") - registerItem(new item.DroneCase(multi, Tier.Four), "droneCaseCreative") + registerItem(new item.MicrocontrollerCase(multi, Tier.Four), Constants.ItemName.MicrocontrollerCaseCreative) + registerItem(new item.DroneCase(multi, Tier.Four), Constants.ItemName.DroneCaseCreative) // 1.4.7 - Recipes.addMultiItem(new item.TabletCase(multi, Tier.Two), "tabletCase2", "oc:tabletCase2") - registerItem(new item.TabletCase(multi, Tier.Four), "tabletCaseCreative") + Recipes.addMultiItem(new item.TabletCase(multi, Tier.Two), Constants.ItemName.TabletCaseTier2, "oc:tabletCase2") + registerItem(new item.TabletCase(multi, Tier.Four), Constants.ItemName.TabletCaseCreative) // 1.5.4 - Recipes.addMultiItem(new item.InkCartridgeEmpty(multi), "inkCartridgeEmpty", "oc:inkCartridgeEmpty") - Recipes.addMultiItem(new item.InkCartridge(multi), "inkCartridge", "oc:inkCartridge") - Recipes.addMultiItem(new item.Chamelium(multi), "chamelium", "oc:chamelium") - Recipes.addMultiItem(new item.TexturePicker(multi), "texturePicker", "oc:texturePicker") + Recipes.addMultiItem(new item.InkCartridgeEmpty(multi), Constants.ItemName.InkCartridgeEmpty, "oc:inkCartridgeEmpty") + Recipes.addMultiItem(new item.InkCartridge(multi), Constants.ItemName.InkCartridge, "oc:inkCartridge") + Recipes.addMultiItem(new item.Chamelium(multi), Constants.ItemName.Chamelium, "oc:chamelium") + Recipes.addMultiItem(new item.TexturePicker(multi), Constants.ItemName.TexturePicker, "oc:texturePicker") } }