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

Fixed EEPROM with data (even if just an address) not being usable for crafting a Lua BIOS. Closes #828.

Browse Source
This commit is contained in:
Florian Nücke 2015-01-17 13:36:21 +01:00
parent 3157eb4f36
commit 6f9f27fe02
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
View File

@ -5,6 +5,7 @@ import java.util.UUID
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.api.detail.ItemInfo import li.cil.oc.api.detail.ItemInfo
import li.cil.oc.common.init.Items
import li.cil.oc.integration.Mods import li.cil.oc.integration.Mods
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.ItemUtils import li.cil.oc.util.ItemUtils
@ -20,6 +21,7 @@ import scala.util.control.Breaks._
object ExtendedRecipe { object ExtendedRecipe {
private lazy val drone = api.Items.get("drone") private lazy val drone = api.Items.get("drone")
private lazy val eeprom = api.Items.get("eeprom") private lazy val eeprom = api.Items.get("eeprom")
private lazy val luaBios = Items.createLuaBios()
private lazy val mcu = api.Items.get("microcontroller") private lazy val mcu = api.Items.get("microcontroller")
private lazy val navigationUpgrade = api.Items.get("navigationUpgrade") private lazy val navigationUpgrade = api.Items.get("navigationUpgrade")
private lazy val linkedCard = api.Items.get("linkedCard") private lazy val linkedCard = api.Items.get("linkedCard")
@ -71,7 +73,7 @@ object ExtendedRecipe {
} }
} }
if (api.Items.get(craftedStack) == eeprom) breakable { if (api.Items.get(craftedStack) == eeprom && !ItemStack.areItemStackTagsEqual(craftedStack, luaBios)) breakable {
for (slot <- 0 until inventory.getSizeInventory) { for (slot <- 0 until inventory.getSizeInventory) {
val stack = inventory.getStackInSlot(slot) val stack = inventory.getStackInSlot(slot)
if (stack != null && api.Items.get(stack) == eeprom && stack.hasTagCompound) { if (stack != null && api.Items.get(stack) == eeprom && stack.hasTagCompound) {