Refactor Induction Furnace

machines/induction_furnace.lua

@@ -15,29 +15,65 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.InductionFurnace=table.copy(industrialtest.ActivatedElectricMachine)
+industrialtest.internal.unpackTableInto(industrialtest.InductionFurnace,{
+	name="industrialtest:induction_furnace",
+	description=S("Induction Furnace"),
+	tiles={
+		"industrialtest_advanced_machine_block.png",
+		"industrialtest_advanced_machine_block.png",
+		"industrialtest_advanced_machine_block.png",
+		"industrialtest_advanced_machine_block.png",
+		"industrialtest_advanced_machine_block.png",
+		"industrialtest_advanced_machine_block.png^industrialtest_electric_furnace_front.png"
+	},
+	sounds="metal",
+	requiresWrench=true,
+	facedir=true,
+	storageLists={
+		"src",
+		"dst",
+		"upgrades",
+		"powerStorage"
+	},
+	powerLists={
+		{
+			list="powerStorage",
+			direction="i"
+		}
+	},
+	active={
+		tiles={
+			"industrialtest_advanced_machine_block.png",
+			"industrialtest_advanced_machine_block.png",
+			"industrialtest_advanced_machine_block.png",
+			"industrialtest_advanced_machine_block.png",
+			"industrialtest_advanced_machine_block.png",
+			"industrialtest_advanced_machine_block.png^industrialtest_electric_furnace_front_active.png"
+		}
+	},
+	capacity=industrialtest.api.mvPowerFlow*2,
+	flow=industrialtest.api.mvPowerFlow,
+	hasPowerInput=true,
+	ioConfig="iiiiii",
+	_opPower=60,
+	_efficiency=0.5
+})
 
-local inductionFurnace={}
+function industrialtest.InductionFurnace.onConstruct(self,pos)
-inductionFurnace.opPower=60
-inductionFurnace.efficiency=0.5
-
-local function calculateMaxSrcTime(pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
-	local srcList=inv:get_list("src")
+	inv:set_size("src",2)
-
+	inv:set_size("dst",2)
-	local maxSrcTime=0
+	inv:set_size("powerStorage",1)
-	for _,slot in ipairs(srcList) do
+	inv:set_size("upgrades",4)
-		local result,_=minetest.get_craft_result({
+	meta:set_int("heat",0)
-			method="cooking",
+	meta:set_float("srcTime",0)
-			width=1,
+	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
-			items={slot}
-		})
-		maxSrcTime=math.max(maxSrcTime,result.time*inductionFurnace.efficiency)
-	end
-	meta:set_float("maxSrcTime",maxSrcTime)
 end
 
-inductionFurnace.getFormspec=function(pos)
+function industrialtest.InductionFurnace.getFormspec(self,pos)
+	local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local maxSrcTime=meta:get_float("maxSrcTime")
@@ -60,32 +96,74 @@ inductionFurnace.getFormspec=function(pos)
 		"listring[context;src]",
 		"listring[context;dst]"
     }
-	return table.concat(formspec,"")
+	return parentFormspec..table.concat(formspec,"")
 end
 
-inductionFurnace.onConstruct=function(pos,meta,inv)
+function industrialtest.InductionFurnace.update(self,pos,elapsed,meta,inv)
-	inv:set_size("src",2)
-	inv:set_size("dst",2)
-	inv:set_size("powerStorage",1)
-	inv:set_size("upgrades",4)
-	meta:set_int("heat",0)
-	meta:set_float("srcTime",0)
-end
-
-inductionFurnace.onTimer=function(pos,elapsed,meta,inv)
-	local shouldRerunTimer=false
-	local shouldUpdateFormspec=false
 	local srcList=inv:get_list("src")
 	local heat=meta:get_int("heat")
-
+	local shouldRerunTimer=false
-	shouldRerunTimer,shouldUpdateFormspec=industrialtest.internal.chargeFromPowerStorageItem(meta,inv)
+	local shouldUpdateFormspec=false
 
 	if heat>0 then
 		meta:set_int("heat",math.max(heat-math.max(2*elapsed,1),0))
-		shouldRerunTimer=shouldRerunTimer or heat>0
+		shouldRerunTimer=true
 		shouldUpdateFormspec=true
 	end
 
