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

peripheral overhaul + 1.7 fixes

Browse Source
This commit is contained in:
kepler155c
2018-01-06 22:26:21 -05:00
parent f2b9efc80f
commit 44932ac515
12 changed files with 536 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apis/itemDB.lua
View File

@@ -50,7 +50,7 @@ function itemDB:splitKey(key, item)
return item
end
function itemDB:get(key, enforceNBT)
function itemDB:get(key)
if type(key) == 'string' then
key = self:splitKey(key)
end
@@ -89,7 +89,7 @@ end
If the base item contains an NBT hash, then the NBT hash uniquely
identifies this item.
]]--
function itemDB:add(baseItem, detail)
function itemDB:add(baseItem)
local nItem = {
name = baseItem.name,
damage = baseItem.damage,
@@ -101,9 +101,9 @@ function itemDB:add(baseItem, detail)
debug('--')
debug('adding ' .. makeKey(nItem))
nItem.displayName = safeString(detail.displayName)
nItem.maxCount = detail.maxCount
nItem.maxDamage = detail.maxDamage
nItem.displayName = safeString(baseItem.displayName)
nItem.maxCount = baseItem.maxCount
nItem.maxDamage = baseItem.maxDamage
for k,item in pairs(self.data) do
if nItem.name == item.name and