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

Merge branch master-MC1.7.10 into master-MC1.10

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Cable.scala
This commit is contained in:
payonel 2018-02-21 11:41:24 -08:00
commit c054a0e598
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
View File

@ -56,11 +56,14 @@ class UpgradeCrafting(val host: EnvironmentHost with internal.Robot) extends pre
load() load()
val cm = CraftingManager.getInstance val cm = CraftingManager.getInstance
var countCrafted = 0 var countCrafted = 0
val canCraft = cm.findMatchingRecipe(CraftingInventory, host.world) != null val originalCraft = cm.findMatchingRecipe(CraftingInventory, host.world)
breakable { breakable {
while (countCrafted < wantedCount) { while (countCrafted < wantedCount) {
val result = cm.findMatchingRecipe(CraftingInventory, host.world) val result = cm.findMatchingRecipe(CraftingInventory, host.world)
if (result == null || result.stackSize < 1) break() if (result == null || result.stackSize < 1) break()
if (!originalCraft.isItemEqual(result)) {
break()
}
countCrafted += result.stackSize countCrafted += result.stackSize
FMLCommonHandler.instance.firePlayerCraftingEvent(host.player, result, this) FMLCommonHandler.instance.firePlayerCraftingEvent(host.player, result, this)
val surplus = mutable.ArrayBuffer.empty[ItemStack] val surplus = mutable.ArrayBuffer.empty[ItemStack]
@ -91,7 +94,7 @@ class UpgradeCrafting(val host: EnvironmentHost with internal.Robot) extends pre
load() load()
} }
} }
Seq(canCraft, countCrafted) Seq(originalCraft != null, countCrafted)
} }
def load() { def load() {

21
src/main/scala/li/cil/oc/server/machine/luac/ComputerAPI.scala
View File

@ -77,15 +77,18 @@ class ComputerAPI(owner: NativeLuaArchitecture) extends NativeLuaAPI(owner) {
}) })
lua.setField(-2, "users") lua.setField(-2, "users")
lua.pushScalaFunction(lua => try { lua.pushScalaFunction(lua => {
machine.addUser(lua.checkString(1)) val user = lua.checkString(1)
lua.pushBoolean(true) try {
1 machine.addUser(user)
} catch { lua.pushBoolean(true)
case e: Throwable => 1
lua.pushNil() } catch {
lua.pushString(Option(e.getMessage).getOrElse(e.toString)) case e: Throwable =>
2 lua.pushNil()
lua.pushString(Option(e.getMessage).getOrElse(e.toString))
2
}
}) })
lua.setField(-2, "addUser") lua.setField(-2, "addUser")