+	return shouldRerunTimer,shouldUpdateFormspec
+end
+
+function industrialtest.InductionFurnace.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+	if toList=="dst" then
+		return 0
+	end
+	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+end
+
+function industrialtest.InductionFurnace.allowMetadataInventoryPut(self,pos,listname,index,stack)
+	if listname=="dst" then
+		return 0
+	end
+	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack)
+end
+
+function industrialtest.InductionFurnace.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+	industrialtest.ActivatedElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+	if fromList=="src" or toList=="src" then
+		self:calculateMaxSrcTime(pos)
+	end
+	if fromList=="src" and self.isInputEmpty(pos) then
+		local meta=minetest.get_meta(pos)
+		meta:set_float("srcTime",-1)
+		meta:set_float("maxSrcTime",0)
+		self:updateFormspec(pos)
+	elseif toList=="src" or (fromList=="dst" and not self.isOutputFull(pos)) then
+		self:triggerIfNeeded(pos)
+	end
+end
+
+function industrialtest.InductionFurnace.onMetadataInventoryPut(self,pos,listname,index,stack,player)
+	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack,player)
+	if listname=="src" then
+		self:calculateMaxSrcTime(pos)
+		self:triggerIfNeeded(pos)
+	end
+end
+
+function industrialtest.InductionFurnace.onMetadataInventoryTake(self,pos,listname,index,stack)
+	if listname=="src" then
+		self:calculateMaxSrcTime(pos)
+	elseif listname=="dst" and not self.isOutputFull(pos) then
+		self:triggerIfNeeded(pos)
+	end
+end
+
+function industrialtest.InductionFurnace.shouldActivate(self,pos)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local srcList=inv:get_list("src")
+
 	for _,slot in ipairs(srcList) do
 		if not slot:is_empty() then
 			local result,after=minetest.get_craft_result({
@@ -94,68 +172,27 @@ inductionFurnace.onTimer=function(pos,elapsed,meta,inv)
 				items={slot}
 			})
 			if result.time>0 and inv:room_for_item("dst",result.item) then
-				minetest.swap_node(pos,{
+				return meta:get_int("industrialtest.powerAmount")>=self._opPower
-					name="industrialtest:induction_furnace_active",
-					param2=minetest.get_node(pos).param2
-				})
-				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-				return false,shouldUpdateFormspec
 			end
 		end
 	end
 
-	return shouldRerunTimer,shouldUpdateFormspec
+	return false
 end
 
-inductionFurnace.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
+function industrialtest.InductionFurnace.shouldDeactivate(self,pos)
-	if toList=="dst" then
+	return not self:shouldActivate(pos)
-		return 0
-	end
-	return count
 end
 
-inductionFurnace.allowMetadataInventoryPut=function(pos,listname,index,stack)
+function industrialtest.InductionFurnace.activeUpdate(self,pos,elapsed,meta,inv)
-	if listname=="dst" then
-		return 0
-	end
-	return stack:get_count()
-end
-
-inductionFurnace.onMetadataInventoryPut=function(pos,listname)
-	if listname=="src" then
-		calculateMaxSrcTime(pos)
-	end
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-end
-
-inductionFurnace.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList)
-	if fromList=="src" or toList=="src" then
-		calculateMaxSrcTime(pos)
-	end
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-end
-
-inductionFurnace.onMetadataInventoryTake=function(pos,listname)
-	if listname=="src" then
-		calculateMaxSrcTime(pos)
-	end
-	if listname=="dst" then
-		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-	end
-end
-
-inductionFurnace.activeOnTimer=function(pos,elapsed,meta,inv)
 	local srcList=inv:get_list("src")
 	local powerAmount=meta:get_int("industrialtest.powerAmount")
 	local srcTime=meta:get_float("srcTime")
 	local maxSrcTime=meta:get_float("maxSrcTime")
 	local heat=meta:get_int("heat")
 	local speed=industrialtest.api.getMachineSpeed(meta)
-	local requiredPower=elapsed*inductionFurnace.opPower*speed
+	local requiredPower=elapsed*self._opPower*speed
 
-	industrialtest.internal.chargeFromPowerStorageItem(meta,inv)
-
-	local shouldContinue=false
 	local results={}
 	for _,slot in ipairs(srcList) do
 		if slot:is_empty() then
@@ -168,23 +205,13 @@ inductionFurnace.activeOnTimer=function(pos,elapsed,meta,inv)
 			})
 			if result.time>0 and inv:room_for_item("dst",result.item) then
 				table.insert(results,result.item)
