AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-29 07:51:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

analyze fixed and API changed to use selected slot

Browse Source
This commit is contained in:
repo_alt 2021-09-14 17:45:27 +03:00
parent 3311876b48
commit 772d327edc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeper.scala
View File

@ -86,15 +86,15 @@ class UpgradeBeekeeper(val host: EnvironmentHost with internal.Agent) extends pr
withApiary(facing, housing => result(housing.getBeekeepingLogic.canWork)) withApiary(facing, housing => result(housing.getBeekeepingLogic.canWork))
} }
@Callback(doc = """function(slot:number, honeyslot:number):boolean -- Analyzes bee in the slot, uses honey from the second slot.""") @Callback(doc = """function(honeyslot:number):boolean -- Analyzes bee in selected slot, uses honey from the specified slot.""")
def analyze(context: Context, args: Arguments): Array[AnyRef] = { def analyze(context: Context, args: Arguments): Array[AnyRef] = {
val inventory = host.mainInventory val inventory = host.mainInventory
val specimenSlot = args.checkSlot(inventory, 0) val specimenSlot = host.selectedSlot
val specimen = inventory.getStackInSlot(specimenSlot) val specimen = inventory.getStackInSlot(specimenSlot)
if (BeeManager.beeRoot.isMember(specimen)) if (!BeeManager.beeRoot.isMember(specimen))
return result(false, "Not a bee") return result(false, "Not a bee")
val honeySlot = args.checkSlot(inventory, 1) val honeySlot = args.checkSlot(inventory, 0)
val honeyStack = inventory.getStackInSlot(honeySlot) val honeyStack = inventory.getStackInSlot(honeySlot)
if (honeyStack== null || honeyStack.stackSize == 0 || (honeyStack.getItem != PluginApiculture.items.honeydew && honeyStack.getItem != PluginApiculture.items.honeyDrop)) if (honeyStack== null || honeyStack.stackSize == 0 || (honeyStack.getItem != PluginApiculture.items.honeydew && honeyStack.getItem != PluginApiculture.items.honeyDrop))
return result(false, "No honey!") return result(false, "No honey!")