forked from mrkubax10/industrialtest
Refactor upgrades
This commit is contained in:
@@ -128,27 +128,37 @@ function industrialtest.Machine.onMetadataInventoryMove(self,pos,fromList,fromIn
|
||||
if toList=="upgrades" then
|
||||
local meta=minetest.get_meta(pos)
|
||||
local inv=meta:get_inventory()
|
||||
local stack=inv:get_stack(fromList,fromIndex)
|
||||
industrialtest.internal.applyUpgrade(pos,meta,stack)
|
||||
local itemstack=inv:get_stack(fromList,fromIndex)
|
||||
local def=itemstack:get_definition()
|
||||
if def and def._industrialtest_self and def._industrialtest_self.apply then
|
||||
def._industrialtest_self:apply(pos)
|
||||
end
|
||||
elseif fromList=="upgrades" then
|
||||
local meta=minetest.get_meta(pos)
|
||||
local inv=meta:get_inventory()
|
||||
local stack=inv:get_stack(fromList,fromIndex)
|
||||
industrialtest.internal.removeUpgrade(pos,meta,stack)
|
||||
local itemstack=inv:get_stack(fromList,fromIndex)
|
||||
local def=itemstack:get_definition()
|
||||
if def and def._industrialtest_self and def._industrialtest_self.remove then
|
||||
def._industrialtest_self:remove(pos)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function industrialtest.Machine.onMetadataInventoryPut(self,pos,listname,index,stack)
|
||||
if listname=="upgrades" then
|
||||
local meta=minetest.get_meta(pos)
|
||||
industrialtest.internal.applyUpgrade(pos,meta,stack)
|
||||
local def=stack:get_definition()
|
||||
if def and def._industrialtest_self and def._industrialtest_self.apply then
|
||||
def._industrialtest_self:apply(pos)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function industrialtest.Machine.onMetadataInventoryTake(self,pos,listname,index,stack)
|
||||
if listname=="upgrades" then
|
||||
local meta=minetest.get_meta(pos)
|
||||
industrialtest.internal.removeUpgrade(pos,meta,stack)
|
||||
local def=stack:get_definition()
|
||||
if def and def._industrialtest_self and def._industrialtest_self.remove then
|
||||
def._industrialtest_self:remove(pos)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -289,8 +299,8 @@ function industrialtest.Machine.register(self)
|
||||
industrialtest.api.addTag(self.name,"usesTimer")
|
||||
end
|
||||
|
||||
function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,stack)
|
||||
local def=minetest.registered_items[stack:get_name()]
|
||||
function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,itemstack)
|
||||
local def=itemstack:get_definition()
|
||||
if not def or not def.groups or not def.groups._industrialtest_machineUpgrade then
|
||||
return 0
|
||||
end
|
||||
@@ -300,5 +310,5 @@ function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,stack)
|
||||
if not targetSlot:is_empty() then
|
||||
return 0
|
||||
end
|
||||
return stack:get_count()
|
||||
return itemstack:get_count()
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user