-				shouldContinue=true
 			else
 				table.insert(results,false)
 			end
 		end
 	end
-	if not shouldContinue or powerAmount<requiredPower then
-		meta:set_float("srcTime",0)
-		minetest.swap_node(pos,{
-			name="industrialtest:induction_furnace",
-			param2=minetest.get_node(pos).param2
-		})
-		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-		return false,true
-	end
 
-	srcTime=srcTime+elapsed*(1+heat/100)
+	srcTime=srcTime+elapsed*(1+heat/200)
 	if srcTime>=maxSrcTime then
 		for i,result in ipairs(results) do
 			if result then
@@ -206,55 +233,56 @@ inductionFurnace.activeOnTimer=function(pos,elapsed,meta,inv)
 
 	industrialtest.api.addPower(meta,-requiredPower)
 
-	return true,true
+	return true
 end
 
-industrialtest.internal.registerMachine({
+function industrialtest.InductionFurnace.calculateMaxSrcTime(self,pos)
-	name="induction_furnace",
+	local meta=minetest.get_meta(pos)
-	displayName=S("Induction Furnace"),
+	local inv=meta:get_inventory()
-	capacity=industrialtest.api.mvPowerFlow*2,
+	local srcList=inv:get_list("src")
-	getFormspec=inductionFurnace.getFormspec,
+
-	flow=industrialtest.api.mvPowerFlow,
+	local maxSrcTime=0
-	ioConfig="iiiiii",
+	for _,slot in ipairs(srcList) do
-	requiresWrench=true,
+		local result,_=minetest.get_craft_result({
-	registerActiveVariant=true,
+			method="cooking",
-	sounds="metal",
+			width=1,
-	powerSlots={"powerStorage"},
+			items={slot}
-	storageSlots={"src","dst","powerStorage","upgrades"},
+		})
-	groups={
+		maxSrcTime=math.max(maxSrcTime,result.time*self._efficiency)
-		_industrialtest_hasPowerInput=1
+	end
-	},
+	meta:set_float("maxSrcTime",maxSrcTime)
-	customKeys={
+end
-		tiles={
+
-			"industrialtest_advanced_machine_block.png",
+function industrialtest.InductionFurnace.isInputEmpty(pos)
-			"industrialtest_advanced_machine_block.png",
+	local meta=minetest.get_meta(pos)
-			"industrialtest_advanced_machine_block.png",
+	local inv=meta:get_inventory()
-			"industrialtest_advanced_machine_block.png",
+	local srcList=inv:get_list("src")
-			"industrialtest_advanced_machine_block.png",
+
-			"industrialtest_advanced_machine_block.png^industrialtest_electric_furnace_front.png"
+	for _,slot in ipairs(srcList) do
-		},
+		if not slot:is_empty() then
-		paramtype2="facedir",
+			return false
-		legacy_facedir_simple=true
+		end
-	},
+	end
-	activeCustomKeys={
+
-		tiles={
+	return true
-			"industrialtest_advanced_machine_block.png",
+end
-			"industrialtest_advanced_machine_block.png",
+
-			"industrialtest_advanced_machine_block.png",
+function industrialtest.InductionFurnace.isOutputFull(pos)
-			"industrialtest_advanced_machine_block.png",
+	local meta=minetest.get_meta(pos)
-			"industrialtest_advanced_machine_block.png",
+	local inv=meta:get_inventory()
-			"industrialtest_advanced_machine_block.png^industrialtest_electric_furnace_front_active.png"
+	local dstList=inv:get_list("dst")
-		}
+
-	},
+	for _,slot in ipairs(dstList) do
-	onConstruct=inductionFurnace.onConstruct,
+		if slot:get_free_space()>0 then
-	onTimer=inductionFurnace.onTimer,
+			return false
-	allowMetadataInventoryMove=inductionFurnace.allowMetadataInventoryMove,
+		end
-	allowMetadataInventoryPut=inductionFurnace.allowMetadataInventoryPut,
+	end
-	onMetadataInventoryPut=inductionFurnace.onMetadataInventoryPut,
+
-	onMetadataInventoryMove=inductionFurnace.onMetadataInventoryMove,
+	return true
-	onMetadataInventoryTake=inductionFurnace.onMetadataInventoryTake,
+end
-	activeOnTimer=inductionFurnace.activeOnTimer
+
-})
+industrialtest.InductionFurnace:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:induction_furnace",