MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

turtle equip round 2

Browse Source
This commit is contained in:
kepler155c@gmail.com
2019-03-07 17:49:06 -05:00
parent fd5343c9c2
commit 7d83e66e4a
8 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
turtle/apis/equipper.lua
View File

@@ -41,18 +41,18 @@ local function getEquipped()
elseif not Equipper.equipped.left then
local slot = Equipper.unequip('left')
if slot then
turtle.equip('left', slot.name .. ':' .. slot.damage)
Equipper.equipped.left = slot.name .. ':' .. slot.damage
end
elseif not Equipper.equipped.right then
local slot = Equipper.unequip('right')
if slot then
turtle.equip('right', slot.name .. ':' .. slot.damage)
Equipper.equipped.right = slot.name .. ':' .. slot.damage
end
end
end
_debug("Detected Equipped")
_debug(Equipper.equipped)
end
function Equipper.unequip(side)
@@ -81,7 +81,7 @@ function Equipper.equip(side, invName, equippedName)
-- is it already equipped ?
if Equipper.equipped[side] == (equippedName or invName) then
return
return peripheral.getType(side) and peripheral.wrap(side)
end
-- is it equipped on other side ?
if Equipper.equipped[reversed[side]] == (equippedName or invName) then
@@ -95,16 +95,15 @@ function Equipper.equip(side, invName, equippedName)
Equipper.equipped[side] = peripheral.getType(side) or invName
_debug("Equipped: " .. invName)
_debug(Equipper.equipped)
return peripheral.getType(side) and peripheral.wrap(side)
end
function Equipper.equipLeft(invName, equippedName)
Equipper.equip('left', invName, equippedName)
return Equipper.equip('left', invName, equippedName)
end
function Equipper.equipRight(invName, equippedName)
Equipper.equip('right', invName, equippedName)
return Equipper.equip('right', invName, equippedName)
end
return Equipper

5
turtle/lavaRefuel.lua
View File

@@ -1,7 +1,6 @@
local Equipper = require('turtle.equipper')
local Point = require('point')
local device = _G.device
local peripheral = _G.device
local turtle = _G.turtle
@@ -16,9 +15,7 @@ if not turtle.has('minecraft:bucket') then
end
local swapSide = peripheral.getType('right') == 'modem' and 'left' or 'right'
Equipper.equip(swapSide, 'plethora:module:2', 'plethora:scanner')
local scanner = device['plethora:scanner']
local scanner = Equipper.equip(swapSide, 'plethora:module:2', 'plethora:scanner')
if not turtle.select('minecraft:bucket') then
error('bucket required')