AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

catching npe when library is not present and starting computer in single player; fixed iron nugget not being used via oredict

Browse Source
This commit is contained in:
Florian Nücke 2013-12-07 23:33:26 +01:00
parent 3ebda93e94
commit 9a8da535e2
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
li/cil/oc/Recipes.scala
View File

@ -58,7 +58,6 @@ object Recipes {
val hdd1 = Items.hdd1.createItemStack() val hdd1 = Items.hdd1.createItemStack()
val hdd2 = Items.hdd2.createItemStack() val hdd2 = Items.hdd2.createItemStack()
val hdd3 = Items.hdd3.createItemStack() val hdd3 = Items.hdd3.createItemStack()
val ironNugget = Items.ironNugget.createItemStack()
val lanCard = Items.lan.createItemStack() val lanCard = Items.lan.createItemStack()
val pcb = Items.pcb.createItemStack() val pcb = Items.pcb.createItemStack()
val ram1 = Items.ram1.createItemStack() val ram1 = Items.ram1.createItemStack()
@ -72,7 +71,7 @@ object Recipes {
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
GameRegistry.addRecipe(new ShapelessOreRecipe(Items.ironNugget.createItemStack(9), ironIngot)) GameRegistry.addRecipe(new ShapelessOreRecipe(Items.ironNugget.createItemStack(9), ironIngot))
GameRegistry.addShapelessRecipe(Items.cuttingWire.createItemStack(1), new ItemStack(Item.shears, 1, OreDictionary.WILDCARD_VALUE), ironNugget, stick) GameRegistry.addShapelessRecipe(Items.cuttingWire.createItemStack(1), new ItemStack(Item.shears, 1, OreDictionary.WILDCARD_VALUE), Items.ironNugget.createItemStack(), stick)
GameRegistry.addShapelessRecipe(rawBoard, Items.cuttingWire.createItemStack(), new ItemStack(Block.blockClay), cactusGreen) GameRegistry.addShapelessRecipe(rawBoard, Items.cuttingWire.createItemStack(), new ItemStack(Block.blockClay), cactusGreen)
FurnaceRecipes.smelting().addSmelting(rawBoard.itemID, rawBoard.getItemDamage, board, 1) FurnaceRecipes.smelting().addSmelting(rawBoard.itemID, rawBoard.getItemDamage, board, 1)
GameRegistry.addRecipe(new ShapelessOreRecipe(acid, Item.bucketWater, sugar, roseRed, slimeBall, spiderEye, boneMeal)) GameRegistry.addRecipe(new ShapelessOreRecipe(acid, Item.bucketWater, sugar, roseRed, slimeBall, spiderEye, boneMeal))
@ -88,13 +87,13 @@ object Recipes {
" i ", " i ",
"i i", "i i",
" i ", " i ",
'i', ironNugget) 'i', "nuggetIron")
addRecipe(transistor, addRecipe(transistor,
"iii", "iii",
"grg", "grg",
" t ", " t ",
'i', ironNugget, 'i', "nuggetIron",
'g', goldNugget, 'g', goldNugget,
'r', redstoneDust, 'r', redstoneDust,
't', redstoneTorch) 't', redstoneTorch)
@ -133,7 +132,7 @@ object Recipes {
'r', repeater, 'r', repeater,
's', transistor, 's', transistor,
't', redstoneTorch, 't', redstoneTorch,
'i', ironNugget, 'i', "nuggetIron",
'd', redstoneDust) 'd', redstoneDust)
addRecipe(cu, addRecipe(cu,
@ -160,7 +159,7 @@ object Recipes {
"ict", "ict",
"ibb", "ibb",
"igg", "igg",
'i', ironNugget, 'i', "nuggetIron",
'c', chip1, 'c', chip1,
't', transistor, 't', transistor,
'b', pcb, 'b', pcb,
@ -334,7 +333,7 @@ object Recipes {
" i ", " i ",
"iri", "iri",
" i ", " i ",
'i', ironNugget, 'i', "nuggetIron",
'r', redstoneDust) 'r', redstoneDust)
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
@ -373,7 +372,7 @@ object Recipes {
"ili", "ili",
"bdb", "bdb",
"ipi", "ipi",
'i', ironNugget, 'i', "nuggetIron",
'l', lever, 'l', lever,
'b', board, 'b', board,
'd', disk, 'd', disk,

6
li/cil/oc/server/component/Computer.scala
View File

@ -1133,8 +1133,10 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
if (state.size == 0 || state.top != Computer.State.Stopped) { if (state.size == 0 || state.top != Computer.State.Stopped) {
state.clear() state.clear()
state.push(Computer.State.Stopped) state.push(Computer.State.Stopped)
lua.setTotalMemory(Integer.MAX_VALUE) if (lua != null) {
lua.close() lua.setTotalMemory(Integer.MAX_VALUE)
lua.close()
}
lua = null lua = null
kernelMemory = 0 kernelMemory = 0
signals.clear() signals.clear()