Remove duplicated tiles entry in some machines

Refactor Induction Furnace
Fix machines not triggered when item with power storage is placed in inventory
2025-03-17 19:51:12 +01:00 · 2025-03-17 18:52:13 +01:00 · 2025-03-16 20:20:54 +01:00 · 2025-03-16 11:38:43 +01:00 · 2025-03-16 11:37:44 +01:00 · 2025-03-16 11:35:53 +01:00
35 changed files with 3352 additions and 2526 deletions
--- a/README.md
+++ b/README.md
@@ -9,12 +9,13 @@ Currently IndustrialTest supports following games:
 ## Additional dependencies
 - Minetest Game
    - [3D Armor](https://content.minetest.net/packages/stu/3d_armor)
- MineClone2
+- VoxeLibre
    - none
 ## Optional dependencies
 - [Rubber Addon for MineClone](https://content.minetest.net/packages/biochemist/mcl_rubber)
 - [Pipeworks](https://content.minetest.net/packages/VanessaE/pipeworks)
 - [Logistica](https://content.minetest.net/packages/ZenonSeth/logistica)
 - [Mesecons](https://content.minetest.net/packages/Jeija/mesecons)
 ## Contributors
--- a/api.lua
+++ b/api.lua
@@ -1,903 +0,0 @@
 -- IndustrialTest
 -- Copyright (C) 2023 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
 industrialtest.api={}
 industrialtest.api.maceratorRecipes={}
 industrialtest.api.compressorRecipes={}
 industrialtest.api.extractorRecipes={}
 industrialtest.api.cableFormerRecipes={}
 industrialtest.api.geothermalGeneratorFuels={}
 industrialtest.api.waterMillFuels={}
 industrialtest.api.rotaryMaceratorModifiers={}
 industrialtest.api.storageCells={}
 industrialtest.api.lvPowerFlow=600
 industrialtest.api.mvPowerFlow=2400
 industrialtest.api.hvPowerFlow=10200
 industrialtest.api.evPowerFlow=40800
 industrialtest.api.ivPowerFlow=163800
 industrialtest.internal.clamp=function(num,min,max)
 	return math.max(math.min(num,max),min)
 end
 -- \brief Adds power storage to metadata
 -- \param capacity How much EU item/node can store
 -- \param flow How much EU can flow in or out item/node per industrialtest.updateDelay
 -- \param ioConfig Input/Output configuration in following side order: -X, +X, -Y, +Y, -Z, +Z
 --                 a - bidirectional, i - input, o - output
 -- \returns nil
 industrialtest.api.addPowerStorage=function(meta,capacity,flow,ioConfig)
 	meta:set_int("industrialtest.powerCapacity",capacity)
 	meta:set_int("industrialtest.powerFlow",flow)
 	meta:set_int("industrialtest.powerAmount",0)
 	meta:set_string("industrialtest.ioConfig",ioConfig)
 end
 -- \brief Takes rotated node and side and outputs normalized side that can be used for ioConfig lookups
 -- \param pos Vector with node position
 -- \param side Node side. See industrialtest.api.addPowerStorage for possible values
 -- \returns Normalized side or in case of failure side argument back
 industrialtest.api.normalizeSide=function(pos,side)
 	local node=minetest.get_node(pos)
 	-- FIXME: improve code quality there
 	local translation={
 		[0]={
 			1,2,3,4,5,6
 		},
 		[1]={
 			5,6,3,4,2,1
 		},
 		[2]={
 			2,1,3,4,6,5
 		},
 		[3]={
 			6,5,3,4,1,2
 		}
 	}
 	if node.param2>3 then
 		return side
 	end
 	return translation[node.param2][side]
 end
 -- \brief Checks if metadata contains power storage
 -- \param meta MetaDataRef which should be checked
 -- \returns true if metadata contains power storage, false otherwise
 industrialtest.api.hasPowerStorage=function(meta)
 	local values={"industrialtest.powerCapacity","industrialtest.powerFlow","industrialtest.powerAmount","industrialtest.ioConfig"}
 	for _,value in ipairs(values) do
 		if not meta:contains(value) then
 			return false
 		end
 	end
 	return true
 end
 -- \brief Updates itemstack description to show current power storage information, additionally updates item wear bar.
 --        Function doesn't check if itemstack contains power storage so you should be sure that it does before calling this function
 -- \param itemstack ItemStack which should be updated
 -- \returns nil
 industrialtest.api.updateItemPowerText=function(itemstack)
 	local meta=itemstack:get_meta()
 	local def=minetest.registered_tools[itemstack:get_name()]
 	local desc=meta:contains("industrialtest.descriptionOverride") and meta:get_string("industrialtest.descriptionOverride") or def.description
 	meta:set_string("description",S("@1\n@2 / @3 EU",desc,meta:get_int("industrialtest.powerAmount"),meta:get_int("industrialtest.powerCapacity")))
 	itemstack:set_wear(65535-meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*65534)
 end
 -- \brief Adds power storage to item depending on it's definition
 -- \param itemstack ItemStack to which item storage should be added
 -- \returns true if power storage was successfully added, false otherwise
 industrialtest.api.preparePowerStorageItem=function(itemstack)
 	local meta=itemstack:get_meta()
 	local def=minetest.registered_tools[itemstack:get_name()]
 	if industrialtest.api.hasPowerStorage(meta) or not def or not def._industrialtest_powerStorage or not def._industrialtest_powerCapacity or not def._industrialtest_powerFlow then
 		return false
 	end
 	industrialtest.api.addPowerStorage(meta,def._industrialtest_powerCapacity,def._industrialtest_powerFlow,"n/a")
 	industrialtest.api.updateItemPowerText(itemstack)
 	return true
 end
 -- \brief Sets uses metadata value depending on item's definition
 -- \param itemstack ItemStack which should be altered
 -- \returns true if value was successfully added, false otherwise
 industrialtest.api.prepareToolItem=function(itemstack)
 	local def=minetest.registered_tools[itemstack:get_name()]
 	if not def then
 		return false
 	end
 	if def._industrialtest_tool and def.tool_capabilities and def.tool_capabilities.uses then
 		local meta=itemstack:get_meta()
 		meta:set_int("industrialtest.uses",def.tool_capabilities.uses)
 		return true
 	elseif def.groups and def.groups._industrialtest_emptyOnConstruct and itemstack:get_wear()==0 then
 		itemstack:set_wear(65534)
 		return true
 	end
 	return false
 end
 -- \brief Adds wear to item after it's use
 -- \param itemstack ItemStack to which wear should be added
 -- \returns nil
 industrialtest.api.afterToolUse=function(itemstack)
 	local meta=itemstack:get_meta()
 	local def=minetest.registered_tools[itemstack:get_name()]
 	if not def or not def._industrialtest_tool or not def.tool_capabilities or not def.tool_capabilities.uses then
 		return
 	end
 	if not meta:contains("industrialtest.uses") then
 		industrialtest.prepareToolItem(itemstack)
 	end
 	local uses=meta:get_int("industrialtest.uses")-1
 	if uses==0 then
 		itemstack:set_count(0)
 		minetest.sound_play({name="default_tool_breaks"},{
 			gain=1,
 			fade=0,
 			pitch=1
 		},true)
 		return
 	end
 	meta:set_int("industrialtest.uses",uses)
 	itemstack:set_wear(65535-uses/def.tool_capabilities.uses*65535)
 end
 -- \brief Check if itemstack contains fluid storage
 -- \param itemstack ItemStack
 -- \returns bool
 industrialtest.api.itemHasFluidStorage=function(itemstack)
 	local values={"industrialtest.fluidAmount","industrialtest.fluidCapacity"}
 	local meta=itemstack:get_meta()
 	for _,value in ipairs(values) do
 		if not meta:contains(value) then
 			return false
 		end
 	end
 	return true
 end
 -- \brief Updates itemstack description and wear depending on contained fluid
 -- \param itemstack ItemStack
 -- \returns nil
 industrialtest.api.updateItemFluidText=function(itemstack)
 	local meta=itemstack:get_meta()
 	local def=itemstack:get_definition()
 	meta:set_string("description",S("@1\n@2 / @3 mB",def.description,meta:get_int("industrialtest.fluidAmount"),meta:get_int("industrialtest.fluidCapacity")))
 	itemstack:set_wear(65535-meta:get_int("industrialtest.fluidAmount")/meta:get_int("industrialtest.fluidCapacity")*65534)
 end
 -- \brief Prepares itemstack containing fluid storage
 -- \param itemstack ItemStack
 -- \returns bool
 industrialtest.api.prepareFluidStorageItem=function(itemstack)
 	local meta=itemstack:get_meta()
 	local def=itemstack:get_definition()
 	if industrialtest.api.itemHasFluidStorage(itemstack) or not def.groups or not def.groups._industrialtest_fluidStorage or not def._industrialtest_fluidCapacity then
 		return false
 	end
 	meta:set_int("industrialtest.fluidAmount",0)
 	meta:set_int("industrialtest.fluidCapacity",def._industrialtest_fluidCapacity)
 	industrialtest.api.updateItemFluidText(itemstack)
 	return true
 end
 -- \brief Adds fluid amount to item fluid storage
 -- \param itemstack ItemStack
 -- \param amount number
 -- \returns number
 industrialtest.api.addFluidToItem=function(itemstack,amount)
 	local meta=itemstack:get_meta()
 	if not industrialtest.api.itemHasFluidStorage(itemstack) then
 		return 0
 	end
 	local fluidAmount=meta:get_int("industrialtest.fluidAmount")
 	local fluidCapacity=meta:get_int("industrialtest.fluidCapacity")
 	local prevFluidAmount=fluidAmount
 	fluidAmount=industrialtest.internal.clamp(fluidAmount+amount,0,fluidCapacity)
 	meta:set_int("industrialtest.fluidAmount",fluidAmount)
 	industrialtest.api.updateItemFluidText(itemstack)
 	return fluidAmount-prevFluidAmount
 end
 -- \brief Adds fluid to destination itemstack while subtracting it from source itemstack's metadata
 -- \param srcItemstack ItemStack
 -- \param itemstack ItemStack
 -- \param amount number
 -- \returns number
 industrialtest.api.transferFluidToItem=function(srcItemstack,itemstack,amount)
 	local meta=srcItemstack:get_meta()
 	local flow=math.min(meta:get_int("industrialtest.fluidAmount"),amount)
 	if flow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addFluidToItem(itemstack,flow)
 	meta:set_int("industrialtest.fluidAmount",meta:get_int("industrialtest.fluidAmount")-actualFlow)
 	industrialtest.api.updateItemFluidText(srcItemstack)
 	return actualFlow
 end
 -- \brief Checks if power storage is fully charged
 -- \param meta MetaDataRef which should be checked
 -- \returns true if power storage is fully charged, false otherwise
 industrialtest.api.isFullyCharged=function(meta)
 	return meta:get_int("industrialtest.powerAmount")>=meta:get_int("industrialtest.powerCapacity")
 end
 -- \brief Adds power to power storage. Function doesn't check if meta contains power storage so you must be sure that it does.
 -- \param meta MetaDataRef to which power should be added
 -- \param amount Amount of power to add
 -- \returns How much of power was actually added
 industrialtest.api.addPower=function(meta,amount)
 	local powerAmount=meta:get_int("industrialtest.powerAmount")
 	local powerCapacity=meta:get_int("industrialtest.powerCapacity")
 	local prevPowerAmount=powerAmount
 	powerAmount=industrialtest.internal.clamp(powerAmount+amount,0,powerCapacity)
 	meta:set_int("industrialtest.powerAmount",powerAmount)
 	return powerAmount-prevPowerAmount
 end
 -- \brief Adds power to itemstack. Function checks if itemstack has power storage.
 -- \param itemstack ItemStack to which add power
 -- \param amount How much power to add
 -- \returns Amount of power added
 industrialtest.api.addPowerToItem=function(itemstack,amount)
 	local meta=itemstack:get_meta()
 	if not industrialtest.api.hasPowerStorage(meta) then
 		return 0
 	end
 	local added=industrialtest.api.addPower(meta,amount)
 	industrialtest.api.updateItemPowerText(itemstack)
 	return added
 end
 -- \brief Adds power to destination metadata while subtracting it from source metadata
 -- \Param srcMeta MetaDataRef from which take power
 -- \param destMeta MetaDataRef to which add power
 -- \returns How much of power was actually transferred
 industrialtest.api.transferPower=function(srcMeta,destMeta,amount)
 	local currentFlow=math.min(srcMeta:get_int("industrialtest.powerAmount"),amount)
 	if currentFlow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addPower(destMeta,currentFlow)
 	srcMeta:set_int("industrialtest.powerAmount",srcMeta:get_int("industrialtest.powerAmount")-actualFlow)
 	return actualFlow
 end
 -- \brief Adds power to destination itemstack while subtracting it from source metadata
 -- \param srcMeta MetaDataRef from which take power
 -- \param itemstack ItemStack to which add power
 -- \param amount number
 -- \returns How much of power was actually transferred
 industrialtest.api.transferPowerToItem=function(srcMeta,itemstack,amount)
 	local currentFlow=math.min(srcMeta:get_int("industrialtest.powerAmount"),amount)
 	if currentFlow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addPowerToItem(itemstack,currentFlow)
 	srcMeta:set_int("industrialtest.powerAmount",srcMeta:get_int("industrialtest.powerAmount")-actualFlow)
 	return actualFlow
 end
 -- \brief Adds power to destination metadata while subtracting it from source itemstack
 -- \param srcItemstack ItemStack from which subtract power
 -- \param meta MetaDataRef to which add power
 -- \param amount How much power should be transferred
 -- \returns How much of power was actually transferred
 industrialtest.api.transferPowerFromItem=function(srcItemstack,meta,amount)
 	local srcMeta=srcItemstack:get_meta()
 	local currentFlow=math.min(srcMeta:get_int("industrialtest.powerAmount"),amount)
 	if currentFlow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addPower(meta,currentFlow)
 	industrialtest.api.addPowerToItem(srcItemstack,-actualFlow)
 	return actualFlow
 end
 -- \brief Transfers power from source node to it's network, if sides is set then power will be only transfered to network connected to that sides
 -- \param pos Vector with position of source node
 -- \param (optional) sides table with Vectors
 -- \param (optional) flowOverride number
 -- \returns two values: true if any neighbouring node has room for more power, false otherwise
 --                      true if any power was transferred, false otherwise
 industrialtest.api.powerFlow=function(pos,sides,flowOverride)
 	local meta=minetest.get_meta(pos)
 	-- if machine doesn't have network map then it's not capable of transferring power
 	local network=industrialtest.api.getNetwork(meta)
 	if not network or #network==0 then
 		return false,false
 	end
 	local endpointCount=0
 	for _,endpoint in ipairs(network) do
 		local endpointMeta=minetest.get_meta(endpoint.position)
 		if not industrialtest.api.isFullyCharged(endpointMeta) and (not sides or sides[endpoint.sourceSide]) then
 			endpointCount=endpointCount+1
 		end
 	end
 	if endpointCount==0 then
 		return false,false
 	end
 	local powerDistribution=math.floor((flowOverride and flowOverride or meta:get_int("industrialtest.powerFlow"))/endpointCount)
 	local transferred=false
 	local roomAvailable=false
 	for _,endpoint in ipairs(network) do
 		if not sides or sides[endpoint.sourceSide] then
 			local endpointMeta=minetest.get_meta(endpoint.position)
 			if powerDistribution<=endpoint.flow then
 				local transferredPower=industrialtest.api.transferPower(meta,endpointMeta,powerDistribution)
 				if transferredPower>0 then
 					transferred=true
 				end
 				local def=minetest.registered_nodes[minetest.get_node(endpoint.position).name]
 				if def then
 					local updateFormspec=def._industrialtest_updateFormspec
 					if updateFormspec then
 						updateFormspec(endpoint.position)
 					end
 					local onPowerFlow=def._industrialtest_onPowerFlow
 					if onPowerFlow and transferredPower>0 then
 						onPowerFlow(endpoint.position,industrialtest.api.getOppositeSide(endpoint.side),transferredPower)
 					end
 				end
 				minetest.get_node_timer(endpoint.position):start(industrialtest.updateDelay)
 				if not industrialtest.api.isFullyCharged(endpointMeta) then
 					roomAvailable=true
 				end
 			else
 				minetest.remove_node(endpoint.position)
 				industrialtest.internal.explode(endpoint.position,2)
 			end
 		end
 	end
 	return roomAvailable,transferred
 end
 local function addNodeToNetwork(pos,networkMasterPos)
 	local meta=minetest.get_meta(pos)
 	local networks={}
 	if meta:contains("industrialtest.networks") then
 		networks=minetest.deserialize(meta:get_string("industrialtest.networks"))
 	end
 	for _,network in ipairs(networks) do
 		if network.x==networkMasterPos.x and network.y==networkMasterPos.y and network.z==networkMasterPos.z then
 			return
 		end
 	end
 	table.insert(networks,networkMasterPos)
 	meta:set_string("industrialtest.networks",minetest.serialize(networks))
 end
 local function clampFlow(pos,flow)
 	local def=minetest.registered_nodes[minetest.get_node(pos).name]
 	local newFlow
 	if def.groups and def.groups._industrialtest_cable then
 		newFlow=def._industrialtest_cableFlow
 	else
 		local meta=minetest.get_meta(pos)
 		newFlow=meta:get_int("industrialtest.powerFlow")
 	end
 	return math.min(flow,newFlow)
 end
 -- \brief Creates network map starting from node at pos, optionally omitting node at omit
 -- \param pos vector
 -- \param (optional) addCables bool
 -- \param (optional) omit Vector
 -- \returns table with network map
 industrialtest.api.createNetworkMap=function(pos,addCables,omit)
 	local workers={}
 	local map={}
 	local connections=industrialtest.api.getConnections(pos,"i")
 	if #connections==0 then
 		return map
 	end
 	local sides={
 		["-1,0,0"]=1,
 		["1,0,0"]=2,
 		["0,-1,0"]=3,
 		["0,1,0"]=4,
 		["0,0,-1"]=5,
 		["0,0,1"]=6
 	}
 	local serializedSourcePos=pos.x..","..pos.y..","..pos.z
 	local visitedNodes={[serializedSourcePos]=true}
 	for _,conn in ipairs(connections) do
 		if not omit or conn.x~=omit.x or conn.y~=omit.y or conn.z~=omit.z then
 			visitedNodes[conn.x..","..conn.y..","..conn.z]=true
 			addNodeToNetwork(conn,pos)
 			local sideVector=vector.subtract(conn,pos)
 			local serializedSideVector=sideVector.x..","..sideVector.y..","..sideVector.z
 			local def=minetest.registered_nodes[minetest.get_node(conn).name]
 			if def.groups._industrialtest_cable then
 				table.insert(workers,{
 					position=conn,
 					targetPosition=conn,
 					distance=1,
 					flow=def._industrialtest_cableFlow,
 					targetFlow=0,
 					sourceSide=industrialtest.api.normalizeSide(pos,sides[serializedSideVector])
 				})
 				if addCables then
 					table.insert(map,{
 						position=conn,
 						distance=0
 					})
 				end
 			else
 				local meta=minetest.get_meta(conn)
 				table.insert(map,{
 					position=conn,
 					distance=0,
 					flow=meta:get_int("industrialtest.powerFlow"),
 					side=sides[serializedSideVector],
 					sourceSide=industrialtest.api.normalizeSide(pos,sides[serializedSideVector])
 				})
 			end
 		end
 	end
 	while #workers>0 do
 		for i=1,#workers do
 			local worker=workers[i]
 			connections=industrialtest.api.getConnections(worker.position,"i")
 			if #connections==0 then
 				table.remove(workers,i)
 				break
 			else
 				local directionAssigned=false
 				local foundNewNode=false
 				for _,conn in ipairs(connections) do
 					if not omit or conn.x~=omit.x or conn.y~=omit.y or conn.z~=omit.z then
 						local serializedPos=conn.x..","..conn.y..","..conn.z
 						if not visitedNodes[serializedPos] then
 							local def=minetest.registered_nodes[minetest.get_node(conn).name]
 							visitedNodes[serializedPos]=true
 							foundNewNode=true
 							addNodeToNetwork(conn,pos)
 							if def.groups._industrialtest_cable then
 								if directionAssigned then
 									table.insert(workers,{
 										position=conn,
 										targetPosition=conn,
 										distance=worker.distance+1,
 										flow=clampFlow(conn,worker.flow),
 										targetFlow=0,
 										sourceSide=worker.sourceSide
 									})
 								else
 									worker.targetPosition=conn
 									worker.distance=worker.distance+1
 									worker.targetFlow=clampFlow(conn,worker.flow)
 									directionAssigned=true
 								end
 								if addCables then
 									table.insert(map,{
 										position=conn,
 										distance=worker.distance+1,
 									})
 								end
 							else
 								local sideVector=vector.subtract(conn,worker.position)
 								table.insert(map,{
 									position=conn,
 									distance=worker.distance,
 									flow=clampFlow(conn,worker.flow),
 									side=sides[sideVector.x..","..sideVector.y..","..sideVector.z],
 									sourceSide=worker.sourceSide
 								})
 								if #connections==1 then
 									foundNewNode=false
 									break
 								end
 							end
 						end
 					end
 				end
 				if not foundNewNode then
 					table.remove(workers,i)
 					break
 				end
 				worker.position=worker.targetPosition
 				worker.flow=worker.targetFlow
 			end
 		end
 	end
 	return map
 end
 industrialtest.api.removeNodeFromNetwork=function(pos,nodePos)
 	local meta=minetest.get_meta(pos)
 	if not meta:contains("industrialtest.network") then
 		return
 	end
 	local network=minetest.deserialize(meta:get_string("industrialtest.network"))
 	local removed=false
 	for key,node in ipairs(network) do
 		if node.position.x==nodePos.x and node.position.y==nodePos.y and node.position.z==nodePos.z then
 			table.remove(network,key)
 			removed=true
 			break
 		end
 	end
 	if removed then
 		meta:set_string("industrialtest.network",minetest.serialize(network))
 	end
 end
 -- \brief Creates network map and writes it to node metadata at pos, optionally omitting node at omit
 -- \param pos Vector
 -- \param (optional) omit Vector
 -- \returns nil
 industrialtest.api.createNetworkMapForNode=function(pos,omit)
 	local meta=minetest.get_meta(pos)
 	local network=industrialtest.api.createNetworkMap(pos,false,omit)
 	meta:set_string("industrialtest.network",minetest.serialize(network))
 end
 -- \brief Returns true if meta contains network map, false otherwise
 -- \param meta MetaDataRef
 -- \returns bool
 industrialtest.api.isNetworkMaster=function(meta)
 	return meta:contains("industrialtest.network")
 end
 -- \brief Returns network table if node containing meta belongs to any networks, false otherwise
 -- \param meta MetaDataRef
 -- \returns bool or table
 industrialtest.api.isAttachedToNetwork=function(meta)
 	if not meta:contains("industrialtest.networks") then
 		return false
 	end
 	local networks=minetest.deserialize(meta:get_string("industrialtest.networks"))
 	if #networks==0 then
 		return false
 	end
 	return networks
 end
 -- \brief Returns network master network from it's meta, if meta doesn't contain network map then function returns false
 -- \param meta MetaDataRef
 -- \returns table or bool
 industrialtest.api.getNetwork=function(meta)
 	if not meta:contains("industrialtest.network") then
 		return false
 	end
 	return minetest.deserialize(meta:get_string("industrialtest.network"))
 end
 -- \brief Returns opposite side of provided one
 -- \param side Side number. See industrialtest.api.addPowerStorage for order
 -- \returns Opposite side
 industrialtest.api.getOppositeSide=function(side)
 	return (side%2==0 and side-1 or side+1)
 end
 -- \brief Returns connections of node with power storage. If direction is "i" only input connections will be returned, if direction is "o" only output connections
 --        will be returned, if it's not provided all connections will be returned.
 -- \param pos Vector
 -- \param (optional) direction string
 -- \returns table
 industrialtest.api.getConnections=function(pos,direction)
 	local result={}
 	local neighbourPositions={
 		vector.offset(pos,-1,0,0),
 		vector.offset(pos,1,0,0),
 		vector.offset(pos,0,-1,0),
 		vector.offset(pos,0,1,0),
 		vector.offset(pos,0,0,-1),
 		vector.offset(pos,0,0,1)
 	}
 	local sourceMeta=minetest.get_meta(pos)
 	local sourceDef=minetest.registered_nodes[minetest.get_node(pos).name]
 	local directionOutput=(not direction or direction=="o")
 	local directionInput=(not direction or direction=="i")
 	for key,conn in ipairs(neighbourPositions) do
 		local meta=minetest.get_meta(conn)
 		local def=minetest.registered_nodes[minetest.get_node(conn).name]
 		local normalizedKey=industrialtest.api.normalizeSide(pos,key)
 		local powerOutput=(sourceDef.groups._industrialtest_cable or industrialtest.api.isPowerOutput(sourceMeta,normalizedKey))
 		local powerInput=(sourceDef.groups._industrialtest_cable or industrialtest.api.isPowerInput(sourceMeta,normalizedKey))
 		if def.groups._industrialtest_cable or industrialtest.api.hasPowerStorage(meta) then
 			local side=industrialtest.api.normalizeSide(conn,industrialtest.api.getOppositeSide(normalizedKey))
 			if (powerOutput and directionInput and (def.groups._industrialtest_cable or industrialtest.api.isPowerInput(meta,side))) or ((def.groups._industrialtest_cable or industrialtest.api.isPowerOutput(meta,side)) and powerInput and directionOutput) then
 				table.insert(result,conn)
 			end
 		end
 	end
 	return result
 end
 -- \brief Changes node's power IO config. Function doesn't check if meta actually contains power storage.
 -- \param meta MetaDataRef of node which power IO config should be changed
 -- \param side Side number. See industrialtest.api.addPowerStorage to check order.
 -- \param mode Side mode. See industrialtest.api.addPowerStorage for possible values.
 -- \returns nil
 industrialtest.api.changeIoConfig=function(meta,side,mode)
 	local ioConfig=meta:get_string("industrialtest.ioConfig")
 	ioConfig=string.sub(ioConfig,1,side-1)..mode..string.sub(ioConfig,side+1)
 	meta:set_string("industrialtest.ioConfig",ioConfig)
 end
 -- \brief Checks if provided side is power input
 -- \param meta MetaDataRef of node
 -- \param side Side number. See industrialtest.api.addPowerStorage to check order.
 -- \returns true if provided side is power input, false otherwise
 industrialtest.api.isPowerInput=function(meta,side)
 	local ioConfig=meta:get_string("industrialtest.ioConfig")
 	local mode=string.sub(ioConfig,side,side)
 	return (mode=="i" or mode=="a")
 end
 -- \brief Checks if provided side is power output
 -- \param meta MetaDataRef of node
 -- \param side Side number. See industrialtest.api.addPowerStorage to check order.
 -- \returns true if provided side is power output, false otherwise
 industrialtest.api.isPowerOutput=function(meta,side)
 	local ioConfig=meta:get_string("industrialtest.ioConfig")
 	local mode=string.sub(ioConfig,side,side)
 	return (mode=="o" or mode=="a")
 end
 -- \brief Registers dust of certain resource
 -- \param name Technical name of resource
 -- \param displayName Display name of resource
 -- \param resources List of tables with following keys: <output>, <recipe>, [count(1)]
 --                                                      <> - required, [] - optional, () - default value
 -- \param color HTML color of dust
 -- \param registerMaceratorRecipe If true macerator recipe for dust will be registered
 -- \returns nil
 industrialtest.api.registerResourceDust=function(name,displayName,resources,color,registerMaceratorRecipe)
 	minetest.register_craftitem("industrialtest:"..name.."_dust",{
 		description=S(displayName.." Dust"),
 		inventory_image="industrialtest_dust.png",
 		color=color
 	})
 	if registerMaceratorRecipe then
 		for _,value in ipairs(resources) do
 			industrialtest.api.registerMaceratorRecipe({
 				output="industrialtest:"..name.."_dust "..(value.count or 1),
 				recipe=value.resource
 			})
 		end
 	end
 end
 -- \brief Registers plate of certain resource
 -- \param name Technical name of resource
 -- \param displayName Display name of resource
 -- \param resources List of tables with following keys: <output>, <recipe>, [count(1)]
 --                                                      <> - required, [] - optional, () - default value
 -- \param color HTML color of plate
 -- \param registerCompressorRecipe If true compressor recipe for plate will be registered
 -- \returns nil
 industrialtest.api.registerPlate=function(name,displayName,resources,color,registerCompressorRecipe)
 	minetest.register_craftitem("industrialtest:"..name,{
 		description=displayName,
 		inventory_image="industrialtest_plate.png",
 		inventory_overlay="industrialtest_plate_overlay.png",
 		color=color
 	})
 	if registerCompressorRecipe then
 		for _,value in ipairs(resources) do
 			industrialtest.api.registerCompressorRecipe({
 				output="industrialtest:"..name.." "..(value.count or 1),
 				recipe=value.resource
 			})
 		end
 	end
 end
 -- \brief Registers cell with certain fluid
 -- \param name Technical name of cell
 -- \param displayName Display name of cell
 -- \param node Node which can be picked up with this cell
 -- \returns nil
 industrialtest.api.registerStorageCell=function(name,displayName,node,modname,color)
 	color = color or "#ffffffff"
 	if not modname then
 		modname="industrialtest"
 	end
 	minetest.register_craftitem("industrialtest:"..name.."_cell",{
 		description=S(displayName.." Cell"),
 		inventory_image="industrialtest_cell_fluid.png",
 		inventory_overlay="industrialtest_cell_casing.png",
 		color=color,
 		on_place=function(itemstack,user,pointed)
 			if pointed.type~="node" or not user or not user:is_player() then
 				return nil
 			end
 			local node=minetest.get_node_or_nil(pointed.above)
 			local storage=industrialtest.api.getStorageCell("industrialtest:"..name.."_cell")
 			if storage.node then
 				if node.name~="air" and node.name~=storage.node then
 					return nil
 				end
 				minetest.set_node(pointed.above,{name=storage.node})
 				if itemstack:get_count()==1 then
 					itemstack:set_name("industrialtest:empty_cell")
 				else
 					local inv=user:get_inventory()
 					inv:add_item("main",ItemStack("industrialtest:empty_cell"))
 					itemstack:take_item()
 				end
 				return itemstack
 			end
 			return nil
 		end
 	})
 	industrialtest.api.storageCells["industrialtest:"..name.."_cell"]={
 		name="industrialtest:"..name.."_cell",
 		node=node
 	}
 end
 -- \brief Returns registred storage cell by name
 -- \param name Storage cell name
 -- \returns Table with following keys: name, node or nil in case of failure
 industrialtest.api.getStorageCell=function(name)
 	return industrialtest.api.storageCells[name]
 end
 -- \brief Returns registered storage cells by node
 -- \param node Node ID
 -- \returns Table with following keys: name, node or nil in case of failure
 industrialtest.api.getStorageCellByNode=function(node)
 	for _,value in pairs(industrialtest.api.storageCells) do
 		if value.node==node then
 			return value
 		end
 	end
 	return nil
 end
 -- \brief Registers macerator recipe
 -- \param config Table with keys: <output>, <recipe>, [time(2)]
 -- \returns nil
 industrialtest.api.registerMaceratorRecipe=function(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
 	industrialtest.api.maceratorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
 -- \param recipe String ID of resulting conten
 -- \returns Table with following keys: output, recipe, time
 industrialtest.api.getMaceratorRecipeResult=function(recipe)
 	return industrialtest.api.maceratorRecipes[recipe]
 end
 -- \brief Registers compressor recipe
 -- \param config Table with following keys: <output>, <recipe>, [time(2)], [count(1)]
 -- \returns nil
 industrialtest.api.registerCompressorRecipe=function(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2,
 		count=config.count or 1
 	}
 	industrialtest.api.compressorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
 -- \param recipe String ID of resulting conten
 -- \returns Table with following keys: output, recipe, time
 industrialtest.api.getCompressorRecipeResult=function(recipe)
 	return industrialtest.api.compressorRecipes[recipe]
 end
 industrialtest.api.registerExtractorRecipe=function(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
 	industrialtest.api.extractorRecipes[definition.recipe]=definition
 end
 industrialtest.api.getExtractorRecipeResult=function(recipe)
 	return industrialtest.api.extractorRecipes[recipe]
 end
 industrialtest.api.registerCableFormerRecipe=function(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
 	industrialtest.api.cableFormerRecipes[definition.recipe]=definition
 end
 industrialtest.api.getCableFormerRecipeResult=function(recipe)
 	return industrialtest.api.cableFormerRecipes[recipe]
 end
 -- \brief Registers fuel that can be used in geothermal generator
 -- \param fuel Table with following keys: <name>, <calorificValue>, <storageItems>
 --        which is a table containing items which are tables with following keys: <name>, <leftover>
 -- \returns nil
 industrialtest.api.registerGeothermalGeneratorFuel=function(config)
 	local definition={
 		name=config.name or "",
 		calorificValue=config.calorificValue or 0,
 		texture=config.texture or "industrialtest_gui_fluid_bg.png",
 		storageItems=config.storageItems or {}
 	}
 	industrialtest.api.geothermalGeneratorFuels[definition.name]=definition
 end
 -- \brief Returns generator fuel information
 -- \param name Name of fuel
 -- \returns Table with following keys: name, calorificValue, storageItems
 industrialtest.api.getGeothermalGeneratorFuel=function(name)
 	return industrialtest.api.geothermalGeneratorFuels[name]
 end
 -- \brief Returns generator fuel information by item name
 -- \param name ID of item
 -- \returns Table with following keys: name, calorificValue, storageItems or nil in case of failure
 industrialtest.api.getGeothermalGeneratorFuelByItem=function(name)
 	for _,value in pairs(industrialtest.api.geothermalGeneratorFuels) do
 		for _,item in ipairs(value.storageItems) do
 			if item.name==name then
 				return value
 			end
 		end
 	end
 	return nil
 end
 -- \brief Registers fuel that can be used in water mill
 -- \param fuel Table with following keys: <name>, <calorificValue>, <storageItems>
 --        which is a table containing items which are tables with following keys: <name>, <leftover>
 -- \returns nil
 industrialtest.api.registerWaterMillFuel=function(config)
 	local definition={
 		name=config.name or "",
 		calorificValue=config.calorificValue or 0,
 		texture=config.texture or "industrialtest_gui_fluid_bg.png",
 		storageItems=config.storageItems or {}
 	}
 	industrialtest.api.waterMillFuels[definition.name]=definition
 end
 -- \brief Returns water mill fuel information
 -- \param name Name of fuel
 -- \returns Table with following keys: name, calorificValue, storageItems
 industrialtest.api.getWaterMillFuel=function(name)
 	return industrialtest.api.waterMillFuels[name]
 end
 -- \brief Returns water mill fuel information by item name
 -- \param name ID of item
 -- \returns Table with following keys: name, calorificValue, storageItems or nil in case of failure
 industrialtest.api.getWaterMillFuelByItem=function(name)
 	for _,value in pairs(industrialtest.api.waterMillFuels) do
 		for _,item in ipairs(value.storageItems) do
 			if item.name==name then
 				return value
 			end
 		end
 	end
 	return nil
 end
 -- \brief Registers Rotary Macerator recipe modifier
 -- \param config table
 -- \returns nil
 industrialtest.api.registerRotaryMaceratorModifier=function(config)
 	local definition={
 		name=config.name or "",
 		modifier=config.modifier or "",
 		output=config.output or "",
 		time=config.time or 2,
 		uses=config.uses or 1,
 		modifierLeftover=config.modifierLeftover
 	}
 	industrialtest.api.rotaryMaceratorModifiers[definition.name.." "..config.modifier]=definition
 end
 -- \brief Returns modified Rotary Macerator recipe by item and modifier
 -- \param name string
 -- \param modifier string
 -- \returns table
 industrialtest.api.getRotaryMaceratorModifier=function(name,modifier)
 	return industrialtest.api.rotaryMaceratorModifiers[name.." "..modifier]
 end
 -- \brief Returns machine speed in items per operation
 -- \param meta MetaDataRef
 -- \returns number
 industrialtest.api.getMachineSpeed=function(meta)
 	return meta:contains("industrialtest.speed") and meta:get_int("industrialtest.speed") or 1
 end
--- a/api/common.lua
+++ b/api/common.lua
@@ -0,0 +1,50 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 industrialtest.api={
 	maceratorRecipes={},
 	compressorRecipes={},
 	extractorRecipes={},
 	cableFormerRecipes={},
 	geothermalGeneratorFuels={},
 	waterMillFuels={},
 	rotaryMaceratorModifiers={},
 	storageCells={},
 	tags={}
 }
 industrialtest.api.lvPowerFlow=600
 industrialtest.api.mvPowerFlow=2400
 industrialtest.api.hvPowerFlow=10200
 industrialtest.api.evPowerFlow=40800
 industrialtest.api.ivPowerFlow=163800
 function industrialtest.internal.clamp(num,min,max)
 	return math.max(math.min(num,max),min)
 end
 function industrialtest.internal.unpackTableInto(first,second)
 	for k,v in pairs(second) do
 		first[k]=v
 	end
 end
 -- \brief Returns machine speed in items per operation
 -- \param meta MetaDataRef
 -- \returns number
 function industrialtest.api.getMachineSpeed(meta)
 	return meta:contains("industrialtest.speed") and meta:get_int("industrialtest.speed") or 1
 end
--- a/api/fluid.lua
+++ b/api/fluid.lua
@@ -0,0 +1,121 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
 -- \brief Prepares itemstack containing fluid storage
 -- \param itemstack ItemStack
 -- \returns bool
 function industrialtest.api.prepareFluidStorageItem(itemstack)
 	local meta=itemstack:get_meta()
 	local def=itemstack:get_definition()
 	if industrialtest.api.itemHasFluidStorage(itemstack) or not def.groups or not def.groups._industrialtest_fluidStorage or not def._industrialtest_fluidCapacity then
 		return false
 	end
 	meta:set_int("industrialtest.fluidAmount",0)
 	meta:set_int("industrialtest.fluidCapacity",def._industrialtest_fluidCapacity)
 	industrialtest.api.updateItemFluidText(itemstack)
 	return true
 end
 -- \brief Check if itemstack contains fluid storage
 -- \param itemstack ItemStack
 -- \returns bool
 function industrialtest.api.itemHasFluidStorage(itemstack)
 	local values={"industrialtest.fluidAmount","industrialtest.fluidCapacity"}
 	local meta=itemstack:get_meta()
 	for _,value in ipairs(values) do
 		if not meta:contains(value) then
 			return false
 		end
 	end
 	return true
 end
 -- \brief Check if fluid storage in meta is full
 -- \param meta MetaDataRef
 -- \returns bool
 function industrialtest.api.isFluidStorageFull(meta)
 	return meta:get_int("industrialtest.fluidAmount")>=meta:get_int("industrialtest.fluidCapacity")
 end
 -- \brief Check if item fluid storage is full
 -- \param itemstack ItemStack
 -- \returns bool
 function industrialtest.api.isItemFluidStorageFull(itemstack)
 	local meta=itemstack:get_meta()
 	return industrialtest.api.isFluidStorageFull(meta)
 end
 -- \brief Check if fluid storage in meta is empty
 -- \param meta MetaDataRef
 -- \returns bool
 function industrialtest.api.isFluidStorageEmpty(meta)
 	return meta:get_int("industrialtest.fluidAmount")==0
 end
 -- \brief Check if item fluid storage is empty
 -- \param itemstack ItemStack
 -- \returns bool
 function industrialtest.api.isItemFluidStorageEmpty(itemstack)
 	local meta=itemstack:get_meta()
 	return industrialtest.api.isFluidStorageEmpty(meta)
 end
 -- \brief Updates itemstack description and wear depending on contained fluid
 -- \param itemstack ItemStack
 -- \returns nil
 function industrialtest.api.updateItemFluidText(itemstack)
 	local meta=itemstack:get_meta()
 	local def=itemstack:get_definition()
 	meta:set_string("description",S("@1\n@2 / @3 mB",def.description,meta:get_int("industrialtest.fluidAmount"),meta:get_int("industrialtest.fluidCapacity")))
 	itemstack:set_wear(65535-meta:get_int("industrialtest.fluidAmount")/meta:get_int("industrialtest.fluidCapacity")*65534)
 end
 -- \brief Adds fluid amount to item fluid storage
 -- \param itemstack ItemStack
 -- \param amount number
 -- \returns number
 function industrialtest.api.addFluidToItem(itemstack,amount)
 	local meta=itemstack:get_meta()
 	if not industrialtest.api.itemHasFluidStorage(itemstack) then
 		return 0
 	end
 	local fluidAmount=meta:get_int("industrialtest.fluidAmount")
 	local fluidCapacity=meta:get_int("industrialtest.fluidCapacity")
 	local prevFluidAmount=fluidAmount
 	fluidAmount=industrialtest.internal.clamp(fluidAmount+amount,0,fluidCapacity)
 	meta:set_int("industrialtest.fluidAmount",fluidAmount)
 	industrialtest.api.updateItemFluidText(itemstack)
 	return fluidAmount-prevFluidAmount
 end
 -- \brief Adds fluid to destination itemstack while subtracting it from source itemstack's metadata
 -- \param srcItemstack ItemStack
 -- \param itemstack ItemStack
 -- \param amount number
 -- \returns number
 function industrialtest.api.transferFluidToItem(srcItemstack,itemstack,amount)
 	local meta=srcItemstack:get_meta()
 	local flow=math.min(meta:get_int("industrialtest.fluidAmount"),amount)
 	if flow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addFluidToItem(itemstack,flow)
 	meta:set_int("industrialtest.fluidAmount",meta:get_int("industrialtest.fluidAmount")-actualFlow)
 	industrialtest.api.updateItemFluidText(srcItemstack)
 	return actualFlow
 end
--- a/api/network.lua
+++ b/api/network.lua
@@ -0,0 +1,319 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local function addNodeToNetwork(pos,networkMasterPos)
 	local meta=minetest.get_meta(pos)
 	local networks={}
 	if meta:contains("industrialtest.networks") then
 		networks=minetest.deserialize(meta:get_string("industrialtest.networks"))
 	end
 	for _,network in ipairs(networks) do
 		if network.x==networkMasterPos.x and network.y==networkMasterPos.y and network.z==networkMasterPos.z then
 			return
 		end
 	end
 	table.insert(networks,networkMasterPos)
 	meta:set_string("industrialtest.networks",minetest.serialize(networks))
 end
 local function clampFlow(pos,flow)
 	local def=minetest.registered_nodes[minetest.get_node(pos).name]
 	local newFlow
 	if def.groups and def.groups._industrialtest_cable then
 		newFlow=def._industrialtest_cableFlow
 	else
 		local meta=minetest.get_meta(pos)
 		newFlow=meta:get_int("industrialtest.powerFlow")
 	end
 	return math.min(flow,newFlow)
 end
 -- \brief Transfers power from source node to it's network, if sides is set then power will be only transfered to network connected to that sides
 -- \param pos Vector with position of source node
 -- \param (optional) sides table with Vectors
 -- \param (optional) flowOverride number
 -- \returns two values: true if any neighbouring node has room for more power, false otherwise
 --                      true if any power was transferred, false otherwise
 function industrialtest.api.powerFlow(pos,sides,flowOverride)
 	local meta=minetest.get_meta(pos)
 	-- if machine doesn't have network map then it's not capable of transferring power
 	local network=industrialtest.api.getNetwork(meta)
 	if not network or #network==0 then
 		return false,false
 	end
 	local endpointCount=0
 	for _,endpoint in ipairs(network) do
 		local endpointMeta=minetest.get_meta(endpoint.position)
 		if not industrialtest.api.isFullyCharged(endpointMeta) and (not sides or sides[endpoint.sourceSide]) then
 			endpointCount=endpointCount+1
 		end
 	end
 	if endpointCount==0 then
 		return false,false
 	end
 	local powerDistribution=math.floor((flowOverride and flowOverride or math.min(meta:get_int("industrialtest.powerAmount"),meta:get_int("industrialtest.powerFlow")))/endpointCount)
 	local transferred=false
 	local roomAvailable=false
 	for _,endpoint in ipairs(network) do
 		if not sides or sides[endpoint.sourceSide] then
 			local endpointMeta=minetest.get_meta(endpoint.position)
 			if powerDistribution<=endpoint.flow then
 				local transferredPower=industrialtest.api.transferPower(meta,endpointMeta,powerDistribution)
 				if transferredPower>0 then
 					transferred=true
 				end
 				local def=minetest.registered_nodes[minetest.get_node(endpoint.position).name]
 				if def and def._industrialtest_self then
 					def._industrialtest_self:updateFormspec(endpoint.position)
 					if def._industrialtest_self.onPowerFlow and transferredPower>0 then
 						def._industrialtest_self:onPowerFlow(endpoint.position,industrialtest.api.getOppositeSide(endpoint.side),transferredPower)
 					end
 					def._industrialtest_self:triggerIfNeeded(endpoint.position)
 				else
 					-- Support for bare definitions that don't use industrialtest pseudo-OOP
 					minetest.get_node_timer(endpoint.position):start(industrialtest.updateDelay)
 				end
 				if not industrialtest.api.isFullyCharged(endpointMeta) then
 					roomAvailable=true
 				end
 			else
 				minetest.remove_node(endpoint.position)
 				industrialtest.internal.explode(endpoint.position,2)
 			end
 		end
 	end
 	return roomAvailable,transferred
 end
 -- \brief Creates network map starting from node at pos, optionally omitting node at omit
 -- \param pos vector
 -- \param (optional) addCables bool
 -- \param (optional) omit Vector
 -- \returns table with network map
 function industrialtest.api.createNetworkMap(pos,addCables,omit)
 	local workers={}
 	local map={}
 	local connections=industrialtest.api.getConnections(pos,"i")
 	if #connections==0 then
 		return map
 	end
 	local sides={
 		["-1,0,0"]=1,
 		["1,0,0"]=2,
 		["0,-1,0"]=3,
 		["0,1,0"]=4,
 		["0,0,-1"]=5,
 		["0,0,1"]=6
 	}
 	local serializedSourcePos=pos.x..","..pos.y..","..pos.z
 	local visitedNodes={[serializedSourcePos]=true}
 	for _,conn in ipairs(connections) do
 		if not omit or conn.x~=omit.x or conn.y~=omit.y or conn.z~=omit.z then
 			visitedNodes[conn.x..","..conn.y..","..conn.z]=true
 			addNodeToNetwork(conn,pos)
 			local sideVector=vector.subtract(conn,pos)
 			local serializedSideVector=sideVector.x..","..sideVector.y..","..sideVector.z
 			local def=minetest.registered_nodes[minetest.get_node(conn).name]
 			if def.groups._industrialtest_cable then
 				table.insert(workers,{
 					position=conn,
 					targetPosition=conn,
 					distance=1,
 					flow=def._industrialtest_cableFlow,
 					targetFlow=0,
 					sourceSide=industrialtest.api.normalizeSide(pos,sides[serializedSideVector])
 				})
 				if addCables then
 					table.insert(map,{
 						position=conn,
 						distance=0
 					})
 				end
 			else
 				local meta=minetest.get_meta(conn)
 				table.insert(map,{
 					position=conn,
 					distance=0,
 					flow=meta:get_int("industrialtest.powerFlow"),
 					side=sides[serializedSideVector],
 					sourceSide=industrialtest.api.normalizeSide(pos,sides[serializedSideVector])
 				})
 			end
 		end
 	end
 	while #workers>0 do
 		for i=1,#workers do
 			local worker=workers[i]
 			connections=industrialtest.api.getConnections(worker.position,"i")
 			if #connections==0 then
 				table.remove(workers,i)
 				break
 			else
 				local directionAssigned=false
 				local foundNewNode=false
 				for _,conn in ipairs(connections) do
 					if not omit or conn.x~=omit.x or conn.y~=omit.y or conn.z~=omit.z then
 						local serializedPos=conn.x..","..conn.y..","..conn.z
 						if not visitedNodes[serializedPos] then
 							local def=minetest.registered_nodes[minetest.get_node(conn).name]
 							visitedNodes[serializedPos]=true
 							foundNewNode=true
 							addNodeToNetwork(conn,pos)
 							if def.groups._industrialtest_cable then
 								if directionAssigned then
 									table.insert(workers,{
 										position=conn,
 										targetPosition=conn,
 										distance=worker.distance+1,
 										flow=clampFlow(conn,worker.flow),
 										targetFlow=0,
 										sourceSide=worker.sourceSide
 									})
 								else
 									worker.targetPosition=conn
 									worker.distance=worker.distance+1
 									worker.targetFlow=clampFlow(conn,worker.flow)
 									directionAssigned=true
 								end
 								if addCables then
 									table.insert(map,{
 										position=conn,
 										distance=worker.distance+1,
 									})
 								end
 							else
 								local sideVector=vector.subtract(conn,worker.position)
 								table.insert(map,{
 									position=conn,
 									distance=worker.distance,
 									flow=clampFlow(conn,worker.flow),
 									side=sides[sideVector.x..","..sideVector.y..","..sideVector.z],
 									sourceSide=worker.sourceSide
 								})
 								if #connections==1 then
 									foundNewNode=false
 									break
 								end
 							end
 						end
 					end
 				end
 				if not foundNewNode then
 					table.remove(workers,i)
 					break
 				end
 				worker.position=worker.targetPosition
 				worker.flow=worker.targetFlow
 			end
 		end
 	end
 	return map
 end
 function industrialtest.api.removeNodeFromNetwork(pos,nodePos)
 	local meta=minetest.get_meta(pos)
 	if not meta:contains("industrialtest.network") then
 		return
 	end
 	local network=minetest.deserialize(meta:get_string("industrialtest.network"))
 	local removed=false
 	for key,node in ipairs(network) do
 		if node.position.x==nodePos.x and node.position.y==nodePos.y and node.position.z==nodePos.z then
 			table.remove(network,key)
 			removed=true
 			break
 		end
 	end
 	if removed then
 		meta:set_string("industrialtest.network",minetest.serialize(network))
 	end
 end
 -- \brief Creates network map and writes it to node metadata at pos, optionally omitting node at omit
 -- \param pos Vector
 -- \param (optional) omit Vector
 -- \returns nil
 function industrialtest.api.createNetworkMapForNode(pos,omit)
 	local meta=minetest.get_meta(pos)
 	local network=industrialtest.api.createNetworkMap(pos,false,omit)
 	meta:set_string("industrialtest.network",minetest.serialize(network))
 end
 -- \brief Returns true if meta contains network map, false otherwise
 -- \param meta MetaDataRef
 -- \returns bool
 function industrialtest.api.isNetworkMaster(meta)
 	return meta:contains("industrialtest.network")
 end
 -- \brief Returns network table if node containing meta belongs to any networks, false otherwise
 -- \param meta MetaDataRef
 -- \returns bool or table
 function industrialtest.api.isAttachedToNetwork(meta)
 	if not meta:contains("industrialtest.networks") then
 		return false
 	end
 	local networks=minetest.deserialize(meta:get_string("industrialtest.networks"))
 	if #networks==0 then
 		return false
 	end
 	return networks
 end
 -- \brief Returns network master network from it's meta, if meta doesn't contain network map then function returns false
 -- \param meta MetaDataRef
 -- \returns table or bool
 function industrialtest.api.getNetwork(meta)
 	if not meta:contains("industrialtest.network") then
 		return false
 	end
 	return minetest.deserialize(meta:get_string("industrialtest.network"))
 end
 -- \brief Returns connections of node with power storage. If direction is "i" only input connections will be returned, if direction is "o" only output connections
 --        will be returned, if it's not provided all connections will be returned.
 -- \param pos Vector
 -- \param (optional) direction string
 -- \returns table
 function industrialtest.api.getConnections(pos,direction)
 	local result={}
 	local neighbourPositions={
 		vector.offset(pos,-1,0,0),
 		vector.offset(pos,1,0,0),
 		vector.offset(pos,0,-1,0),
 		vector.offset(pos,0,1,0),
 		vector.offset(pos,0,0,-1),
 		vector.offset(pos,0,0,1)
 	}
 	local sourceMeta=minetest.get_meta(pos)
 	local sourceDef=minetest.registered_nodes[minetest.get_node(pos).name]
 	local directionOutput=(not direction or direction=="o")
 	local directionInput=(not direction or direction=="i")
 	for key,conn in ipairs(neighbourPositions) do
 		local meta=minetest.get_meta(conn)
 		local def=minetest.registered_nodes[minetest.get_node(conn).name]
 		local normalizedKey=industrialtest.api.normalizeSide(pos,key)
 		local powerOutput=(sourceDef.groups._industrialtest_cable or industrialtest.api.isPowerOutput(sourceMeta,normalizedKey))
 		local powerInput=(sourceDef.groups._industrialtest_cable or industrialtest.api.isPowerInput(sourceMeta,normalizedKey))
 		if def.groups._industrialtest_cable or industrialtest.api.hasPowerStorage(meta) then
 			local side=industrialtest.api.normalizeSide(conn,industrialtest.api.getOppositeSide(normalizedKey))
 			if (powerOutput and directionInput and (def.groups._industrialtest_cable or industrialtest.api.isPowerInput(meta,side))) or ((def.groups._industrialtest_cable or industrialtest.api.isPowerOutput(meta,side)) and powerInput and directionOutput) then
 				table.insert(result,conn)
 			end
 		end
 	end
 	return result
 end
--- a/api/power.lua
+++ b/api/power.lua
@@ -0,0 +1,180 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
 -- \brief Adds power storage to metadata
 -- \param capacity How much EU item/node can store
 -- \param flow How much EU can flow in or out item/node per industrialtest.updateDelay
 -- \param ioConfig Input/Output configuration in following side order: -X, +X, -Y, +Y, -Z, +Z
 --                 a - bidirectional, i - input, o - output
 -- \returns nil
 function industrialtest.api.addPowerStorage(meta,capacity,flow,ioConfig)
 	meta:set_int("industrialtest.powerCapacity",capacity)
 	meta:set_int("industrialtest.powerFlow",flow)
 	meta:set_int("industrialtest.powerAmount",0)
 	meta:set_string("industrialtest.ioConfig",ioConfig)
 end
 -- \brief Checks if metadata contains power storage
 -- \param meta MetaDataRef which should be checked
 -- \returns true if metadata contains power storage, false otherwise
 function industrialtest.api.hasPowerStorage(meta)
 	local values={"industrialtest.powerCapacity","industrialtest.powerFlow","industrialtest.powerAmount","industrialtest.ioConfig"}
 	for _,value in ipairs(values) do
 		if not meta:contains(value) then
 			return false
 		end
 	end
 	return true
 end
 -- \brief Changes node's power IO config. Function doesn't check if meta actually contains power storage.
 -- \param meta MetaDataRef of node which power IO config should be changed
 -- \param side Side number. See industrialtest.api.addPowerStorage to check order.
 -- \param mode Side mode. See industrialtest.api.addPowerStorage for possible values.
 -- \returns nil
 function industrialtest.api.changeIoConfig(meta,side,mode)
 	local ioConfig=meta:get_string("industrialtest.ioConfig")
 	ioConfig=string.sub(ioConfig,1,side-1)..mode..string.sub(ioConfig,side+1)
 	meta:set_string("industrialtest.ioConfig",ioConfig)
 end
 -- \brief Checks if provided side is power input
 -- \param meta MetaDataRef of node
 -- \param side Side number. See industrialtest.api.addPowerStorage to check order.
 -- \returns true if provided side is power input, false otherwise
 function industrialtest.api.isPowerInput(meta,side)
 	local ioConfig=meta:get_string("industrialtest.ioConfig")
 	local mode=string.sub(ioConfig,side,side)
 	return (mode=="i" or mode=="a")
 end
 -- \brief Checks if provided side is power output
 -- \param meta MetaDataRef of node
 -- \param side Side number. See industrialtest.api.addPowerStorage to check order.
 -- \returns true if provided side is power output, false otherwise
 function industrialtest.api.isPowerOutput(meta,side)
 	local ioConfig=meta:get_string("industrialtest.ioConfig")
 	local mode=string.sub(ioConfig,side,side)
 	return (mode=="o" or mode=="a")
 end
 -- \brief Checks if power storage is fully charged
 -- \param meta MetaDataRef which should be checked
 -- \returns true if power storage is fully charged, false otherwise
 function industrialtest.api.isFullyCharged(meta)
 	return meta:get_int("industrialtest.powerAmount")>=meta:get_int("industrialtest.powerCapacity")
 end
 -- \brief Adds power to power storage. Function doesn't check if meta contains power storage so you must be sure that it does.
 -- \param meta MetaDataRef to which power should be added
 -- \param amount Amount of power to add
 -- \returns How much of power was actually added
 function industrialtest.api.addPower(meta,amount)
 	local powerAmount=meta:get_int("industrialtest.powerAmount")
 	local powerCapacity=meta:get_int("industrialtest.powerCapacity")
 	local prevPowerAmount=powerAmount
 	powerAmount=industrialtest.internal.clamp(powerAmount+amount,0,powerCapacity)
 	meta:set_int("industrialtest.powerAmount",powerAmount)
 	return powerAmount-prevPowerAmount
 end
 -- \brief Adds power to destination metadata while subtracting it from source metadata
 -- \Param srcMeta MetaDataRef from which take power
 -- \param destMeta MetaDataRef to which add power
 -- \returns How much of power was actually transferred
 function industrialtest.api.transferPower(srcMeta,destMeta,amount)
 	local currentFlow=math.min(srcMeta:get_int("industrialtest.powerAmount"),amount)
 	if currentFlow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addPower(destMeta,currentFlow)
 	srcMeta:set_int("industrialtest.powerAmount",srcMeta:get_int("industrialtest.powerAmount")-actualFlow)
 	return actualFlow
 end
 -- \brief Updates itemstack description to show current power storage information, additionally updates item wear bar.
 --        Function doesn't check if itemstack contains power storage so you should be sure that it does before calling this function
 -- \param itemstack ItemStack which should be updated
 -- \returns nil
 function industrialtest.api.updateItemPowerText(itemstack)
 	local meta=itemstack:get_meta()
 	local def=minetest.registered_tools[itemstack:get_name()]
 	local desc=meta:contains("industrialtest.descriptionOverride") and meta:get_string("industrialtest.descriptionOverride") or def.description
 	meta:set_string("description",S("@1\n@2 / @3 EU",desc,meta:get_int("industrialtest.powerAmount"),meta:get_int("industrialtest.powerCapacity")))
 	itemstack:set_wear(65535-meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*65534)
 end
 -- \brief Adds power storage to item depending on it's definition
 -- \param itemstack ItemStack to which item storage should be added
 -- \returns true if power storage was successfully added, false otherwise
 function industrialtest.api.preparePowerStorageItem(itemstack)
 	local meta=itemstack:get_meta()
 	local def=minetest.registered_tools[itemstack:get_name()]
 	if industrialtest.api.hasPowerStorage(meta) or not def or not def._industrialtest_powerStorage or not def._industrialtest_powerCapacity or not def._industrialtest_powerFlow then
 		return false
 	end
 	industrialtest.api.addPowerStorage(meta,def._industrialtest_powerCapacity,def._industrialtest_powerFlow,"n/a")
 	industrialtest.api.updateItemPowerText(itemstack)
 	return true
 end
 -- \brief Adds power to itemstack. Function checks if itemstack has power storage.
 -- \param itemstack ItemStack to which add power
 -- \param amount How much power to add
 -- \returns Amount of power added
 function industrialtest.api.addPowerToItem(itemstack,amount)
 	local meta=itemstack:get_meta()
 	if not industrialtest.api.hasPowerStorage(meta) then
 		return 0
 	end
 	local added=industrialtest.api.addPower(meta,amount)
 	industrialtest.api.updateItemPowerText(itemstack)
 	return added
 end
 -- \brief Adds power to destination itemstack while subtracting it from source metadata
 -- \param srcMeta MetaDataRef from which take power
 -- \param itemstack ItemStack to which add power
 -- \param amount number
 -- \returns How much of power was actually transferred
 function industrialtest.api.transferPowerToItem(srcMeta,itemstack,amount)
 	local currentFlow=math.min(srcMeta:get_int("industrialtest.powerAmount"),amount)
 	if currentFlow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addPowerToItem(itemstack,currentFlow)
 	srcMeta:set_int("industrialtest.powerAmount",srcMeta:get_int("industrialtest.powerAmount")-actualFlow)
 	return actualFlow
 end
 -- \brief Adds power to destination metadata while subtracting it from source itemstack
 -- \param srcItemstack ItemStack from which subtract power
 -- \param meta MetaDataRef to which add power
 -- \param amount How much power should be transferred
 -- \returns How much of power was actually transferred
 function industrialtest.api.transferPowerFromItem(srcItemstack,meta,amount)
 	local srcMeta=srcItemstack:get_meta()
 	local currentFlow=math.min(srcMeta:get_int("industrialtest.powerAmount"),amount)
 	if currentFlow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addPower(meta,currentFlow)
 	industrialtest.api.addPowerToItem(srcItemstack,-actualFlow)
 	return actualFlow
 end
--- a/api/registration.lua
+++ b/api/registration.lua
@@ -0,0 +1,294 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
 function industrialtest.api.addTag(name,tag)
 	if not industrialtest.api.tags[tag] then
 		industrialtest.api.tags[tag]={}
 	end
 	table.insert(industrialtest.api.tags[tag],name)
 end
 -- \brief Registers dust of certain resource
 -- \param name Technical name of resource
 -- \param displayName Display name of resource
 -- \param resources List of tables with following keys: <output>, <recipe>, [count(1)]
 --                                                      <> - required, [] - optional, () - default value
 -- \param color HTML color of dust
 -- \param registerMaceratorRecipe If true macerator recipe for dust will be registered
 -- \returns nil
 function industrialtest.api.registerResourceDust(name,displayName,resources,color,registerMaceratorRecipe)
 	minetest.register_craftitem("industrialtest:"..name.."_dust",{
 		description=S(displayName.." Dust"),
 		inventory_image="industrialtest_dust.png",
 		color=color
 	})
 	if registerMaceratorRecipe then
 		for _,value in ipairs(resources) do
 			industrialtest.api.registerMaceratorRecipe({
 				output="industrialtest:"..name.."_dust "..(value.count or 1),
 				recipe=value.resource
 			})
 		end
 	end
 end
 -- \brief Registers plate of certain resource
 -- \param name Technical name of resource
 -- \param displayName Display name of resource
 -- \param resources List of tables with following keys: <output>, <recipe>, [count(1)]
 --                                                      <> - required, [] - optional, () - default value
 -- \param color HTML color of plate
 -- \param registerCompressorRecipe If true compressor recipe for plate will be registered
 -- \returns nil
 function industrialtest.api.registerPlate(name,displayName,resources,color,registerCompressorRecipe)
 	minetest.register_craftitem("industrialtest:"..name,{
 		description=displayName,
 		inventory_image="industrialtest_plate.png",
 		inventory_overlay="industrialtest_plate_overlay.png",
 		color=color
 	})
 	if registerCompressorRecipe then
 		for _,value in ipairs(resources) do
 			industrialtest.api.registerCompressorRecipe({
 				output="industrialtest:"..name.." "..(value.count or 1),
 				recipe=value.resource
 			})
 		end
 	end
 end
 -- \brief Registers cell with certain fluid
 -- \param name Technical name of cell
 -- \param displayName Display name of cell
 -- \param node Node which can be picked up with this cell
 -- \returns nil
 function industrialtest.api.registerStorageCell(name,displayName,node,modname,color)
 	color = color or "#ffffffff"
 	if not modname then
 		modname="industrialtest"
 	end
 	minetest.register_craftitem("industrialtest:"..name.."_cell",{
 		description=S(displayName.." Cell"),
 		inventory_image="industrialtest_cell_fluid.png",
 		inventory_overlay="industrialtest_cell_casing.png",
 		color=color,
 		on_place=function(itemstack,user,pointed)
 			if pointed.type~="node" or not user or not user:is_player() then
 				return nil
 			end
 			local node=minetest.get_node_or_nil(pointed.above)
 			local storage=industrialtest.api.getStorageCell("industrialtest:"..name.."_cell")
 			if storage.node then
 				if node.name~="air" and node.name~=storage.node then
 					return nil
 				end
 				minetest.set_node(pointed.above,{name=storage.node})
 				if itemstack:get_count()==1 then
 					itemstack:set_name("industrialtest:empty_cell")
 				else
 					local inv=user:get_inventory()
 					inv:add_item("main",ItemStack("industrialtest:empty_cell"))
 					itemstack:take_item()
 				end
 				return itemstack
 			end
 			return nil
 		end
 	})
 	industrialtest.api.storageCells["industrialtest:"..name.."_cell"]={
 		name="industrialtest:"..name.."_cell",
 		node=node
 	}
 end
 -- \brief Returns registred storage cell by name
 -- \param name Storage cell name
 -- \returns Table with following keys: name, node or nil in case of failure
 function industrialtest.api.getStorageCell(name)
 	return industrialtest.api.storageCells[name]
 end
 -- \brief Returns registered storage cells by node
 -- \param node Node ID
 -- \returns Table with following keys: name, node or nil in case of failure
 function industrialtest.api.getStorageCellByNode(node)
 	for _,value in pairs(industrialtest.api.storageCells) do
 		if value.node==node then
 			return value
 		end
 	end
 	return nil
 end
 -- \brief Registers macerator recipe
 -- \param config Table with keys: <output>, <recipe>, [time(2)]
 -- \returns nil
 function industrialtest.api.registerMaceratorRecipe(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
 	industrialtest.api.maceratorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
 -- \param recipe String ID of resulting conten
 -- \returns Table with following keys: output, recipe, time
 function industrialtest.api.getMaceratorRecipeResult(recipe)
 	return industrialtest.api.maceratorRecipes[recipe]
 end
 -- \brief Registers compressor recipe
 -- \param config Table with following keys: <output>, <recipe>, [time(2)], [count(1)]
 -- \returns nil
 function industrialtest.api.registerCompressorRecipe(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2,
 		count=config.count or 1
 	}
 	industrialtest.api.compressorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
 -- \param recipe String ID of resulting conten
 -- \returns Table with following keys: output, recipe, time
 function industrialtest.api.getCompressorRecipeResult(recipe)
 	return industrialtest.api.compressorRecipes[recipe]
 end
 function industrialtest.api.registerExtractorRecipe(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
 	industrialtest.api.extractorRecipes[definition.recipe]=definition
 end
 function industrialtest.api.getExtractorRecipeResult(recipe)
 	return industrialtest.api.extractorRecipes[recipe]
 end
 function industrialtest.api.registerCableFormerRecipe(config)
 	local definition={
 		output=config.output or "",
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
 	industrialtest.api.cableFormerRecipes[definition.recipe]=definition
 end
 function industrialtest.api.getCableFormerRecipeResult(recipe)
 	return industrialtest.api.cableFormerRecipes[recipe]
 end
 -- \brief Registers fuel that can be used in geothermal generator
 -- \param fuel Table with following keys: <name>, <calorificValue>, <storageItems>
 --        which is a table containing items which are tables with following keys: <name>, <leftover>
 -- \returns nil
 function industrialtest.api.registerGeothermalGeneratorFuel(config)
 	local definition={
 		name=config.name or "",
 		calorificValue=config.calorificValue or 0,
 		texture=config.texture or "industrialtest_gui_fluid_bg.png",
 		storageItems=config.storageItems or {}
 	}
 	industrialtest.api.geothermalGeneratorFuels[definition.name]=definition
 end
 -- \brief Returns generator fuel information
 -- \param name Name of fuel
 -- \returns Table with following keys: name, calorificValue, storageItems
 function industrialtest.api.getGeothermalGeneratorFuel(name)
 	return industrialtest.api.geothermalGeneratorFuels[name]
 end
 -- \brief Returns generator fuel information by item name
 -- \param name ID of item
 -- \returns Table with following keys: name, calorificValue, storageItems or nil in case of failure
 function industrialtest.api.getGeothermalGeneratorFuelByItem(name)
 	for _,value in pairs(industrialtest.api.geothermalGeneratorFuels) do
 		for _,item in ipairs(value.storageItems) do
 			if item.name==name then
 				return value
 			end
 		end
 	end
 	return nil
 end
 -- \brief Registers fuel that can be used in water mill
 -- \param fuel Table with following keys: <name>, <calorificValue>, <storageItems>
 --        which is a table containing items which are tables with following keys: <name>, <leftover>
 -- \returns nil
 function industrialtest.api.registerWaterMillFuel(config)
 	local definition={
 		name=config.name or "",
 		calorificValue=config.calorificValue or 0,
 		texture=config.texture or "industrialtest_gui_fluid_bg.png",
 		storageItems=config.storageItems or {}
 	}
 	industrialtest.api.waterMillFuels[definition.name]=definition
 end
 -- \brief Returns water mill fuel information
 -- \param name Name of fuel
 -- \returns Table with following keys: name, calorificValue, storageItems
 function industrialtest.api.getWaterMillFuel(name)
 	return industrialtest.api.waterMillFuels[name]
 end
 -- \brief Returns water mill fuel information by item name
 -- \param name ID of item
 -- \returns Table with following keys: name, calorificValue, storageItems or nil in case of failure
 function industrialtest.api.getWaterMillFuelByItem(name)
 	for _,value in pairs(industrialtest.api.waterMillFuels) do
 		for _,item in ipairs(value.storageItems) do
 			if item.name==name then
 				return value
 			end
 		end
 	end
 	return nil
 end
 -- \brief Registers Rotary Macerator recipe modifier
 -- \param config table
 -- \returns nil
 function industrialtest.api.registerRotaryMaceratorModifier(config)
 	local definition={
 		name=config.name or "",
 		modifier=config.modifier or "",
 		output=config.output or "",
 		time=config.time or 2,
 		uses=config.uses or 1,
 		modifierLeftover=config.modifierLeftover
 	}
 	industrialtest.api.rotaryMaceratorModifiers[definition.name.." "..config.modifier]=definition
 end
 -- \brief Returns modified Rotary Macerator recipe by item and modifier
 -- \param name string
 -- \param modifier string
 -- \returns table
 function industrialtest.api.getRotaryMaceratorModifier(name,modifier)
 	return industrialtest.api.rotaryMaceratorModifiers[name.." "..modifier]
 end
--- a/api/side.lua
+++ b/api/side.lua
@@ -0,0 +1,49 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -- \brief Takes rotated node and side and outputs normalized side that can be used for ioConfig lookups
 -- \param pos Vector with node position
 -- \param side Node side. See industrialtest.api.addPowerStorage for possible values
 -- \returns Normalized side or in case of failure side argument back
 function industrialtest.api.normalizeSide(pos,side)
 	local node=minetest.get_node(pos)
 	-- FIXME: improve code quality there
 	local translation={
 		[0]={
 			1,2,3,4,5,6
 		},
 		[1]={
 			5,6,3,4,2,1
 		},
 		[2]={
 			2,1,3,4,6,5
 		},
 		[3]={
 			6,5,3,4,1,2
 		}
 	}
 	if node.param2>3 then
 		return side
 	end
 	return translation[node.param2][side]
 end
 -- \brief Returns opposite side of provided one
 -- \param side Side number. See industrialtest.api.addPowerStorage for order
 -- \returns Opposite side
 function industrialtest.api.getOppositeSide(side)
 	return (side%2==0 and side-1 or side+1)
 end
--- a/api/tool.lua
+++ b/api/tool.lua
@@ -0,0 +1,60 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -- \brief Sets uses metadata value depending on item's definition
 -- \param itemstack ItemStack which should be altered
 -- \returns true if value was successfully added, false otherwise
 function industrialtest.api.prepareToolItem(itemstack)
 	local def=minetest.registered_tools[itemstack:get_name()]
 	if not def then
 		return false
 	end
 	if def._industrialtest_tool and def.tool_capabilities and def.tool_capabilities.uses then
 		local meta=itemstack:get_meta()
 		meta:set_int("industrialtest.uses",def.tool_capabilities.uses)
 		return true
 	elseif def.groups and def.groups._industrialtest_emptyOnConstruct and itemstack:get_wear()==0 then
 		itemstack:set_wear(65534)
 		return true
 	end
 	return false
 end
 -- \brief Adds wear to item after it's use
 -- \param itemstack ItemStack to which wear should be added
 -- \returns nil
 function industrialtest.api.afterToolUse(itemstack)
 	local meta=itemstack:get_meta()
 	local def=minetest.registered_tools[itemstack:get_name()]
 	if not def or not def._industrialtest_tool or not def.tool_capabilities or not def.tool_capabilities.uses then
 		return
 	end
 	if not meta:contains("industrialtest.uses") then
 		industrialtest.prepareToolItem(itemstack)
 	end
 	local uses=meta:get_int("industrialtest.uses")-1
 	if uses==0 then
 		itemstack:set_count(0)
 		minetest.sound_play({name="default_tool_breaks"},{
 			gain=1,
 			fade=0,
 			pitch=1
 		},true)
 		return
 	end
 	meta:set_int("industrialtest.uses",uses)
 	itemstack:set_wear(65535-uses/def.tool_capabilities.uses*65535)
 end
--- a/compat/logistica.lua
+++ b/compat/logistica.lua
@@ -0,0 +1,65 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local oldInsertItemstackForRequester=logistica.insert_itemstack_for_requester
 -- Logistica overrides
 function logistica.insert_itemstack_for_requester(requesterPos,itemstack,limitByRequest)
 	local result=oldInsertItemstackForRequester(requesterPos, itemstack, limitByRequest)
 	local targetPos=logistica.get_requester_target(requesterPos)
 	local def=minetest.registered_nodes[minetest.get_node(targetPos).name]
 	if def._logistica_afterRequesterItemstackInsert then
 		def._logistica_afterRequesterItemstackInsert(targetPos)
 	end
 	return result
 end
 local onInjectorTimer=logistica.on_timer_powered(function(pos,elapsed)
 	local result=logistica.on_injector_timer(pos,elapsed)
 	local targetPos=logistica.get_injector_target(pos)
 	local def=minetest.registered_nodes[minetest.get_node(targetPos).name]
 	if def._logistica_afterInjectorItemstackTake then
 		def._logistica_afterInjectorItemstackTake(targetPos)
 	end
 	return result
 end)
 for _,name in ipairs(logistica.group_get_all_nodes_for_group("injectors")) do
 	local override={
 		on_timer=onInjectorTimer
 	}
 	minetest.override_item(name,override)
 end
 local function startNodeTimer(pos)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 local function addLogisticaCompatibility(name)
 	local override={
 		_logistica_afterRequesterItemstackInsert=startNodeTimer,
 		_logistica_afterInjectorItemstackTake=startNodeTimer
 	}
 	minetest.override_item(name,override)
 end
 for _,name in ipairs(industrialtest.api.tags.usesTimer) do
 	addLogisticaCompatibility(name)
 end
--- a/compat/pipeworks.lua
+++ b/compat/pipeworks.lua
@@ -344,7 +344,7 @@ addPipeworksCompatibility("industrialtest:induction_furnace",{
 },"dst")
 -- Simple electric item processors
-for _,name in ipairs(industrialtest.internal.simpleElectricItemProcessors) do
+for _,name in ipairs(industrialtest.api.tags.simpleElectricItemProcessor) do
 	addPipeworksCompatibility(name,{
 		{
 			y=1,
--- a/compatibility.lua
+++ b/compatibility.lua
@@ -40,6 +40,7 @@ elseif industrialtest.mclAvailable then
 	industrialtest.mods.mclRubber=minetest.get_modpath("mcl_rubber")
 end
 industrialtest.mods.pipeworks=minetest.get_modpath("pipeworks")
 industrialtest.mods.logistica=minetest.get_modpath("logistica")
 industrialtest.mods.mesecons=minetest.get_modpath("mesecons")
 if industrialtest.mtgAvailable and not industrialtest.mods._3dArmor then
--- a/init.lua
+++ b/init.lua
@@ -14,8 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-MODNAME="industrialtest"
+local modpath=minetest.get_modpath("industrialtest")
 local modpath=minetest.get_modpath(MODNAME)
 -- table with global functions, variables etc
 industrialtest={}
@@ -29,10 +28,22 @@ industrialtest.random=PseudoRandom(os.time())
 -- load other lua files
 dofile(modpath.."/compatibility.lua")
 dofile(modpath.."/api.lua")
 dofile(modpath.."/minerals.lua")
 dofile(modpath.."/api/common.lua")
 dofile(modpath.."/api/fluid.lua")
 dofile(modpath.."/api/network.lua")
 dofile(modpath.."/api/power.lua")
 dofile(modpath.."/api/registration.lua")
 dofile(modpath.."/api/side.lua")
 dofile(modpath.."/api/tool.lua")
 dofile(modpath.."/machines/common.lua")
 dofile(modpath.."/machines/machine.lua")
 dofile(modpath.."/machines/activated_machine.lua")
 dofile(modpath.."/machines/electric_machine.lua")
 dofile(modpath.."/machines/activated_electric_machine.lua")
 dofile(modpath.."/machines/simple_electric_item_processor.lua")
 dofile(modpath.."/machines/canning_machine.lua")
 dofile(modpath.."/machines/chargepad.lua")
 dofile(modpath.."/machines/compressor.lua")
@@ -84,6 +95,9 @@ dofile(modpath.."/crafts.lua")
 if industrialtest.mods.pipeworks then
 	dofile(modpath.."/compat/pipeworks.lua")
 end
 if industrialtest.mods.logistica then
 	dofile(modpath.."/compat/logistica.lua")
 end
 if industrialtest.mods.mesecons then
 	dofile(modpath.."/compat/mesecons.lua")
 end
--- a/machines/activated_electric_machine.lua
+++ b/machines/activated_electric_machine.lua
@@ -0,0 +1,44 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 industrialtest.ActivatedElectricMachine=table.copy(industrialtest.ElectricMachine)
 -- Forward methods from ActivatedMachine
 industrialtest.internal.unpackTableInto(industrialtest.ActivatedElectricMachine,{
 	canUpdate=industrialtest.ActivatedMachine.canUpdate,
 	register=industrialtest.ActivatedMachine.register,
 	createDefinitionTable=industrialtest.ActivatedMachine.createDefinitionTable,
 	createActiveDefinitionTable=industrialtest.ActivatedMachine.createActiveDefinitionTable,
 	activate=industrialtest.ActivatedMachine.activate,
 	deactivate=industrialtest.ActivatedMachine.deactivate,
 	shouldActivate=industrialtest.ActivatedMachine.shouldActivate,
 	shouldDeactivate=industrialtest.ActivatedMachine.shouldDeactivate,
 	afterActivation=industrialtest.ActivatedMachine.afterActivation,
 	afterDeactivation=industrialtest.ActivatedMachine.afterDeactivation
 })
 function industrialtest.ActivatedElectricMachine.onTimer(self,pos,elapsed)
 	local result=self:powerExchange(pos)
 	local result2=industrialtest.ActivatedMachine.onTimer(self,pos,elapsed)
 	return result or result2
 end
 function industrialtest.ActivatedElectricMachine.activeOnTimer(self,pos,elapsed)
 	local result=self:powerExchange(pos)
 	local result2=industrialtest.ActivatedMachine.activeOnTimer(self,pos,elapsed)
 	return result or result2
 end
--- a/machines/activated_machine.lua
+++ b/machines/activated_machine.lua
@@ -0,0 +1,114 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 industrialtest.ActivatedMachine=table.copy(industrialtest.Machine)
 function industrialtest.ActivatedMachine.canUpdate(self,pos)
 	return self:shouldActivate(pos)
 end
 function industrialtest.ActivatedMachine.onTimer(self,pos,elapsed)
 	local result=industrialtest.Machine.onTimer(self,pos,elapsed)
 	if self:shouldActivate(pos) then
 		self:activate(pos)
 		return false
 	end
 	return result
 end
 function industrialtest.ActivatedMachine.register(self)
 	industrialtest.Machine.register(self)
 	local def=self:createActiveDefinitionTable()
 	minetest.register_node(self.name.."_active",def)
 end
 function industrialtest.ActivatedMachine.createActiveDefinitionTable(self)
 	local def=self:createDefinitionTable()
 	def.description=nil
 	def.drop=def.drop or self.name
 	if self.active then
 		def.tiles=self.active.tiles or def.tiles
 		def.light_source=self.active.lightSource
 	end
 	def.on_timer=function(pos,elapsed)
 		return self:activeOnTimer(pos,elapsed)
 	end
 	if industrialtest.mclAvailable then
 		def.groups.not_in_creative_inventory=1
 		def._doc_items_create_entry=false
 	end
 	return def
 end
 function industrialtest.ActivatedMachine.activate(self,pos)
 	minetest.swap_node(pos,{
 		name=self.name.."_active",
 		param2=minetest.get_node(pos).param2
 	})
 	self:afterActivation(pos)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 function industrialtest.ActivatedMachine.deactivate(self,pos)
 	minetest.swap_node(pos,{
 		name=self.name,
 		param2=minetest.get_node(pos).param2
 	})
 	self:afterDeactivation(pos)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 function industrialtest.ActivatedMachine.shouldActivate(self,pos)
 	return false
 end
 function industrialtest.ActivatedMachine.shouldDeactivate(self,pos)
 	return false
 end
 function industrialtest.ActivatedMachine.afterActivation(self,pos)
 end
 function industrialtest.ActivatedMachine.afterDeactivation(self,pos)
 end
 function industrialtest.ActivatedMachine.activeOnTimer(self,pos,elapsed)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local shouldUpdateFormspec=false
 	if self:shouldDeactivate(pos) then
 		self:deactivate(pos)
 		return false
 	end
 	if self.activeUpdate then
 		shouldUpdateFormspec=self:activeUpdate(pos,elapsed,meta,inv)
 	end
 	if shouldUpdateFormspec then
 		self:updateFormspec(pos)
 	end
 	return true
 end
--- a/machines/cable_former.lua
+++ b/machines/cable_former.lua
@@ -15,18 +15,55 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.CableFormer=table.copy(industrialtest.SimpleElectricItemProcessor)
-industrialtest.internal.registerSimpleElectricItemProcessor({
+industrialtest.internal.unpackTableInto(industrialtest.CableFormer,{
-	name="cable_former",
+	name="industrialtest:cable_former",
-	displayName=S("Cable Former"),
+	description=S("Cable Former"),
-	customFrontTexture=true,
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_cable_former_front.png"
 	},
 	requiresWrench=true,
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_cable_former_front_active.png"
 		}
 	},
 	capacity=1400,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=80,
 	method="industrialtest.cable_forming",
 	efficiency=1
 })
 function industrialtest.CableFormer.getCraftResult(self,itemstack)
 	local output=industrialtest.api.getCableFormerRecipeResult(itemstack:get_name())
 	if not output then
 		return {
 			item=ItemStack(),
 			time=0,
 			src=itemstack
 		}
 	end
 	local srcAfter=ItemStack(itemstack:get_name())
 	srcAfter:set_count(itemstack:get_count()-1)
 	return {
 		item=ItemStack(output.output),
 		time=output.time,
 		src=srcAfter
 	}
 end
 industrialtest.CableFormer:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:cable_former",
--- a/machines/canning_machine.lua
+++ b/machines/canning_machine.lua
@@ -15,15 +15,69 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-local canningMachine={}
+industrialtest.CanningMachine=table.copy(industrialtest.ActivatedElectricMachine)
 industrialtest.internal.unpackTableInto(industrialtest.CanningMachine,{
 	name="industrialtest:canning_machine",
 	description=S("Canning Machine"),
 	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_canning_machine_front.png"
 	},
 	sounds="metal",
 	facedir=true,
 	storageLists={
 		"src",
 		"dst",
 		"leftover",
 		"upgrades",
 		"powerStorage"
 	},
 	powerLists={
 		{
 			list="powerStorage",
 			direction="i"
 		}
 	},
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_canning_machine_front_active.png"
 		}
 	},
 	capacity=industrialtest.api.lvPowerFlow*2,
 	flow=industrialtest.api.lvPowerFlow,
 	ioConfig="iiiiii",
 	requiresWrench=true,
 	hasPowerInput=true,
 	_opPower=200,
 	_canningTime=5
 })
-canningMachine.opPower=200
+function industrialtest.CanningMachine.onConstruct(self,pos)
-canningMachine.canningTime=5
+	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	inv:set_size("src",1)
 	inv:set_size("dst",1)
 	inv:set_size("leftover",1)
 	inv:set_size("powerStorage",1)
 	inv:set_size("upgrades",4)
 	meta:set_float("srcTime",0)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
-canningMachine.getFormspec=function(pos)
+function industrialtest.CanningMachine.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 srcPercent=meta:get_float("srcTime")/canningMachine.canningTime*100
+	local srcPercent=meta:get_float("srcTime")/self._canningTime*100
 	local formspec={
 		"list[context;src;3.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
@@ -42,44 +96,10 @@ canningMachine.getFormspec=function(pos)
 		"listring[context;src]",
 		"listring[context;dst]"
 	}
-	return table.concat(formspec,"")
+	return parentFormspec..table.concat(formspec,"")
 end
-canningMachine.onConstruct=function(pos,meta,inv)
+function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count)
 	inv:set_size("src",1)
 	inv:set_size("dst",1)
 	inv:set_size("leftover",1)
 	inv:set_size("powerStorage",1)
 	inv:set_size("upgrades",4)
 	meta:set_float("srcTime",0)
 end
 canningMachine.onTimer=function(pos,elapsed,meta,inv)
 	local shouldRerunTimer=false
 	local shouldUpdateFormspec=false
 	local fuelSlot=inv:get_stack("src",1)
 	local targetSlot=inv:get_stack("dst",1)
 	local leftoverSlot=inv:get_stack("leftover",1)
 	local powerStorageSlot=inv:get_stack("powerStorage",1)
 	local targetMeta=targetSlot:get_meta()
 	shouldRerunTimer,shouldUpdateFormspec=industrialtest.internal.chargeFromPowerStorageItem(meta,inv)
 	local def=fuelSlot:get_definition()
 	if not fuelSlot:is_empty() and not targetSlot:is_empty() and meta:get_int("industrialtest.powerAmount")>=canningMachine.opPower and (not def._industrialtest_emptyVariant or leftoverSlot:item_fits(ItemStack(def._industrialtest_emptyVariant))) and
 		(not industrialtest.api.itemHasFluidStorage(fuelSlot) or fuelSlot:get_meta():get_int("industrialtest.fluidAmount")>0) and targetMeta:get_int("industrialtest.fluidAmount")<targetMeta:get_int("industrialtest.fluidCapacity") then
 		minetest.swap_node(pos,{
 			name="industrialtest:canning_machine_active",
 			param2=minetest.get_node(pos).param2
 		})
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		return false,shouldUpdateFormspec
 	end
 	return shouldRerunTimer,true
 end
 canningMachine.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList,count)
 	if toList=="src" then
 		local inv=minetest.get_meta(pos):get_inventory()
 		local itemstack=inv:get_stack(fromList,fromIndex)
@@ -92,10 +112,10 @@ canningMachine.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList
 		local def=itemstack:get_definition()
 		return (def.groups and def.groups._industrialtest_fueled) and count or 0
 	end
-	return count
+	return math.min(count,industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count))
 end
-canningMachine.allowMetadataInventoryPut=function(pos,listname,index,stack)
+function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="src" then
 		local def=stack:get_definition()
 		return (def.groups and def.groups._industrialtest_fuel) and stack:get_count() or 0
@@ -104,10 +124,10 @@ canningMachine.allowMetadataInventoryPut=function(pos,listname,index,stack)
 		local def=stack:get_definition()
 		return (def.groups and def.groups._industrialtest_fueled) and stack:get_count() or 0
 	end
-	return stack:get_count()
+	return math.min(stack:get_count(),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack))
 end
-canningMachine.allowMetadataInventoryTake=function(pos,listname,index,stack)
+function industrialtest.CanningMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fuelSlot=inv:get_stack("src",1)
@@ -116,14 +136,11 @@ canningMachine.allowMetadataInventoryTake=function(pos,listname,index,stack)
 		meta:set_float("srcTime",0)
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
-	return stack:get_count()
+	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
 end
-canningMachine.onMetadataInventoryPut=function(pos)
+function industrialtest.CanningMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	industrialtest.ActivatedElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 end
 canningMachine.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fuelSlot=inv:get_stack("src",1)
@@ -134,41 +151,61 @@ canningMachine.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,to
 	end
 end
-canningMachine.activeOnTimer=function(pos,elapsed,meta,inv)
+function industrialtest.CanningMachine.onMetadataInventoryPut(self,pos)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 function industrialtest.CanningMachine.shouldActivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fuelSlot=inv:get_stack("src",1)
 	local targetSlot=inv:get_stack("dst",1)
 	local leftoverSlot=inv:get_stack("leftover",1)
 	local powerStorageSlot=inv:get_stack("powerStorage",1)
 	local targetMeta=targetSlot:get_meta()
 	local def=fuelSlot:get_definition()
 	return not fuelSlot:is_empty() and not targetSlot:is_empty() and meta:get_int("industrialtest.powerAmount")>=self._opPower and (not def._industrialtest_emptyVariant or leftoverSlot:item_fits(ItemStack(def._industrialtest_emptyVariant))) and
 		(not industrialtest.api.itemHasFluidStorage(fuelSlot) or fuelSlot:get_meta():get_int("industrialtest.fluidAmount")>0) and targetMeta:get_int("industrialtest.fluidAmount")<targetMeta:get_int("industrialtest.fluidCapacity")
 end
 function industrialtest.CanningMachine.shouldDeactivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fuelSlot=inv:get_stack("src",1)
 	local fuelDef=fuelSlot:get_definition()
 	local targetSlot=inv:get_stack("dst",1)
 	local targetMeta=targetSlot:get_meta()
 	local leftoverSlot=inv:get_stack("leftover",1)
 	return fuelSlot:is_empty() or targetSlot:is_empty() or meta:get_int("industrialtest.powerAmount")<self._opPower or
 		(industrialtest.api.itemHasFluidStorage(fuelSlot) and industrialtest.api.isItemFluidStorageEmpty(fuelSlot)) or
 		industrialtest.api.isItemFluidStorageFull(targetSlot) or
 		targetMeta:get_int("industrialtest.fluidCapacity")-targetMeta:get_int("industrialtest.fluidAmount")<fuelDef._industrialtest_fuelAmount or
 		(fuelDef._industrialtest_emptyVariant and not leftoverSlot:item_fits(ItemStack(fuelDef._industrialtest_emptyVariant)))
 end
 function industrialtest.CanningMachine.afterDeactivation(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local targetSlot=inv:get_stack("dst",1)
 	if meta:get_int("industrialtest.powerAmount")>=self._opPower or industrialtest.api.isItemFluidStorageFull(targetSlot) then
 		meta:set_float("srcTime",0)
 	end
 	self:updateFormspec(pos)
 end
 function industrialtest.CanningMachine.activeUpdate(self,pos,elapsed,meta,inv)
 	local shouldUpdateFormspec=false
 	local fuelSlot=inv:get_stack("src",1)
 	local targetSlot=inv:get_stack("dst",1)
 	local powerStorageSlot=inv:get_stack("powerStorage",1)
 	shouldRerunTimer,shouldUpdateFormspec=industrialtest.internal.chargeFromPowerStorageItem(meta,inv)
 	if fuelSlot:is_empty() or targetSlot:is_empty() or meta:get_int("industrialtest.powerAmount")<canningMachine.opPower then
 		if meta:get_int("industrialtest.powerAmount")>=canningMachine.opPower then
 			meta:set_float("srcTime",0)
 		end
 		minetest.swap_node(pos,{
 			name="industrialtest:canning_machine",
 			param2=minetest.get_node(pos).param2
 		})
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		return false,true
 	end
 	local fuelMeta=fuelSlot:get_meta()
 	local targetMeta=targetSlot:get_meta()
-	if (industrialtest.api.itemHasFluidStorage(fuelSlot) and fuelMeta:get_int("industrialtest.fluidAmount")==0) or targetMeta:get_int("industrialtest.fluidAmount")==targetMeta:get_int("industrialtest.fluidCapacity") then
+	local srcTime=meta:get_float("srcTime")+elapsed*industrialtest.api.getMachineSpeed(meta)
-		meta:set_float("srcTime",0)
+	if srcTime>=self._canningTime then
 		minetest.swap_node(pos,{
 			name="industrialtest:canning_machine",
 			param2=minetest.get_node(pos).param2
 		})
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		return false,true
 	end
 	local srcTime=meta:get_float("srcTime")
 	srcTime=srcTime+elapsed*industrialtest.api.getMachineSpeed(meta)
 	if srcTime>=canningMachine.canningTime then
 		if industrialtest.api.itemHasFluidStorage(fuelSlot) then
 			industrialtest.api.transferFluidToItem(fuelSlot,targetSlot,fuelMeta:get_int("industrialtest.fluidAmount"))
 			inv:set_stack("src",1,fuelSlot)
@@ -177,12 +214,7 @@ canningMachine.activeOnTimer=function(pos,elapsed,meta,inv)
 			local def=fuelSlot:get_definition()
 			local leftoverSlot=inv:get_stack("leftover",1)
 			if targetMeta:get_int("industrialtest.fluidCapacity")-targetMeta:get_int("industrialtest.fluidAmount")<def._industrialtest_fuelAmount or (def._industrialtest_emptyVariant and not leftoverSlot:item_fits(ItemStack(def._industrialtest_emptyVariant))) then
-				minetest.swap_node(pos,{
+				return shouldUpdateFormspec
 					name="industrialtest:canning_machine",
 					param2=minetest.get_node(pos).param2
 				})
 				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 				return false,shouldUpdateFormspec
 			end
 			industrialtest.api.addFluidToItem(targetSlot,def._industrialtest_fuelAmount)
 			inv:set_stack("dst",1,targetSlot)
@@ -195,57 +227,13 @@ canningMachine.activeOnTimer=function(pos,elapsed,meta,inv)
 	else
 		meta:set_float("srcTime",srcTime)
 	end
-	industrialtest.api.addPower(meta,-canningMachine.opPower)
+	industrialtest.api.addPower(meta,-self._opPower)
-	return true,true
+	return true
 end
-industrialtest.internal.registerMachine({
+industrialtest.CanningMachine:register()
-	name="canning_machine",
+
 	displayName=S("Canning Machine"),
 	capacity=industrialtest.api.lvPowerFlow*2,
 	getFormspec=canningMachine.getFormspec,
 	flow=industrialtest.api.lvPowerFlow,
 	ioConfig="iiiiii",
 	requiresWrench=true,
 	registerActiveVariant=true,
 	sounds="metal",
 	powerSlots={"powerStorage"},
 	storageSlots={"src","dst","powerStorage","upgrades"},
 	groups={
 		_industrialtest_hasPowerInput=1
 	},
 	customKeys={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_canning_machine_front.png"
 		},
 		paramtype2="facedir",
 		legacy_facedir_simple=true
 	},
 	activeCustomKeys={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_canning_machine_front_active.png"
 		}
 	},
 	onConstruct=canningMachine.onConstruct,
 	onTimer=canningMachine.onTimer,
 	allowMetadataInventoryMove=canningMachine.allowMetadataInventoryMove,
 	allowMetadataInventoryPut=canningMachine.allowMetadataInventoryPut,
 	allowMetadataInventoryTake=canningMachine.allowMetadataInventoryTake,
 	onMetadataInventoryPut=canningMachine.onMetadataInventoryPut,
 	onMetadataInventoryMove=canningMachine.onMetadataInventoryMove,
 	activeOnTimer=canningMachine.activeOnTimer
 })
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:canning_machine",
--- a/machines/chargepad.lua
+++ b/machines/chargepad.lua
@@ -15,11 +15,71 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
 local chargepad={}
 industrialtest.internal.chargepads={}
 industrialtest.Chargepad=table.copy(industrialtest.ActivatedElectricMachine)
 industrialtest.internal.unpackTableInto(industrialtest.Chargepad,{
 	storageLists={
 		"charged",
 		"discharged"
 	},
 	powerLists={
 		{
 			list="charged",
 			direction="o"
 		},
 		{
 			list="discharged",
 			direction="i"
 		}
 	},
 	facedir=true,
 	ioConfig="iiiioi",
 	hasPowerInput=true,
 	hasPowerOutput=true
 })
-local function chargePlayer(meta,player,flow)
+function industrialtest.Chargepad.onConstruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	inv:set_size("charged",1)
 	inv:set_size("discharged",1)
 	meta:set_int("active",0)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
 function industrialtest.Chargepad.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local formspec={
 		"list[context;charged;1,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(1,2.5,1,1),
 		"label[0.9,3.9;"..S("Charge").."]",
 		"list[context;discharged;3,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(3,2.5,1,1),
 		"label[2.7,3.9;"..S("Discharge").."]",
 		self.createPowerIndicatorWidget(charged,9,1),
 		"listring[context;charged]",
 		"listring[context;discharged]"
 	}
 	return parentFormspec..table.concat(formspec,"")
 end
 function industrialtest.Chargepad.register(self)
 	industrialtest.ActivatedElectricMachine.register(self)
 	table.insert(industrialtest.internal.chargepads,self.name)
 	table.insert(industrialtest.internal.chargepads,self.name.."_active")
 	minetest.register_craft({
 		type="shaped",
 		output=self.name,
 		recipe={
 			{"industrialtest:electronic_circuit",industrialtest.elementKeys.stoneSlab,"industrialtest:electronic_circuit"},
 			{industrialtest.elementKeys.rubber,self._basePowerStorage,industrialtest.elementKeys.rubber}
 		}
 	})
 end
 function industrialtest.Chargepad.chargePlayer(meta,player,flow)
 	local inv
 	if industrialtest.mtgAvailable then
 		_,inv=armor:get_valid_player(player,"")
@@ -68,31 +128,7 @@ local function chargePlayer(meta,player,flow)
 	return true
 end
-chargepad.getFormspec=function(pos)
+function industrialtest.Chargepad.action(self,pos,node)
 	local meta=minetest.get_meta(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local formspec={
 		"list[context;charged;1,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(1,2.5,1,1),
 		"label[0.9,3.9;"..S("Charge").."]",
 		"list[context;discharged;3,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(3,2.5,1,1),
 		"label[2.7,3.9;"..S("Discharge").."]",
 		"box[9,1;0.3,4.8;#202020]",
 		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
 		"listring[context;charged]",
 		"listring[context;discharged]"
 	}
 	return table.concat(formspec,"")
 end
 chargepad.onConstruct=function(pos,meta,inv)
 	inv:set_size("charged",1)
 	inv:set_size("discharged",1)
 	meta:set_int("active",0)
 end
 chargepad.action=function(pos,node)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local chargedSlot=inv:get_stack("charged",1)
@@ -116,138 +152,149 @@ chargepad.action=function(pos,node)
 	for _,player in ipairs(players) do
 		if vector.in_area(player:get_pos(),p1,p2) then
 			playerFound=true
-			shouldUpdateFormspec=shouldUpdateFormspec or chargePlayer(meta,player,flow)
+			shouldUpdateFormspec=shouldUpdateFormspec or self.chargePlayer(meta,player,flow)
 			break
 		end
 	end
 	local active=meta:get_int("active")==1
 	if playerFound and not active then
-		minetest.swap_node(pos,{
+		self:activate(pos)
 			name=node.name.."_active",
 			param2=node.param2
 		})
 		meta:set_int("active",1)
 	elseif (not playerFound or meta:get_int("industrialtest.powerAmount")==0) and active then
-		local def=minetest.registered_nodes[node.name]
+		self:deactivate(pos)
 		minetest.swap_node(pos,{
 			name=def._industrialtest_baseNodeName,
 			param2=node.param2
 		})
 		meta:set_int("active",0)
 	end
 	if shouldUpdateFormspec then
-		local def=minetest.registered_nodes[node.name]
+		self:updateFormspec(pos)
 		def._industrialtest_updateFormspec(pos)
 	end
 end
-local function registerChargepad(config)
+industrialtest.BatboxChargepad=table.copy(industrialtest.Chargepad)
-	industrialtest.internal.registerMachine({
+industrialtest.internal.unpackTableInto(industrialtest.BatboxChargepad,{
-		name=config.name,
+	name="industrialtest:batbox_chargepad",
-		displayName=config.displayName,
+	description=S("BatBox Chargepad"),
-		capacity=config.capacity,
+	tiles={
-		flow=config.flow,
+		"industrialtest_wood_machine_block.png^industrialtest_chargepad_top.png",
-		ioConfig="iiiioi",
+		"industrialtest_wood_machine_block.png",
-		sounds=config.sounds,
+		"industrialtest_wood_machine_block.png",
-		powerSlots={"charged","discharged"},
+		"industrialtest_wood_machine_block.png",
-		storageSlots={"charged","discharged"},
+		"industrialtest_wood_machine_block.png",
-		requiresWrench=config.requiresWrench,
+		"industrialtest_wood_machine_block.png^industrialtest_batbox_front.png"
-		registerActiveVariant=true,
+	},
-		groups={
+	sounds="wood",
-			_industrialtest_hasPowerOutput=1,
+	active={
-			_industrialtest_hasPowerInput=1
+		tiles={
-		},
+			"industrialtest_wood_machine_block.png^industrialtest_chargepad_top_active.png",
-		customKeys={
+			"industrialtest_wood_machine_block.png",
-			tiles={
+			"industrialtest_wood_machine_block.png",
-				config.machineBlockTexture.."^industrialtest_chargepad_top.png",
+			"industrialtest_wood_machine_block.png",
-				config.machineBlockTexture,
+			"industrialtest_wood_machine_block.png",
-				config.machineBlockTexture,
+			"industrialtest_wood_machine_block.png^industrialtest_batbox_front.png"
 				config.machineBlockTexture,
 				config.machineBlockTexture,
 				config.machineBlockTexture.."^"..config.frontTexture
 			},
 			paramtype2="facedir",
 			legacy_facedir_simple=true
 		},
 		activeCustomKeys={
 			tiles={
 				config.machineBlockTexture.."^industrialtest_chargepad_top_active.png",
 				config.machineBlockTexture,
 				config.machineBlockTexture,
 				config.machineBlockTexture,
 				config.machineBlockTexture,
 				config.machineBlockTexture.."^"..config.frontTexture
 			},
 			_industrialtest_baseNodeName="industrialtest:"..config.name
 		},
 		getFormspec=chargepad.getFormspec,
 		onConstruct=chargepad.onConstruct
 	})
 	minetest.register_craft({
 		type="shaped",
 		output="industrialtest:"..config.name,
 		recipe={
 			{"industrialtest:electronic_circuit",industrialtest.elementKeys.stoneSlab,"industrialtest:electronic_circuit"},
 			{industrialtest.elementKeys.rubber,"industrialtest:"..config.basePowerStorage,industrialtest.elementKeys.rubber}
 		}
-	})
+	},
 	table.insert(industrialtest.internal.chargepads,"industrialtest:"..config.name)
 	table.insert(industrialtest.internal.chargepads,"industrialtest:"..config.name.."_active")
 end
 registerChargepad({
 	name="batbox_chargepad",
 	displayName=S("BatBox Chargepad"),
 	capacity=25000,
 	flow=industrialtest.api.lvPowerFlow,
-	sounds="wood",
+	_basePowerStorage="industrialtest:batbox"
 	machineBlockTexture="industrialtest_wood_machine_block.png",
 	frontTexture="industrialtest_batbox_front.png",
 	requiresWrench=false,
 	basePowerStorage="batbox"
 })
 industrialtest.BatboxChargepad:register()
-registerChargepad({
+industrialtest.CESUChargepad=table.copy(industrialtest.Chargepad)
-	name="cesu_chargepad",
+industrialtest.internal.unpackTableInto(industrialtest.CESUChargepad,{
-	displayName=S("CESU Chargepad"),
+	name="industrialtest:cesu_chargepad",
 	description=S("CESU Chargepad"),
 	tiles={
 		"industrialtest_bronze_machine_block.png^industrialtest_chargepad_top.png",
 		"industrialtest_bronze_machine_block.png",
 		"industrialtest_bronze_machine_block.png",
 		"industrialtest_bronze_machine_block.png",
 		"industrialtest_bronze_machine_block.png",
 		"industrialtest_bronze_machine_block.png^industrialtest_cesu_front.png"
 	},
 	sounds="metal",
 	active={
 		tiles={
 			"industrialtest_bronze_machine_block.png^industrialtest_chargepad_top_active.png",
 			"industrialtest_bronze_machine_block.png",
 			"industrialtest_bronze_machine_block.png",
 			"industrialtest_bronze_machine_block.png",
 			"industrialtest_bronze_machine_block.png",
 			"industrialtest_bronze_machine_block.png^industrialtest_cesu_front.png"
 		}
 	},
 	capacity=400000,
 	flow=industrialtest.api.mvPowerFlow,
-	sounds="metal",
+	_basePowerStorage="industrialtest:cesu"
 	machineBlockTexture="industrialtest_bronze_machine_block.png",
 	frontTexture="industrialtest_cesu_front.png",
 	requiresWrench=false,
 	basePowerStorage="cesu"
 })
 industrialtest.CESUChargepad:register()
-registerChargepad({
+industrialtest.MFEChargepad=table.copy(industrialtest.Chargepad)
-	name="mfe_chargepad",
+industrialtest.internal.unpackTableInto(industrialtest.MFEChargepad,{
-	displayName=S("MFE Chargepad"),
+	name="industrialtest:mfe_chargepad",
 	description=S("MFE Chargepad"),
 	tiles={
 		"industrialtest_machine_block.png^industrialtest_chargepad_top.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_mfe_front.png"
 	},
 	sounds="metal",
 	requiresWrench=true,
 	active={
 		tiles={
 			"industrialtest_machine_block.png^industrialtest_chargepad_top_active.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_mfe_front.png"
 		}
 	},
 	capacity=3000000,
 	flow=industrialtest.api.hvPowerFlow,
-	sounds="metal",
+	_basePowerStorage="industrialtest:mfe"
 	machineBlockTexture="industrialtest_machine_block.png",
 	frontTexture="industrialtest_mfe_front.png",
 	requiresWrench=true,
 	basePowerStorage="mfe"
 })
 industrialtest.MFEChargepad:register()
-registerChargepad({
+industrialtest.MFSUChargepad=table.copy(industrialtest.Chargepad)
-	name="mfsu_chargepad",
+industrialtest.internal.unpackTableInto(industrialtest.MFSUChargepad,{
-	displayName=S("MFSU Chargepad"),
+	name="industrialtest:mfsu_chargepad",
 	description=S("MFSU Chargepad"),
 	tiles={
 		"industrialtest_advanced_machine_block.png^industrialtest_chargepad_top.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_mfsu_front.png"
 	},
 	sounds="metal",
 	requiresWrench=true,
 	active={
 		tiles={
 			"industrialtest_advanced_machine_block.png^industrialtest_chargepad_top_active.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_mfsu_front.png"
 		}
 	},
 	capacity=30000000,
 	flow=industrialtest.api.evPowerFlow,
-	sounds="metal",
+	_basePowerStorage="industrialtest:mfsu"
 	machineBlockTexture="industrialtest_advanced_machine_block.png",
 	frontTexture="industrialtest_mfsu_front.png",
 	requiresWrench=true,
 	basePowerStorage="mfsu"
 })
 industrialtest.MFSUChargepad:register()
 minetest.register_abm({
 	label="Chargepad updating",
 	nodenames=industrialtest.internal.chargepads,
 	interval=industrialtest.updateDelay,
 	chance=1,
-	action=chargepad.action
+	action=function(pos,node)
 		local def=minetest.registered_nodes[node.name]
 		def._industrialtest_self:action(pos,node)
 	end
 })
--- a/machines/common.lua
+++ b/machines/common.lua
@@ -15,9 +15,6 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local machine={}
 local simpleElectricItemProcessor={}
 industrialtest.internal.simpleElectricItemProcessors={}
 industrialtest.internal.mclAfterDigNode=function(pos,oldmeta,lists)
 	-- Taken from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_furnaces/init.lua#L538
@@ -35,20 +32,6 @@ industrialtest.internal.mclAfterDigNode=function(pos,oldmeta,lists)
 	meta:from_table(meta2:to_table())
 end
 industrialtest.internal.allowMoveToUpgradeSlot=function(pos,toIndex,stack)
 	local def=minetest.registered_items[stack:get_name()]
 	if not def or not def.groups or not def.groups._industrialtest_machineUpgrade then
 		return 0
 	end
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local targetSlot=inv:get_stack("upgrades",toIndex)
 	if not targetSlot:is_empty() then
 		return 0
 	end
 	return stack:get_count()
 end
 industrialtest.internal.chargeFromPowerStorageItem=function(meta,inv)
 	local shouldRerunTimer=false
 	local shouldUpdateFormspec=false
@@ -65,228 +48,6 @@ industrialtest.internal.chargeFromPowerStorageItem=function(meta,inv)
 	return shouldRerunTimer,shouldUpdateFormspec
 end
 machine.getFormspec=function(pos,config)
 	local formspec
 	if industrialtest.mtgAvailable then
 		formspec={
 			"formspec_version[4]",
 			"size[10.8,12]",
 			"label[0.5,0.5;"..config.displayName.."]",
 			"list[current_player;main;0.5,6.25;8,1]",
 			"list[current_player;main;0.5,7.5;8,3;8]",
 			"listring[current_player;main]",
 			(config.getFormspec and config.getFormspec(pos) or "")
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
 			"size[10.04,12]",
 			"label[0.25,0.25;"..config.displayName.."]",
 			"list[current_player;main;0.5,7;9,3;9]",
 			mcl_formspec.get_itemslot_bg(0.5,7,9,3),
 			"list[current_player;main;0.5,10.24;9,1]",
 			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
 			"listring[current_player;main]",
 			(config.getFormspec and config.getFormspec(pos) or "")
 		}
 	end
 	return table.concat(formspec,"")
 end
 machine.onConstruct=function(pos,config)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	industrialtest.api.addPowerStorage(meta,config.capacity,config.flow,config.ioConfig)
 	if config.groups then
 		if config.groups._industrialtest_hasPowerInput then
 			local connections=industrialtest.api.getConnections(pos)
 			for _,conn in ipairs(connections) do
 				local connectionMeta=minetest.get_meta(conn)
 				if industrialtest.api.isNetworkMaster(connectionMeta) then
 					industrialtest.api.createNetworkMapForNode(conn)
 					minetest.get_node_timer(conn):start(industrialtest.updateDelay)
 				else
 					local def=minetest.registered_nodes[minetest.get_node(conn).name]
 					if def.groups._industrialtest_cable then
 						local networks=industrialtest.api.isAttachedToNetwork(connectionMeta)
 						if networks then
 							for _,network in ipairs(networks) do
 								industrialtest.api.createNetworkMapForNode(network)
 								minetest.get_node_timer(network):start(industrialtest.updateDelay)
 							end
 						end
 					end
 				end
 			end
 		end
 		if config.groups._industrialtest_hasPowerOutput then
 			meta:set_string("industrialtest.network",minetest.serialize(industrialtest.api.createNetworkMap(pos)))
 		end
 	end
 	if config.onConstruct then
 		config.onConstruct(pos,meta,inv)
 	end
 	if not config.withoutFormspec then
 		meta:set_string("formspec",machine.getFormspec(pos,config))
 	end
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 machine.onDestruct=function(pos,config)
 	local meta=minetest.get_meta(pos)
 	if industrialtest.api.isNetworkMaster(meta) then
 		local network=industrialtest.api.createNetworkMap(pos,true)
 		for _,endpoint in ipairs(network) do
 			local endpointMeta=minetest.get_meta(endpoint.position)
 			local networks=industrialtest.api.isAttachedToNetwork(endpointMeta)
 			for key,value in ipairs(networks) do
 				if value.x==pos.x and value.y==pos.y and value.z==pos.z then
 					table.remove(networks,key)
 					break
 				end
 			end
 			endpointMeta:set_string("industrialtest.networks",minetest.serialize(networks))
 		end
 	end
 	local networks=industrialtest.api.isAttachedToNetwork(meta)
 	if networks then
 		for _,network in ipairs(networks) do
 			industrialtest.api.removeNodeFromNetwork(network,pos)
 		end
 	end
 	if config.onDestruct then
 		config.onDestruct(pos)
 	end
 end
 machine.onTimer=function(pos,elapsed,config)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local shouldRerunTimer=false
 	local shouldUpdateFormspec=false
 	if config.onTimer then
 		shouldRerunTimer,shouldUpdateFormspec=config.onTimer(pos,elapsed,meta,inv)
 	end
 	local def=minetest.registered_nodes[minetest.get_node(pos).name]
 	if def.groups and def.groups._industrialtest_hasPowerInput and not industrialtest.api.isFullyCharged(meta) then
 		local networks=industrialtest.api.isAttachedToNetwork(meta)
 		if networks then
 			for _,network in ipairs(networks) do
 				minetest.get_node_timer(network):start(industrialtest.updateDelay)
 			end
 		end
 	end
 	if shouldUpdateFormspec then
 		machine.updateFormspec(pos,config)
 	end
 	return shouldRerunTimer
 end
 machine.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count,config)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local movedItemStack=inv:get_stack(fromList,1)
 	if toList=="upgrades" then
 		return industrialtest.internal.allowMoveToUpgradeSlot(pos,toIndex,movedItemStack)
 	end
 	local found=false
 	if config.powerSlots then
 		for _,value in ipairs(config.powerSlots) do
 			if value==toList then
 				found=true
 				break
 			end
 		end
 	end
 	if found and not industrialtest.api.hasPowerStorage(movedItemStack:get_meta()) then
 		return 0
 	end
 	if config.allowMetadataInventoryMove then
 		return config.allowMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex,count)
 	end
 	return count
 end
 machine.allowMetadataInventoryPut=function(pos,listname,index,stack,player,config)
 	if listname=="upgrades" then
 		return industrialtest.internal.allowMoveToUpgradeSlot(pos,index,stack)
 	end
 	local found=false
 	if config.powerSlots then
 		for _,value in ipairs(config.powerSlots) do
 			if value==listname then
 				found=true
 				break
 			end
 		end
 	end
 	if found and not industrialtest.api.hasPowerStorage(stack:get_meta()) then
 		return 0
 	end
 	if config.allowMetadataInventoryPut then
 		return config.allowMetadataInventoryPut(pos,listname,index,stack,player)
 	end
 	return stack:get_count()
 end
 machine.allowMetadataInventoryTake=function(pos,listname,index,stack,player,config)
 	if config.allowMetadataInventoryTake then
 		return config.allowMetadataInventoryTake(pos,listname,index,stack,player)
 	end
 	return stack:get_count()
 end
 machine.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
 	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)
 	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)
 	end
 end
 machine.onMetadataInventoryPut=function(pos,listname,index,stack)
 	if listname=="upgrades" then
 		local meta=minetest.get_meta(pos)
 		industrialtest.internal.applyUpgrade(pos,meta,stack)
 	end
 end
 machine.onMetadataInventoryTake=function(pos,listname,index,stack)
 	if listname=="upgrades" then
 		local meta=minetest.get_meta(pos)
 		industrialtest.internal.removeUpgrade(pos,meta,stack)
 	end
 end
 machine.updateFormspec=function(pos,config)
 	if config.withoutFormspec then
 		return
 	end
 	local meta=minetest.get_meta(pos)
 	meta:set_string("formspec",machine.getFormspec(pos,config))
 end
 function industrialtest.internal.registerMachine(config)
 	local definition={
 		description=config.displayName,
@@ -337,52 +98,6 @@ function industrialtest.internal.registerMachine(config)
 			return machine.getFormspec(pos,config)
 		end
 	}
 	if industrialtest.mtgAvailable then
 		definition.groups={cracky=2}
 		if config.sounds=="metal" then
 			definition.sounds=default.node_sound_metal_defaults()
 		end
 		definition.can_dig=function(pos)
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			for _,value in ipairs(config.storageSlots) do
 				if inv:get_stack(value,1):get_count()>0 then
 					return false
 				end
 			end
 			return true
 		end
 	elseif industrialtest.mclAvailable then
 		definition.after_dig_node=function(pos,oldnode,oldmeta)
 			industrialtest.internal.mclAfterDigNode(pos,oldmeta,config.storageSlots)
 		end
 		if config.sounds=="metal" then
 			definition.sounds=mcl_sounds.node_sound_metal_defaults()
 		end
 		definition.groups={
 			pickaxey=1,
 			container=2
 		}
 		definition._mcl_blast_resistance=3.5
 		definition._mcl_hardness=3.9
 		definition._mcl_hoppers_on_try_pull=function(pos, hop_pos, hop_inv, hop_list)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
 			local stack = inv:get_stack("dst", 1)
 			if not stack:is_empty() and hop_inv:room_for_item(hop_list, stack) then
 				return inv, "dst", 1
 			end
 			return nil, nil, nil
 		end
 		definition._mcl_hoppers_on_try_push=function(pos, hop_pos, hop_inv, hop_list)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
 			return inv, "src", mcl_util.select_stack(hop_inv, hop_list, inv, "src")
 		end
 		definition._mcl_hoppers_on_after_push=function(pos)
 			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		end
 	end
 	definition.groups._industrialtest_wrenchUnmountable=1
 	if config.requiresWrench then
 		definition.drop="industrialtest:machine_block"
@@ -441,347 +156,5 @@ function industrialtest.internal.registerMachine(config)
 		end
 		minetest.register_node("industrialtest:"..config.name.."_active",definition)
 	end
-end
+	industrialtest.api.addTag("industrialtest:"..config.name,"usesTimer")
 local function craftResultProxy(method,item)
 	if method=="cooking" then
 		local output,after=minetest.get_craft_result({
 			method=method,
 			width=1,
 			items={item}
 		})
 		return {
 			item=output.item,
 			time=output.time,
 			src=after.items[1]
 		}
 	elseif method=="industrialtest.macerating" then
 		local output=industrialtest.api.getMaceratorRecipeResult(item:get_name())
 		if not output then
 			return {
 				item=ItemStack(),
 				time=0,
 				src=item
 			}
 		end
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-1)
 		return {
 			item=ItemStack(output.output),
 			time=output.time,
 			src=srcAfter
 		}
 	elseif method=="industrialtest.compressing" then
 		local output=industrialtest.api.getCompressorRecipeResult(item:get_name())
 		if not output or item:get_count()<output.count then
 			return {
 				item=ItemStack(),
 				time=0,
 				src=item
 			}
 		end
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-output.count)
 		return {
 			item=ItemStack(output.output),
 			time=output.time,
 			src=srcAfter
 		}
 	elseif method=="industrialtest.extracting" then
 		local output=industrialtest.api.getExtractorRecipeResult(item:get_name())
 		if not output then
 			return {
 				item=ItemStack(),
 				time=0,
 				src=item
 			}
 		end
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-1)
 		return {
 			item=ItemStack(output.output),
 			time=output.time,
 			src=srcAfter
 		}
 	elseif method=="industrialtest.recycling" then
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-1)
 		return {
 			item=ItemStack(industrialtest.random:next(1,8)==1 and "industrialtest:scrap" or ""),
 			time=2,
 			src=srcAfter
 		}
 	elseif method=="industrialtest.cable_forming" then
 		local output=industrialtest.api.getCableFormerRecipeResult(item:get_name())
 		if not output then
 			return {
 				item=ItemStack(),
 				time=0,
 				src=item
 			}
 		end
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-1)
 		return {
 			item=ItemStack(output.output),
 			time=output.time,
 			src=srcAfter
 		}
 	elseif method=="industrialtest.mass_fabricating" then
 		if item:get_count()<34 then
 			return {
 				item=ItemStack(),
 				time=0,
 				src=item
 			}
 		end
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-34)
 		return {
 			item=ItemStack("industrialtest:uu_matter"),
 			time=15,
 			src=srcAfter
 		}
 	end
 	error("Unknown craft method passed to craftResultProxy")
 end
 simpleElectricItemProcessor.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local srcPercent=meta:get_float("srcTime")/meta:get_float("maxSrcTime")*100
 	local formspec={
 		"list[context;src;3.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
 		(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;powerStorage;3.4,3.9;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
 		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 		"list[context;dst;6.4,2.8;1,1]",
 		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
 		"list[context;upgrades;9,0.9;1,4]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
 		"listring[context;src]",
 		"listring[context;dst]"
 	}
 	return table.concat(formspec,"")
 end
 simpleElectricItemProcessor.onPowerFlow=function(pos)
 	-- FIXME: this probably will require refactor so node timer won't be started
 	-- just to test if machine can process item
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 simpleElectricItemProcessor.onConstruct=function(pos,meta,inv)
 	inv:set_size("src",1)
 	inv:set_size("dst",1)
 	inv:set_size("powerStorage",1)
 	inv:set_size("upgrades",4)
 	meta:set_float("srcTime",-1)
 	meta:set_float("maxSrcTime",0)
 end
 simpleElectricItemProcessor.onTimer=function(pos,elapsed,meta,inv,config)
 	local srcSlot=inv:get_stack("src",1)
 	local powerStorageSlot=inv:get_stack("powerStorage",1)
 	local shouldUpdateFormspec=false
 	local shouldRerunTimer=false
 	local requiredPower=elapsed*config.opPower*industrialtest.api.getMachineSpeed(meta)
 	shouldRerunTimer,shouldUpdateFormspec=industrialtest.internal.chargeFromPowerStorageItem(meta,inv)
 	if srcSlot:get_count()>0 and meta:get_int("industrialtest.powerAmount")>=requiredPower then
 		local output=craftResultProxy(config.method,srcSlot)
 		if output.time>0 and inv:room_for_item("dst",output.item) then
 			if meta:get_float("maxSrcTime")<=0 then
 				meta:set_float("srcTime",0)
 				meta:set_float("maxSrcTime",output.time*config.efficiency)
 			end
 			minetest.swap_node(pos,{
 				name="industrialtest:"..config.name.."_active",
 				param2=minetest.get_node(pos).param2
 			})
 			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		end
 	end
 	return shouldRerunTimer,shouldUpdateFormspec
 end
 simpleElectricItemProcessor.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList,count)
 	if toList=="dst" then
 		return 0
 	elseif toList=="upgrades" then
 		-- TODO: Add support for upgrades when they will be added
 		return 0
 	end
 	return count
 end
 simpleElectricItemProcessor.allowMetadataInventoryPut=function(pos,listname,index,stack)
 	if listname=="dst" then
 		return 0
 	elseif listname=="src" then
 		local meta=minetest.get_meta(pos)
 		local inv=meta:get_inventory()
 		local srcSlot=inv:get_stack("src",1)
 		if srcSlot:get_name()~=stack:get_name() then
 			meta:set_float("srcTime",-1)
 			meta:set_float("maxSrcTime",0)
 		end
 	elseif listname=="upgrades" then
 		--TODO: See allow_metadata_inventory_move
 		return 0
 	end
 	return stack:get_count()
 end
 simpleElectricItemProcessor.onMetadataInventoryPut=function(pos)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 simpleElectricItemProcessor.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if fromList=="src" and count==srcSlot:get_count() then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		if meta:get_int("industrialtest.powerAmount")>0 then
 			meta:set_string("formspec",simpleElectricItemProcessor.getFormspec(pos))
 		end
 	elseif fromList=="dst" and dstSlot:get_free_space()>0 then
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 end
 simpleElectricItemProcessor.onMetadataInventoryTake=function(pos,listname,index,stack)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if listname=="src" and stack:get_count()==srcSlot:get_count() then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		if meta:get_int("industrialtest.powerAmount")>0 then
 			meta:set_string("formspec",simpleElectricItemProcessor.getFormspec(pos))
 		end
 	elseif listname=="dst" and dstSlot:get_free_space()>0 then
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 end
 simpleElectricItemProcessor.activeOnTimer=function(pos,elapsed,meta,inv,config)
 	local srcSlot=inv:get_stack("src",1)
 	local powerStorageSlot=inv:get_stack("powerStorage",1)
 	local shouldUpdateFormspec=false
 	local shouldRerunTimer=false
 	local requiredPower=elapsed*config.opPower*industrialtest.api.getMachineSpeed(meta)
 	shouldRerunTimer,shouldUpdateFormspec=industrialtest.internal.chargeFromPowerStorageItem(meta,inv)
 	if srcSlot:get_count()>0 and meta:get_float("maxSrcTime")<=0 and meta:get_int("industrialtest.powerAmount")>=requiredPower then
 		local output=craftResultProxy(config.method,srcSlot)
 		if output.time>0 and inv:room_for_item("dst",output.item) then
 			meta:set_float("srcTime",0)
 			meta:set_float("maxSrcTime",output.time*config.efficiency)
 		end
 	end
 	if srcSlot:get_count()==0 and meta:get_float("maxSrcTime")>0 then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		shouldUpdateFormspec=true
 	end
 	if meta:get_float("maxSrcTime")>0 then
 		if meta:get_int("industrialtest.powerAmount")>=requiredPower then
 			meta:set_int("industrialtest.powerAmount",meta:get_int("industrialtest.powerAmount")-requiredPower)
 			meta:set_float("srcTime",meta:get_float("srcTime")+elapsed)
 			shouldRerunTimer=true
 		end
 		shouldUpdateFormspec=true
 	end
 	if meta:get_float("maxSrcTime")<=0 or meta:get_int("industrialtest.powerAmount")<requiredPower then
 		minetest.swap_node(pos,{
 			name="industrialtest:"..config.name,
 			param2=minetest.get_node(pos).param2
 		})
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 	if meta:get_float("srcTime")>=meta:get_float("maxSrcTime") then
 		local output=craftResultProxy(config.method,srcSlot)
 		local speed=industrialtest.api.getMachineSpeed(meta)
 		local usedItems=srcSlot:get_count()-output.src:get_count()
 		local multiplier=1
 		if srcSlot:get_count()>=speed*usedItems then
 			multiplier=speed
 		end
 		if output.item:get_count()>0 then
 			output.item:set_count(output.item:get_count()*multiplier)
 			inv:add_item("dst",output.item)
 			meta:set_float("srcTime",-1)
 			meta:set_float("maxSrcTime",0)
 		end
 		srcSlot:set_count(srcSlot:get_count()-multiplier*usedItems)
 		inv:set_stack("src",1,srcSlot)
 	end
 	return shouldRerunTimer,shouldUpdateFormspec
 end
 function industrialtest.internal.registerSimpleElectricItemProcessor(config)
 	local machineBlockTexture=config.machineBlockTexture or "industrialtest_machine_block.png"
 	industrialtest.internal.registerMachine({
 		name=config.name,
 		displayName=config.displayName,
 		capacity=config.capacity,
 		getFormspec=simpleElectricItemProcessor.getFormspec,
 		flow=config.flow,
 		ioConfig="iiiiii",
 		requiresWrench=config.requiresWrench,
 		registerActiveVariant=true,
 		sounds="metal",
 		powerSlots={"powerStorage"},
 		storageSlots={"src","dst","powerStorage","upgrades"},
 		groups={
 			_industrialtest_hasPowerInput=1
 		},
 		customKeys={
 			tiles={
 				machineBlockTexture..(config.customTopTexture and "^industrialtest_"..config.name.."_top.png" or ""),
 				machineBlockTexture..(config.customBottomTexture and "^industrialtest_"..config.name.."_bottom.png" or ""),
 				machineBlockTexture..(config.customRightTexture and "^industrialtest_"..config.name.."_right.png" or ""),
 				machineBlockTexture..(config.customLeftTexture and "^industrialtest_"..config.name.."_left.png" or ""),
 				machineBlockTexture..(config.customBackTexture and "^industrialtest_"..config.name.."_back.png" or ""),
 				machineBlockTexture..(config.customFrontTexture and "^industrialtest_"..config.name.."_front.png" or "")
 			},
 			paramtype2="facedir",
 			legacy_facedir_simple=true,
 			_industrialtest_onPowerFlow=simpleElectricItemProcessor.onPowerFlow
 		},
 		activeCustomKeys={
 			tiles={
 				machineBlockTexture..(config.customTopTexture and "^industrialtest_"..config.name.."_top_active.png" or ""),
 				machineBlockTexture..(config.customBottomTexture and "^industrialtest_"..config.name.."_bottom_active.png" or ""),
 				machineBlockTexture..(config.customRightTexture and "^industrialtest_"..config.name.."_right_active.png" or ""),
 				machineBlockTexture..(config.customLeftTexture and "^industrialtest_"..config.name.."_left_active.png" or ""),
 				machineBlockTexture..(config.customBackTexture and "^industrialtest_"..config.name.."_back_active.png" or ""),
 				machineBlockTexture..(config.customFrontTexture and "^industrialtest_"..config.name.."_front_active.png" or "")
 			}
 		},
 		onConstruct=simpleElectricItemProcessor.onConstruct,
 		onTimer=function(pos,elapsed,meta,inv)
 			return simpleElectricItemProcessor.onTimer(pos,elapsed,meta,inv,config)
 		end,
 		allowMetadataInventoryMove=simpleElectricItemProcessor.allowMetadataInventoryMove,
 		allowMetadataInventoryPut=simpleElectricItemProcessor.allowMetadataInventoryPut,
 		onMetadataInventoryPut=simpleElectricItemProcessor.onMetadataInventoryPut,
 		onMetadataInventoryMove=simpleElectricItemProcessor.onMetadataInventoryMove,
 		onMetadataInventoryTake=simpleElectricItemProcessor.onMetadataInventoryTake,
 		activeOnTimer=function(pos,elapsed,meta,inv)
 			return simpleElectricItemProcessor.activeOnTimer(pos,elapsed,meta,inv,config)
 		end
 	})
 	table.insert(industrialtest.internal.simpleElectricItemProcessors,"industrialtest:"..config.name)
 end
--- a/machines/compressor.lua
+++ b/machines/compressor.lua
@@ -15,18 +15,55 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.Compressor=table.copy(industrialtest.SimpleElectricItemProcessor)
-industrialtest.internal.registerSimpleElectricItemProcessor({
+industrialtest.internal.unpackTableInto(industrialtest.Compressor,{
-	name="compressor",
+	name="industrialtest:compressor",
-	displayName=S("Compressor"),
+	description=S("Compressor"),
-	customFrontTexture=true,
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_compressor_front.png"
 	},
 	requiresWrench=true,
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_compressor_front_active.png"
 		}
 	},
 	capacity=1400,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=120,
 	method="industrialtest.compressing",
 	efficiency=1
 })
 function industrialtest.Compressor.getCraftResult(self,itemstack)
 	local output=industrialtest.api.getCompressorRecipeResult(itemstack:get_name())
 	if not output or itemstack:get_count()<output.count then
 		return {
 			item=ItemStack(),
 			time=0,
 			src=itemstack
 		}
 	end
 	local srcAfter=ItemStack(itemstack:get_name())
 	srcAfter:set_count(itemstack:get_count()-output.count)
 	return {
 		item=ItemStack(output.output),
 		time=output.time,
 		src=srcAfter
 	}
 end
 industrialtest.Compressor:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:compressor",
--- a/machines/electric_furnace.lua
+++ b/machines/electric_furnace.lua
@@ -15,17 +15,49 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.ElectricFurnace=table.copy(industrialtest.SimpleElectricItemProcessor)
-industrialtest.internal.registerSimpleElectricItemProcessor({
+industrialtest.internal.unpackTableInto(industrialtest.ElectricFurnace,{
-	name="electric_furnace",
+	name="industrialtest:electric_furnace",
-	displayName=S("Electric Furnace"),
+	description=S("Electric Furnace"),
-	customFrontTexture=true,
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_electric_furnace_front.png"
 	},
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_electric_furnace_front_active.png"
 		}
 	},
 	capacity=416,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=60,
 	method="cooking",
 	efficiency=0.5
 })
 function industrialtest.ElectricFurnace.getCraftResult(self,itemstack)
 	local output,after=minetest.get_craft_result({
 		method="cooking",
 		width=1,
 		items={itemstack}
 	})
 	return {
 		item=output.item,
 		time=output.time,
 		src=after.items[1]
 	}
 end
 industrialtest.ElectricFurnace:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:electric_furnace",
--- a/machines/electric_machine.lua
+++ b/machines/electric_machine.lua
@@ -0,0 +1,228 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 industrialtest.ElectricMachine=table.copy(industrialtest.Machine)
 function industrialtest.ElectricMachine.onConstruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	industrialtest.api.addPowerStorage(meta,self.capacity,self.flow,self.ioConfig)
 	if self.hasPowerInput then
 		local connections=industrialtest.api.getConnections(pos)
 		for _,conn in ipairs(connections) do
 			local connectionMeta=minetest.get_meta(conn)
 			if industrialtest.api.isNetworkMaster(connectionMeta) then
 				industrialtest.api.createNetworkMapForNode(conn)
 				local def=minetest.get_node(conn)
 				if def and def._industrialtest_self then
 					def._industrialtest_self:requestPower(conn)
 				else
 					-- Support for bare definitions that don't use industrialtest pseudo-OOP
 					minetest.get_node_timer(conn):start(industrialtest.updateDelay)
 				end
 			else
 				local def=minetest.registered_nodes[minetest.get_node(conn).name]
 				if def.groups._industrialtest_cable then
 					local networks=industrialtest.api.isAttachedToNetwork(connectionMeta)
 					if networks then
 						for _,network in ipairs(networks) do
 							industrialtest.api.createNetworkMapForNode(network)
 							local def=minetest.get_node(network)
 							if def and def._industrialtest_self then
 								def._industrialtest_self:requestPower(network)
 							else
 								-- Support for bare definitions that don't use industrialtest pseudo-OOP
 								minetest.get_node_timer(conn):start(industrialtest.updateDelay)
 							end
 						end
 					end
 				end
 			end
 		end
 	end
 	if self.hasPowerOutput then
 		meta:set_string("industrialtest.network",minetest.serialize(industrialtest.api.createNetworkMap(pos)))
 	end
 	industrialtest.Machine.onConstruct(self,pos)
 end
 function industrialtest.ElectricMachine.onDestruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	if industrialtest.api.isNetworkMaster(meta) then
 		local network=industrialtest.api.createNetworkMap(pos,true)
 		for _,endpoint in ipairs(network) do
 			local endpointMeta=minetest.get_meta(endpoint.position)
 			local networks=industrialtest.api.isAttachedToNetwork(endpointMeta)
 			for key,value in ipairs(networks) do
 				if value.x==pos.x and value.y==pos.y and value.z==pos.z then
 					table.remove(networks,key)
 					break
 				end
 			end
 			endpointMeta:set_string("industrialtest.networks",minetest.serialize(networks))
 		end
 	end
 	local networks=industrialtest.api.isAttachedToNetwork(meta)
 	if networks then
 		for _,network in ipairs(networks) do
 			industrialtest.api.removeNodeFromNetwork(network,pos)
 		end
 	end
 	-- don't call onDestruct from parent class because it doesn't do anything
 end
 function industrialtest.ElectricMachine.onTimer(self,pos,elapsed)
 	local result=industrialtest.Machine.onTimer(self,pos,elapsed)
 	local result2=self:powerExchange(pos)
 	return result or result2
 end
 function industrialtest.ElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	local found=false
 	if self.powerLists then
 		for _,value in ipairs(self.powerLists) do
 			if value==toList then
 				found=true
 				break
 			end
 		end
 	end
 	if found and not industrialtest.api.hasPowerStorage(movedItemStack:get_meta()) then
 		return 0
 	end
 	return industrialtest.Machine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 end
 function industrialtest.ElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
 	local found=false
 	if self.powerLists then
 		for _,value in ipairs(self.powerLists) do
 			if value==listname then
 				found=true
 				break
 			end
 		end
 	end
 	if found and not industrialtest.api.hasPowerStorage(stack:get_meta()) then
 		return 0
 	end
 	return industrialtest.Machine.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
 end
 function industrialtest.ElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	if toList=="charged" then
 		self:trigger(pos)
 	end
 	industrialtest.Machine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 end
 function industrialtest.ElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="charged" then
 		self:trigger(pos)
 	end
 	industrialtest.Machine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 function industrialtest.ElectricMachine.requestPower(self,pos)
 	if not self.hasPowerOutput then
 		return
 	end
 	local meta=minetest.get_meta(pos)
 	if meta:get_int("industrialtest.powerAmount")<=0 then
 		return
 	end
 	local _,flowTransferred=industrialtest.api.powerFlow(pos)
 	if flowTransferred then
 		self:updateFormspec(pos)
 	end
 	self:triggerIfNeeded(pos)
 end
 function industrialtest.ElectricMachine.powerExchange(self,pos)
 	local meta=minetest.get_meta(pos)
 	local shouldRerunTimer=false
 	if self.hasPowerInput and not industrialtest.api.isFullyCharged(meta) then
 		local networks=industrialtest.api.isAttachedToNetwork(meta)
 		if networks then
 			for _,network in ipairs(networks) do
 				local def=minetest.registered_nodes[minetest.get_node(network).name]
 				if def and def._industrialtest_self then
 					def._industrialtest_self:requestPower(network)
 				else
 					-- Support for bare definitions that don't use industrialtest pseudo-OOP
 					minetest.get_node_timer(network):start(industrialtest.updateDelay)
 				end
 			end
 		end
 		shouldRerunTimer=shouldRerunTimer or not industrialtest.api.isFullyCharged(meta)
 	end
 	if self.hasPowerOutput and meta:get_int("industrialtest.powerAmount")>0 then
 		local spaceAvailable,flowTransferred=industrialtest.api.powerFlow(pos)
 		if flowTransferred then
 			self:updateFormspec(pos)
 		end
 		shouldRerunTimer=shouldRerunTimer or spaceAvailable
 	end
 	if self.powerLists then
 		local inv=meta:get_inventory()
 		local powerFlow=meta:get_int("industrialtest.powerFlow")
 		for _,listDesc in ipairs(self.powerLists) do
 			local slot=inv:get_stack(listDesc.list,1)
 			if slot:get_count()>0 then
 				if listDesc.direction=="o" then
 					if meta:get_int("industrialtest.powerAmount")<=0 then
 						break
 					end
 					if not industrialtest.api.isFullyCharged(slot:get_meta()) then
 						industrialtest.api.transferPowerToItem(meta,slot,powerFlow)
 						inv:set_stack(listDesc.list,1,slot)
 						self:updateFormspec(pos)
 						shouldRerunTimer=shouldRerunTimer or (not industrialtest.api.isFullyCharged(slot:get_meta()) and meta:get_int("industrialtest.powerAmount")>0)
 					end
 				elseif listDesc.direction=="i" then
 					if industrialtest.api.isFullyCharged(meta) then
 						break
 					end
 					local slotMeta=slot:get_meta()
 					if slotMeta:get_int("industrialtest.powerAmount")>0 then
 						industrialtest.api.transferPowerFromItem(slot,meta,powerFlow)
 						inv:set_stack(listDesc.list,1,slot)
 						self:updateFormspec(pos)
 						shouldRerunTimer=shouldRerunTimer or (not industrialtest.api.isFullyCharged(meta) and slotMeta:get_int("industrialtest.powerAmount")>0)
 					end
 				end
 			end
 		end
 	end
 	return shouldRerunTimer
 end
 function industrialtest.ElectricMachine.createPowerIndicatorWidget(charged,x,y)
 	return table.concat({
 		string.format("box[%f,%f;0.3,4.8;#202020]",x,y),
 		(charged>0 and string.format("box[%f,%f;0.3,%f;#FF1010]",x,y+4.8-(charged*4.8),charged*4.8) or ""),
 	},"")
 end
--- a/machines/extractor.lua
+++ b/machines/extractor.lua
@@ -15,18 +15,55 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.Extractor=table.copy(industrialtest.SimpleElectricItemProcessor)
-industrialtest.internal.registerSimpleElectricItemProcessor({
+industrialtest.internal.unpackTableInto(industrialtest.Extractor,{
-	name="extractor",
+	name="industrialtest:extractor",
-	displayName=S("Extractor"),
+	description=S("Extractor"),
-	customFrontTexture=true,
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_extractor_front.png"
 	},
 	requiresWrench=true,
-	capacity=900,
+	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_extractor_front_active.png"
 		}
 	},
 	capacity=1000,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=100,
 	method="industrialtest.extracting",
 	efficiency=1
 })
 function industrialtest.Extractor.getCraftResult(self,itemstack)
 	local output=industrialtest.api.getExtractorRecipeResult(itemstack:get_name())
 	if not output then
 		return {
 			item=ItemStack(),
 			time=0,
 			src=itemstack
 		}
 	end
 	local srcAfter=ItemStack(itemstack:get_name())
 	srcAfter:set_count(itemstack:get_count()-1)
 	return {
 		item=ItemStack(output.output),
 		time=output.time,
 		src=srcAfter
 	}
 end
 industrialtest.Extractor:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:extractor",
--- a/machines/fluid_generator.lua
+++ b/machines/fluid_generator.lua
@@ -15,14 +15,25 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
 local fluidGenerator={}
-fluidGenerator.getFormspec=function(pos,config)
+-- Common functions
 local function onConstruct(pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	inv:set_size("charged",1)
 	inv:set_size("src",1)
 	inv:set_size("dst",1)
 	meta:set_float("fluidAmount",0)
 	meta:set_string("fluid","")
 end
 local function getFormspec(self,pos)
 	local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local fluidPercent=meta:get_float("fluidAmount")/100
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local fluid=meta:get_string("fluid")
-	local fuel=config.getFuel(fluid)
+	local fuel=self.getFuel(fluid)
 	local tile=(fuel and fuel.texture or "industrialtest_gui_fluid_bg.png")
 	local formspec={
 		"list[context;src;2,1.8;1,1]",
@@ -32,219 +43,305 @@ fluidGenerator.getFormspec=function(pos,config)
 		industrialtest.internal.getItemSlotBg(2,4.2,1,1),
 		"list[context;charged;6,3;1,1]",
 		industrialtest.internal.getItemSlotBg(6,3,1,1),
-		"box[9,1;0.3,4.8;#202020]",
+		self.createPowerIndicatorWidget(powerPercent,9,1),
 		(powerPercent>0 and "box[9,"..(1+4.8-(powerPercent*4.8))..";0.3,"..(powerPercent*4.8)..";#FF1010]" or ""),
 		"listring[context;src]",
 		"listring[context;dst]"
 	}
-	return table.concat(formspec,"")
+	return parentFormspec..table.concat(formspec,"")
 end
-fluidGenerator.onConstruct=function(pos,meta,inv)
+local function allowMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex,count)
-	inv:set_size("charged",1)
+	if toList=="dst" then
-	inv:set_size("src",1)
+		return 0
-	inv:set_size("dst",1)
+	end
-	meta:set_float("fluidAmount",0)
+	return count
 	meta:set_string("fluid","")
 end
-fluidGenerator.onTimer=function(pos,elapsed,meta,inv,config)
+local function allowMetadataInventoryPut(pos,listname,index,stack,player)
 	if listname=="dst" then
 		return 0
 	end
 	return stack:get_count()
 end
 local function takeFuelFromItem(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fluidSlot=inv:get_stack("src",1)
-	local chargedSlot=inv:get_stack("charged",1)
+	local fluid=meta:get_string("fluid")
-	local afterFlow,flowTransferred=industrialtest.api.powerFlow(pos)
+	local fluidAmount=meta:get_float("fluidAmount")
-	local shouldUpdateFormspec=false
+
-	local shouldRerunTimer=(afterFlow and meta:get_int("industrialtest.powerAmount")>0)
+	if fluidSlot:is_empty() or fluidAmount>9000 then
-	if fluidSlot:get_count()>0 and meta:get_float("fluidAmount")<=9000 then
+		return false
-		local fuel=config.getFuelByItem(fluidSlot:get_name())
+	end
-		if fuel and (fuel.name==meta:get_string("fluid") or meta:get_string("fluid")=="") then
+
-			local leftover=false
+	local fuel=self.getFuelByItem(fluidSlot:get_name())
-			local leftoverAddingSucceeded=false
+	if fuel and (fuel.name==fluid or fluid=="") then
-			for _,item in ipairs(fuel.storageItems) do
+		local leftover=false
-				if item.name==fluidSlot:get_name() and item.leftover then
+		local leftoverAddingSucceeded=false
-					if inv:room_for_item("dst",ItemStack(item.leftover)) then
+		for _,item in ipairs(fuel.storageItems) do
-						inv:add_item("dst",ItemStack(item.leftover))
+			if item.name==fluidSlot:get_name() and item.leftover then
-						leftoverAddingSucceeded=true
+				local leftoverItemstack=ItemStack(item.leftover)
-					end
+				if inv:room_for_item("dst",leftoverItemstack) then
-					leftover=true
+					inv:add_item("dst",leftoverItemstack)
 					leftoverAddingSucceeded=true
 				end
-			end
+				leftover=true
 			if not leftover or leftoverAddingSucceeded then
 				fluidSlot:take_item()
 				inv:set_stack("src",1,fluidSlot)
 				meta:set_string("fluid",fuel.name)
 				meta:set_float("fluidAmount",meta:get_float("fluidAmount")+1000)
 				shouldUpdateFormspec=true
 				shouldRerunTimer=false
 			end
 		end
 		if not leftover or leftoverAddingSucceeded then
 			fluidSlot:take_item()
 			inv:set_stack("src",1,fluidSlot)
 			meta:set_string("fluid",fuel.name)
 			meta:set_float("fluidAmount",fluidAmount+1000)
 			return true
 		end
 	end
-	if meta:get_float("fluidAmount")>=50 and not industrialtest.api.isFullyCharged(meta) then
+
-		meta:set_float("fluidAmount",meta:get_int("fluidAmount")-50*elapsed)
+	return false
-		local toAdd=math.ceil(config.getFuel(meta:get_string("fluid")).calorificValue*elapsed)
+end
 local function generate(self,pos,elapsed)
 	local meta=minetest.get_meta(pos)
 	local fluidAmount=meta:get_float("fluidAmount")
 	if fluidAmount>0 and not industrialtest.api.isFullyCharged(meta) then
 		local fluidUsed=math.min(fluidAmount,50)
 		meta:set_float("fluidAmount",fluidAmount-fluidUsed*elapsed)
 		local toAdd=math.ceil(self.getFuel(meta:get_string("fluid")).calorificValue*elapsed*fluidUsed/50)
 		industrialtest.api.addPower(meta,toAdd)
-		shouldUpdateFormspec=true
+		return true
 		if config.registerActiveVariant then
 			minetest.swap_node(pos,{
 				name="industrialtest:"..config.name.."_active",
 				param2=minetest.get_node(pos).param2
 			})
 			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		else
 			shouldRerunTimer=true
 		end
 	end
-	if chargedSlot:get_count()>0 and meta:get_int("industrialtest.powerAmount")>0 then
+
-		if industrialtest.api.transferPowerToItem(meta,chargedSlot,industrialtest.api.lvPowerFlow)>0 then
+	return false
-			inv:set_stack("charged",1,chargedSlot)
+end
-			shouldUpdateFormspec=true
+
-			shouldRerunTimer=true
+industrialtest.GeothermalGenerator=table.copy(industrialtest.ActivatedElectricMachine)
-		end
+industrialtest.internal.unpackTableInto(industrialtest.GeothermalGenerator,{
 	name="industrialtest:geothermal_generator",
 	description=S("Geothermal Generator"),
 	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_geothermal_generator_front.png"
 	},
 	sounds="metal",
 	facedir=true,
 	storageLists={
 		"src",
 		"dst",
 		"charged"
 	},
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_geothermal_generator_front_active.png"
 		},
 		lightSource=10
 	},
 	powerLists={
 		{
 			list="charged",
 			direction="o"
 		}
 	},
 	requiresWrench=true,
 	hasPowerOutput=true,
 	capacity=7000,
 	flow=industrialtest.api.lvPowerFlow,
 	ioConfig="oooooo",
 	getFormspec=getFormspec,
 	getFuel=industrialtest.api.getGeothermalGeneratorFuel,
 	getFuelByItem=industrialtest.api.getGeothermalGeneratorFuelByItem
 })
 function industrialtest.GeothermalGenerator.onConstruct(self,pos)
 	onConstruct(pos)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
 function industrialtest.GeothermalGenerator.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	return math.min(allowMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex,count),industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count))
 end
 function industrialtest.GeothermalGenerator.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
 	return math.min(allowMetadataInventoryPut(pos,listname,index,stack,player),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player))
 end
 function industrialtest.GeothermalGenerator.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	if toList=="src" and takeFuelFromItem(self,pos) then
 		self:trigger(pos)
 	end
-	if flowTransferred then
+	industrialtest.ActivatedElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 end
 function industrialtest.GeothermalGenerator.onMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="src" and takeFuelFromItem(self,pos) then
 		self:trigger(pos)
 	end
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 function industrialtest.GeothermalGenerator.shouldActivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local fluidAmount=meta:get_float("fluidAmount")
 	return fluidAmount>0 and not industrialtest.api.isFullyCharged(meta)
 end
 function industrialtest.GeothermalGenerator.shouldDeactivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local fluidAmount=meta:get_float("fluidAmount")
 	return fluidAmount<=0 or industrialtest.api.isFullyCharged(meta)
 end
 function industrialtest.GeothermalGenerator.activeUpdate(self,pos,elapsed)
 	local shouldUpdateFormspec=false
 	if takeFuelFromItem(self,pos) then
 		shouldUpdateFormspec=true
 	end
 	return shouldRerunTimer,shouldUpdateFormspec
 end
-fluidGenerator.metadataChange=function(pos)
+	if generate(self,pos,elapsed) then
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		shouldUpdateFormspec=true
 end
 fluidGenerator.activeOnTimer=function(pos,elapsed,meta,inv,config)
 	local fluidSlot=inv:get_stack("src",1)
 	local chargedSlot=inv:get_stack("charged",1)
 	local afterFlow,flowTransferred=industrialtest.api.powerFlow(pos)
 	local shouldUpdateFormspec=false
 	local shouldRerunTimer=(afterFlow and meta:get_int("industrialtest.powerAmount")>0)
 	if fluidSlot:get_count()>0 and meta:get_float("fluidAmount")<=9000 then
 		local fuel=config.getFuelByItem(fluidSlot:get_name())
 		if fuel and (fuel.name==meta:get_string("fluid") or meta:get_string("fluid")=="") then
 			local leftover=false
 			local leftoverAddingSucceeded=false
 			for _,item in ipairs(fuel.storageItems) do
 				if item.name==fluidSlot:get_name() and item.leftover then
 					if inv:room_for_item("dst",ItemStack(item.leftover)) then
 						inv:add_item("dst",ItemStack(item.leftover))
 						leftoverAddingSucceeded=true
 					end
 					leftover=true
 				end
 			end
 			if not leftover or leftoverAddingSucceeded then
 				fluidSlot:take_item()
 				inv:set_stack("src",1,fluidSlot)
 				meta:set_string("fluid",fuel.name)
 				meta:set_float("fluidAmount",meta:get_float("fluidAmount")+1000)
 				shouldUpdateFormspec=true
 				shouldRerunTimer=false
 			end
 		end
 	end
-	if meta:get_float("fluidAmount")>=50 and not industrialtest.api.isFullyCharged(meta) then
+
-		meta:set_float("fluidAmount",meta:get_int("fluidAmount")-50*elapsed)
+	return shouldUpdateFormspec
-		local toAdd=math.ceil(industrialtest.api.getGeothermalGeneratorFuel(meta:get_string("fluid")).calorificValue*elapsed)
+end
-		industrialtest.api.addPower(meta,toAdd)
+
 industrialtest.GeothermalGenerator:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:geothermal_generator",
 	recipe={
 		{industrialtest.elementKeys.glass,"industrialtest:empty_cell",industrialtest.elementKeys.glass},
 		{industrialtest.elementKeys.glass,"industrialtest:empty_cell",industrialtest.elementKeys.glass},
 		{"industrialtest:refined_iron_ingot","industrialtest:generator","industrialtest:refined_iron_ingot"}
 	}
 })
 industrialtest.WaterMill=table.copy(industrialtest.ElectricMachine)
 industrialtest.internal.unpackTableInto(industrialtest.WaterMill,{
 	name="industrialtest:water_mill",
 	description=S("Water Mill"),
 	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_water_mill_side.png",
 		"industrialtest_machine_block.png^industrialtest_water_mill_side.png",
 		"industrialtest_machine_block.png^industrialtest_water_mill_side.png",
 		"industrialtest_machine_block.png^industrialtest_water_mill_side.png"
 	},
 	sounds="metal",
 	storageLists={
 		"src",
 		"dst",
 		"charged"
 	},
 	powerLists={
 		{
 			list="charged",
 			direction="o"
 		}
 	},
 	requiresWrench=true,
 	hasPowerOutput=true,
 	capacity=7000,
 	flow=industrialtest.api.lvPowerFlow,
 	ioConfig="oooooo",
 	getFormspec=getFormspec,
 	getFuel=industrialtest.api.getWaterMillFuel,
 	getFuelByItem=industrialtest.api.getWaterMillFuelByItem
 })
 function industrialtest.WaterMill.onConstruct(self,pos)
 	onConstruct(pos)
 	industrialtest.ElectricMachine.onConstruct(self,pos)
 end
 function industrialtest.WaterMill.canUpdate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local fluidAmount=meta:get_float("fluidAmount")
 	return fluidAmount>0 and not industrialtest.api.isFullyCharged(meta)
 end
 function industrialtest.WaterMill.update(self,pos,elapsed)
 	local shouldUpdateFormspec=false
 	local shouldRerunTimer=false
 	if takeFuelFromItem(self,pos) then
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	else
 		minetest.swap_node(pos,{
 			name="industrialtest:"..config.name,
 			param2=minetest.get_node(pos).param2
 		})
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
-	if chargedSlot:get_count()>0 and meta:get_int("industrialtest.powerAmount")>0 then
+
-		if industrialtest.api.transferPowerToItem(meta,chargedSlot,industrialtest.api.lvPowerFlow)>0 then
+	if generate(self,pos,elapsed) then
 			inv:set_stack("charged",1,chargedSlot)
 			shouldUpdateFormspec=true
 			shouldRerunTimer=true
 		end
 	end
 	if flowTransferred then
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	end
 	return shouldRerunTimer,shouldUpdateFormspec
 end
-local function registerFluidGenerator(config)
+function industrialtest.WaterMill.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
-	local definition={
+	return math.min(allowMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex,count),industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count))
 		name=config.name,
 		displayName=config.displayName,
 		getFormspec=function(pos)
 			return fluidGenerator.getFormspec(pos,config)
 		end,
 		capacity=7000,
 		flow=industrialtest.api.lvPowerFlow,
 		ioConfig="oooooo",
 		requiresWrench=true,
 		registerActiveVariant=config.registerActiveVariant,
 		powerSlots={"charged"},
 		storageSlots={"src","dst"},
 		sounds="metal",
 		groups={
 			_industrialtest_hasPowerOutput=1
 		},
 		customKeys={
 			tiles={
 				"industrialtest_machine_block.png"..(config.customTopTexture and "^"..config.customTopTexture or ""),
 				"industrialtest_machine_block.png"..(config.customBottomTexture and "^"..config.customBottomTexture or ""),
 				"industrialtest_machine_block.png"..(config.customRightTexture and "^"..config.customRightTexture or ""),
 				"industrialtest_machine_block.png"..(config.customLeftTexture and "^"..config.customLeftTexture or ""),
 				"industrialtest_machine_block.png"..(config.customBackTexture and "^"..config.customBackTexture or ""),
 				"industrialtest_machine_block.png"..(config.customFrontTexture and "^"..config.customFrontTexture or "")
 			},
 			paramtype2="facedir",
 			legacy_facedir_simple=true
 		},
 		onConstruct=fluidGenerator.onConstruct,
 		onTimer=function(pos,elapsed,meta,inv)
 			return fluidGenerator.onTimer(pos,elapsed,meta,inv,config)
 		end,
 		onMetadataInventoryPut=fluidGenerator.metadataChange,			
 		onMetadataInventoryMove=fluidGenerator.metadataChange
 	}
 	if config.registerActiveVariant then
 		definition.activeCustomKeys={
 			tiles={
 				"industrialtest_machine_block.png"..(config.customTopTexture and "^"..config.customTopTextureActive or ""),
 				"industrialtest_machine_block.png"..(config.customBottomTexture and "^"..config.customBottomTextureActive or ""),
 				"industrialtest_machine_block.png"..(config.customRightTexture and "^"..config.customRightTextureActive or ""),
 				"industrialtest_machine_block.png"..(config.customLeftTexture and "^"..config.customLeftTextureActive or ""),
 				"industrialtest_machine_block.png"..(config.customBackTexture and "^"..config.customBackTextureActive or ""),
 				"industrialtest_machine_block.png"..(config.customFrontTexture and "^"..config.customFrontTextureActive or "")
 			},
 			light_source=8
 		}
 		definition.activeOnTimer=function(pos,elapsed,meta,inv)
 			return fluidGenerator.activeOnTimer(pos,elapsed,meta,inv,config)
 		end
 	end
 	industrialtest.internal.registerMachine(definition)
 end
-registerFluidGenerator({
+function industrialtest.WaterMill.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
-	name="geothermal_generator",
+	return math.min(allowMetadataInventoryPut(pos,listname,index,stack,player),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player))
-	displayName=S("Geothermal Generator"),
+end
-	customFrontTexture="industrialtest_geothermal_generator_front.png",
+
-	customFrontTextureActive="industrialtest_geothermal_generator_front_active.png",
+function industrialtest.WaterMill.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
-	getFuel=industrialtest.api.getGeothermalGeneratorFuel,
+	if toList=="src" and takeFuelFromItem(self,pos) then
-	getFuelByItem=industrialtest.api.getGeothermalGeneratorFuelByItem,
+		self:trigger(pos)
-	registerActiveVariant=true,
+	end
-	reactsToNeighbouringNodes=false
+	industrialtest.ElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
-})
+end
 function industrialtest.WaterMill.onMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="src" and takeFuelFromItem(self,pos) then
 		self:trigger(pos)
 	end
 	industrialtest.ElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 function industrialtest.WaterMill.action(self,pos)
 	local meta=minetest.get_meta(pos)
 	local powerToAdd=0
 	local neighbourPositions={
 		vector.offset(pos,-1,0,0),
 		vector.offset(pos,1,0,0),
 		vector.offset(pos,0,-1,0),
 		vector.offset(pos,0,1,0),
 		vector.offset(pos,0,0,-1),
 		vector.offset(pos,0,0,1)
 	}
 	for _,value in ipairs(neighbourPositions) do
 		local node=minetest.get_node_or_nil(value)
 		if node then
 			local fuel=industrialtest.api.getWaterMillFuel(node.name)
 			if fuel then
 				powerToAdd=powerToAdd+fuel.calorificValue*0.2
 			end
 		end
 	end
 	if industrialtest.api.addPower(meta,powerToAdd)>0 then
 		self:updateFormspec(pos)
 		self:trigger(pos)
 	end
 end
 industrialtest.WaterMill:register()
 registerFluidGenerator({
 	name="water_mill",
 	displayName=S("Water Mill"),
 	customLeftTexture="industrialtest_water_mill_side.png",
 	customRightTexture="industrialtest_water_mill_side.png",
 	customFrontTexture="industrialtest_water_mill_side.png",
 	customBackTexture="industrialtest_water_mill_side.png",
 	getFuel=industrialtest.api.getWaterMillFuel,
 	getFuelByItem=industrialtest.api.getWaterMillFuelByItem,
 	registerActiveVariant=false
 })
 local neighbors={}
 for key,_ in pairs(industrialtest.api.waterMillFuels) do
 	table.insert(neighbors,key)
@@ -255,37 +352,8 @@ minetest.register_abm({
 	neighbors=neighbors,
 	interval=industrialtest.updateDelay,
 	chance=1,
-	action=function(pos,node)
+	action=function(pos)
-		local meta=minetest.get_meta(pos)
+		industrialtest.WaterMill:action(pos)
 		local inv=meta:get_inventory()
 		local chargedSlot=inv:get_stack("charged",1)
 		local powerToAdd=0
 		local neighbourPositions={
 			vector.offset(pos,-1,0,0),
 			vector.offset(pos,1,0,0),
 			vector.offset(pos,0,-1,0),
 			vector.offset(pos,0,1,0),
 			vector.offset(pos,0,0,-1),
 			vector.offset(pos,0,0,1)
 		}
 		for _,value in ipairs(neighbourPositions) do
 			local node=minetest.get_node_or_nil(value)
 			if node then
 				local fuel=industrialtest.api.getWaterMillFuel(node.name)
 				if fuel then
 					powerToAdd=powerToAdd+fuel.calorificValue*0.2
 				end
 			end
 		end
 		if industrialtest.api.addPower(meta,powerToAdd)>0 then
 			local def=minetest.registered_nodes[node.name]
 			def._industrialtest_updateFormspec(meta)
 		end
 		if chargedSlot:get_count()>0 and meta:get_int("industrialtest.powerAmount")>0 then
 			if industrialtest.api.transferPowerToItem(meta,chargedSlot,industrialtest.api.lvPowerFlow)>0 then
 				inv:set_stack("charged",1,chargedSlot)
 			end
 		end
 	end
 })
--- a/machines/generator.lua
+++ b/machines/generator.lua
@@ -15,11 +15,61 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-local generator={}
+industrialtest.Generator=table.copy(industrialtest.ActivatedElectricMachine)
 industrialtest.internal.unpackTableInto(industrialtest.Generator,{
 	name="industrialtest:generator",
 	description=S("Generator"),
 		tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_iron_furnace_front.png"
 	},
 	sounds="metal",
 	facedir=true,
 	storageLists={
 		"src",
 		"charged"
 	},
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png"
 		},
 		lightSource=8
 	},
 	capacity=7000,
 	flow=industrialtest.api.lvPowerFlow,
 	ioConfig="oooooo",
 	hasPowerOutput=true,
 	powerLists={
 		{
 			list="charged",
 			direction="o"
 		}
 	}
 })
-generator.getFormspec=function(pos)
+function industrialtest.Generator.onConstruct(self,pos)
 	local meta=minetest.get_meta(pos)
-	local fuelPercent=meta:get_int("fuelTime")/meta:get_int("maxFuelTime")*100
+	local inv=meta:get_inventory()
 	inv:set_size("charged",1)
 	inv:set_size("src",1)
 	meta:set_float("fuelTime",0)
 	meta:set_float("maxFuelTime",1)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
 function industrialtest.Generator.getFormspec(self,pos)
 	local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local fuelPercent=meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local formspec={
 		"list[context;charged;4.7,1.8;1,1]",
@@ -28,140 +78,87 @@ generator.getFormspec=function(pos)
 		 or "image[4.7,2.8;1,1;default_furnace_fire_bg.png]"),
 		"list[context;src;4.7,3.9;1,1]",
 		industrialtest.internal.getItemSlotBg(4.7,3.9,1,1),
-		"box[9,1;0.3,4.8;#202020]",
+		self.createPowerIndicatorWidget(charged,9,1),
 		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
 		"listring[context;src]"
 	}
-	return table.concat(formspec,"")
+	return parentFormspec..table.concat(formspec,"")
 end
-generator.onConstruct=function(pos,meta,inv)
+function industrialtest.Generator.onMetadataInventoryPut(self,pos,listname,index,stack)
-	inv:set_size("charged",1)
+	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-	inv:set_size("src",1)
+	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 	meta:set_int("fuelTime",0)
 	meta:set_int("maxFuelTime",1)
 end
-generator.onTimer=function(pos,elapsed,meta,inv)
+function industrialtest.Generator.activeUpdate(self,pos,elapsed,meta,inv)
 	local powerFlow=meta:get_int("industrialtest.powerFlow")
 	local chargedSlot=inv:get_stack("charged",1)
 	local fuelSlot=inv:get_stack("src",1)
-	local afterFlow,flowTransferred=industrialtest.api.powerFlow(pos)
+	local shouldUpdateFormspec=false
-	local shouldUpdateFormspec=flowTransferred
+
-	local shouldRerunTimer=(afterFlow and meta:get_int("industrialtest.powerAmount")>0)
+	if fuelSlot:get_count()>0 and meta:get_float("fuelTime")<=0 and not industrialtest.api.isFullyCharged(meta) then
 	if chargedSlot:get_count()>0 and not industrialtest.api.isFullyCharged(chargedSlot:get_meta()) and meta:get_int("industrialtest.powerAmount")>0 then
 		industrialtest.api.transferPowerToItem(meta,chargedSlot,powerFlow)
 		inv:set_stack("charged",1,chargedSlot)
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	end
 	if fuelSlot:get_count()>0 and meta:get_int("fuelTime")<=0 and not industrialtest.api.isFullyCharged(meta) then
 		local output,after=minetest.get_craft_result({
 			method="fuel",
 			width=1,
 			items={fuelSlot}
 		})
 		if output.time>0 then
-			meta:set_int("fuelTime",output.time)
+			meta:set_float("fuelTime",output.time)
-			meta:set_int("maxFuelTime",output.time)
+			meta:set_float("maxFuelTime",output.time)
 			inv:set_stack("src",1,after.items[1])
 			minetest.swap_node(pos,{
 				name="industrialtest:generator_active",
 				param2=minetest.get_node(pos).param2
 			})
 			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		end
 	end
 	return shouldRerunTimer,shouldUpdateFormspec
 end
-generator.activeOnTimer=function(pos,elapsed,meta,inv)
+	if meta:get_float("fuelTime")>0 then
-	local chargedSlot=inv:get_stack("charged",1)
+		meta:set_float("fuelTime",meta:get_float("fuelTime")-elapsed)
 	local fuelSlot=inv:get_stack("src",1)
 	local afterFlow,flowTransferred=industrialtest.api.powerFlow(pos)
 	local shouldUpdateFormspec=flowTransferred
 	local shouldRerunTimer=(afterFlow and meta:get_int("industrialtest.powerAmount")>0)
 	if chargedSlot:get_count()>0 and not industrialtest.api.isFullyCharged(chargedSlot:get_meta()) and meta:get_int("industrialtest.powerAmount")>0 then
 		industrialtest.api.transferPowerToItem(meta,chargedSlot,chargedSlot:get_meta():get_int("industrialtest.powerFlow"))
 		inv:set_stack("charged",1,chargedSlot)
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	end
 	if fuelSlot:get_count()>0 and meta:get_int("fuelTime")<=0 and not industrialtest.api.isFullyCharged(meta) then
 		local output,after=minetest.get_craft_result({
 			method="fuel",
 			width=1,
 			items={fuelSlot}
 		})
 		if output.time>0 then
 			meta:set_int("fuelTime",output.time)
 			meta:set_int("maxFuelTime",output.time)
 			inv:set_stack("src",1,after.items[1])
 		end
 	end
 	if meta:get_int("fuelTime")>0 then
 		meta:set_int("fuelTime",meta:get_int("fuelTime")-elapsed)
 		industrialtest.api.addPower(meta,200)
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	else
 		minetest.swap_node(pos,{
 			name="industrialtest:generator",
 			param2=minetest.get_node(pos).param2
 		})
 	end
-	return shouldRerunTimer,shouldUpdateFormspec
+
 	return shouldUpdateFormspec
 end
-generator.metadataChange=function(pos)
+function industrialtest.Generator.shouldActivate(self,pos)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local fuelSlot=inv:get_stack("src",1)
 	if fuelSlot:get_count()>0 and not industrialtest.api.isFullyCharged(meta) then
 		local output,after=minetest.get_craft_result({
 			method="fuel",
 			width=1,
 			items={fuelSlot}
 		})
 		if output.time>0 then
 			return true
 		end
 	end
 	return false
 end
-industrialtest.internal.registerMachine({
+function industrialtest.Generator.shouldDeactivate(self,pos)
-	name="generator",
+	local meta=minetest.get_meta(pos)
-	displayName=S("Generator"),
+
-	getFormspec=generator.getFormspec,
+	if meta:get_float("fuelTime")>0 then
-	capacity=7000,
+		return false
-	flow=industrialtest.api.lvPowerFlow,
+	end
-	ioConfig="oooooo",
+
-	registerActiveVariant=true,
+	local inv=meta:get_inventory()
-	powerSlots={"charged"},
+	local fuelSlot=inv:get_stack("src",1)
-	storageSlots={"charged","src"},
+	if fuelSlot:get_count()>0 and not industrialtest.api.isFullyCharged(meta) then
-	sounds="metal",
+		local output,after=minetest.get_craft_result({
-	groups={
+			method="fuel",
-		_industrialtest_hasPowerOutput=1
+			width=1,
-	},
+			items={fuelSlot}
-	customKeys={
+		})
-		tiles={
+		if output.time>0 then
-			"industrialtest_machine_block.png",
+			return false
-			"industrialtest_machine_block.png",
+		end
-			"industrialtest_machine_block.png",
+	end
-			"industrialtest_machine_block.png",
+
-			"industrialtest_machine_block.png",
+	return true
-			"industrialtest_machine_block.png^industrialtest_iron_furnace_front.png",
+end
-			"industrialtest_machine_block.png"
+
-		},
+industrialtest.Generator:register()
 		paramtype2="facedir",
 		legacy_facedir_simple=true
 	},
 	activeCustomKeys={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png",
 			"industrialtest_machine_block.png"
 		},
 		light_source=8
 	},
 	onConstruct=generator.onConstruct,
 	onTimer=generator.onTimer,
 	activeOnTimer=generator.activeOnTimer,
 	onMetadataInventoryPut=generator.metadataChange,
 	onMetadataInventoryMove=generator.metadataChange
 })
 minetest.register_craft({
 	type="shaped",
--- a/machines/induction_furnace.lua
+++ b/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",
--- a/machines/iron_furnace.lua
+++ b/machines/iron_furnace.lua
@@ -15,15 +15,59 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-local ironFurnace={}
+industrialtest.IronFurnace=table.copy(industrialtest.ActivatedMachine)
 industrialtest.internal.unpackTableInto(industrialtest.IronFurnace,{
 	name="industrialtest:iron_furnace",
 	description=S("Iron Furnace"),
 	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_iron_furnace_front.png"
 	},
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png"
 		},
 		lightSource=8
 	},
 	facedir=true,
 	storageLists={
 		"src",
 		"fuel",
 		"dst"
 	}
 })
-ironFurnace.getFormspec=function(fuelPercent,srcPercent)
+function industrialtest.IronFurnace.onConstruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	inv:set_size("src",1)
 	inv:set_size("dst",1)
 	inv:set_size("fuel",1)
 	meta:set_float("fuelTime",0)
 	meta:set_float("maxFuelTime",1)
 	meta:set_float("srcTime",0)
 	meta:set_float("maxSrcTime",0)
 	industrialtest.ActivatedMachine.onConstruct(self,pos)
 end
 function industrialtest.IronFurnace.getFormspec(self,pos)
 	local parentFormspec=industrialtest.ActivatedMachine.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local fuelPercent=meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100
 	local maxSrcTime=meta:get_float("maxSrcTime")
 	local srcPercent=meta:get_float("srcTime")/(maxSrcTime>0 and maxSrcTime or 0)*100
 	local formspec
 	if industrialtest.mtgAvailable then
 		formspec={
 			"formspec_version[4]",
 			"size[10.8,12]",
 			"label[0.5,0.5;"..S("Iron Furnace").."]",
 			"list[context;src;3.4,1.8;1,1]",
 			(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
 			 or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"),
@@ -31,16 +75,11 @@ ironFurnace.getFormspec=function(fuelPercent,srcPercent)
 			(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 			 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 			"list[context;dst;6.4,2.8;1,1]",
 			"list[current_player;main;0.5,6.25;8,1]",
 			"list[current_player;main;0.5,7.5;8,3;8]",
 			"listring[current_player;main]",
 			"listring[context;src]",
 			"listring[context;dst]"
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
 			"size[10.04,12]",
 			"label[0.25,0.25;"..S("Iron Furnace").."]",
 			"list[context;src;3.4,1.8;1,1]",
 			mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
 			(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
@@ -51,79 +90,78 @@ ironFurnace.getFormspec=function(fuelPercent,srcPercent)
 			 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 			"list[context;dst;6.4,2.8;1,1]",
 			mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
 			"list[current_player;main;0.5,7;9,3;9]",
 			mcl_formspec.get_itemslot_bg(0.5,7,9,3),
 			"list[current_player;main;0.5,10.24;9,1]",
 			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
 			"listring[current_player;main]",
 			"listring[context;src]",
 			"listring[context;dst]"
 		}
 	end
-	return table.concat(formspec,"")
+	return parentFormspec..table.concat(formspec,"")
 end
-ironFurnace.onConstruct=function(pos)
+function industrialtest.IronFurnace.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
-	local meta=minetest.get_meta(pos)
+	if toList=="dst" then
-	local inv=meta:get_inventory()
+		return 0
-	inv:set_size("src",1)
+	end
-	inv:set_size("dst",1)
+	return industrialtest.ActivatedMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	inv:set_size("fuel",1)
 	meta:set_string("formspec",ironFurnace.getFormspec(0,0))
 	meta:set_float("fuelTime",0)
 	meta:set_float("maxFuelTime",1)
 	meta:set_float("srcTime",-1)
 	meta:set_float("maxSrcTime",0)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
-ironFurnace.onTimer=function(pos,elapsed)
+function industrialtest.IronFurnace.allowMetadataInventoryPut(self,pos,listname,index,stack)
-	local meta=minetest.get_meta(pos)
+	if listname=="dst" then
-	local inv=meta:get_inventory()
+		return 0
-	local srcSlot=inv:get_stack("src",1)
+	elseif listname=="src" then
-	local fuelSlot=inv:get_stack("fuel",1)
+		local meta=minetest.get_meta(pos)
-	local shouldUpdateFormspec=false
+		local inv=meta:get_inventory()
-	local shouldRerunTimer=false
+		local srcSlot=inv:get_stack("src",1)
-
+		if srcSlot:get_name()~=stack:get_name() then
-	if fuelSlot:get_count()>0 and meta:get_float("fuelTime")<=0 then
+			meta:set_float("srcTime",0)
-		local output,after=minetest.get_craft_result({
+			meta:set_float("maxSrcTime",0)
 			method="cooking",
 			width=1,
 			items={srcSlot}
 		})
 		if output.time>0 and inv:room_for_item("dst",output.item) then
 			output,after=minetest.get_craft_result({
 				method="fuel",
 				width=1,
 				items={fuelSlot}
 			})
 			if output.time>0 then
 				meta:set_float("fuelTime",output.time)
 				meta:set_float("maxFuelTime",output.time)
 				inv:set_stack("fuel",1,after.items[1])
 				minetest.swap_node(pos,{
 					name="industrialtest:iron_furnace_active",
 					param2=minetest.get_node(pos).param2
 				})
 				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 			end
 		end
 	end
-
+	return industrialtest.ActivatedMachine.allowMetadataInventoryPut(self,pos,listname,index,stack)
 	if shouldUpdateFormspec then
 		meta:set_string("formspec",ironFurnace.getFormspec(meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100,meta:get_float("srcTime")/meta:get_float("maxSrcTime")*100))
 	end
 	return shouldRerunTimer
 end
-ironFurnace.activeOnTimer=function(pos,elapsed)
+function industrialtest.IronFurnace.allowMetadataInventoryTake(self,pos,listname,index,stack)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if listname=="src" and stack:get_count()==srcSlot:get_count() then
 		meta:set_float("srcTime",0)
 		meta:set_float("maxSrcTime",0)
 		if meta:get_float("maxFuelTime")>0 then
 			self:updateFormspec(pos)
 		end
 	elseif listname=="dst" and dstSlot:get_free_space()==0 then
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 	return industrialtest.ActivatedMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
 end
 function industrialtest.IronFurnace.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if fromList=="src" and count==srcSlot:get_count() then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		if meta:get_float("maxFuelTime")>0 then
 			self:updateFormspec(pos)
 		end
 	elseif fromList=="dst" and dstSlot:get_free_space()==0 then
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 	industrialtest.ActivatedMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 end
 function industrialtest.IronFurnace.onMetadataInventoryPut(self,pos,listname,index,stack)
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	industrialtest.ActivatedMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 function industrialtest.IronFurnace.activeUpdate(self,pos,elapsed,meta,inv)
 	local srcSlot=inv:get_stack("src",1)
 	local fuelSlot=inv:get_stack("fuel",1)
 	local shouldUpdateFormspec=false
 	local shouldRerunTimer=false
 	if fuelSlot:get_count()>0 and meta:get_float("fuelTime")<=0 then
 		local output,after=minetest.get_craft_result({
@@ -146,45 +184,27 @@ ironFurnace.activeOnTimer=function(pos,elapsed)
 	end
 	if srcSlot:get_count()>0 and meta:get_float("maxSrcTime")<=0 and meta:get_float("fuelTime")>0 then
 		local output,after=minetest.get_craft_result({
-				method="cooking",
+			method="cooking",
-				width=1,
+			width=1,
-				items={srcSlot}
+			items={srcSlot}
 		})
 		if output.time>0 and inv:room_for_item("dst",output.item) then
 			meta:set_float("srcTime",0)
 			meta:set_float("maxSrcTime",output.time*0.7)
 		end
 	end
 	if meta:get_float("maxSrcTime")>0 then
 		if meta:get_float("fuelTime")>0 then
 			meta:set_float("srcTime",meta:get_float("srcTime")+elapsed)
 		else
 			meta:set_float("srcTime",0)
 			minetest.swap_node(pos,{
 				name="industrialtest:iron_furnace",
 				param2=minetest.get_node(pos).param2
 			})
 			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		end
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	elseif meta:get_float("fuelTime")<=0 then
 		minetest.swap_node(pos,{
 			name="industrialtest:iron_furnace",
 			param2=minetest.get_node(pos).param2
 		})
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 	if meta:get_float("fuelTime")>0 then
 		if meta:get_float("maxSrcTime")>0 then
 			meta:set_float("srcTime",meta:get_float("srcTime")+elapsed)
 		end
 		meta:set_float("fuelTime",meta:get_float("fuelTime")-elapsed)
 		shouldUpdateFormspec=true
 		shouldRerunTimer=true
 	end
 	if meta:get_float("srcTime")>=meta:get_float("maxSrcTime") then
 		local output,after=minetest.get_craft_result({
-				method="cooking",
+			method="cooking",
-				width=1,
+			width=1,
-				items={srcSlot}
+			items={srcSlot}
 		})
 		if output.item:get_count()>0 then
 			inv:set_stack("src",1,after.items[1])
@@ -194,145 +214,77 @@ ironFurnace.activeOnTimer=function(pos,elapsed)
 		end
 	end
-	if shouldUpdateFormspec then
+	return shouldUpdateFormspec
 		meta:set_string("formspec",ironFurnace.getFormspec(meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100,meta:get_float("srcTime")/meta:get_float("maxSrcTime")*100))
 	end
 	return shouldRerunTimer
 end
-ironFurnace.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
+function industrialtest.IronFurnace.shouldActivate(self,pos)
-	if toList=="dst" then
+	local meta=minetest.get_meta(pos)
-		return 0
+	local inv=meta:get_inventory()
-	end
+	local fuelSlot=inv:get_stack("fuel",1)
-	return count
+	if fuelSlot:get_count()>0 then
 end
 ironFurnace.allowMetadataInventoryPut=function(pos,listname,index,stack)
 	if listname=="dst" then
 		return 0
 	elseif listname=="src" then
 		local meta=minetest.get_meta(pos)
 		local inv=meta:get_inventory()
 		local srcSlot=inv:get_stack("src",1)
-		if srcSlot:get_name()~=stack:get_name() then
+		local output,after=minetest.get_craft_result({
-			meta:set_float("srcTime",-1)
+			method="cooking",
-			meta:set_float("maxSrcTime",0)
+			width=1,
 			items={srcSlot}
 		})
 		if output.time>0 and inv:room_for_item("dst",output.item) then
 			output,after=minetest.get_craft_result({
 				method="fuel",
 				width=1,
 				items={fuelSlot}
 			})
 			if output.time>0 then
 				meta:set_float("fuelTime",output.time)
 				meta:set_float("maxFuelTime",output.time)
 				inv:set_stack("fuel",1,after.items[1])
 				return true
 			end
 		end
 	end
-	return stack:get_count()
+	return false
 end
-ironFurnace.allowMetadataInventoryTake=function(pos,listname,index,stack)
+function industrialtest.IronFurnace.shouldDeactivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	if meta:get_float("fuelTime")>0 then
 		return false
 	end
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
-	local dstSlot=inv:get_stack("dst",1)
+	local srcOutput,_=minetest.get_craft_result({
-	if listname=="src" and stack:get_count()==srcSlot:get_count() then
+		method="cooking",
-		meta:set_float("srcTime",-1)
+		width=1,
-		meta:set_float("maxSrcTime",0)
+		items={srcSlot}
-		if meta:get_float("maxFuelTime")>0 then
+	})
-			meta:set_string("formspec",ironFurnace.getFormspec(meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100,0))
+	if srcOutput.time==0 or not inv:room_for_item("dst",srcOutput.item) then
-		end
+		meta:set_float("srcTime",0)
-	elseif listname=="dst" and dstSlot:get_free_space()==0 then
+		return true
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
-	return stack:get_count()
+	
 	local fuelSlot=inv:get_stack("fuel",1)
 	local fuelOutput,_=minetest.get_craft_result({
 		method="fuel",
 		width=1,
 		items={fuelSlot}
 	})
 	if fuelOutput.time==0 then
 		meta:set_float("srcTime",0)
 		return true
 	end
 	return false
 end
-ironFurnace.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
+function industrialtest.IronFurnace.afterDeactivation(self,pos)
-	local meta=minetest.get_meta(pos)
+	self:updateFormspec(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if fromList=="src" and count==srcSlot:get_count() then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		if meta:get_float("maxFuelTime")>0 then
 			meta:set_string("formspec",ironFurnaceFormspec(meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100,0))
 		end
 	elseif fromList=="dst" and dstSlot:get_free_space()==0 then
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 end
-ironFurnace.onMetadataInventoryPut=function(pos,listname,index,stack)
+industrialtest.IronFurnace:register()
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 local definition={
 	description=S("Iron Furnace"),
 	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_iron_furnace_front.png",
 		"industrialtest_machine_block.png"
 	},
 	paramtype2="facedir",
 	legacy_facedir_simple=true,
 	on_construct=ironFurnace.onConstruct,
 	on_timer=ironFurnace.onTimer,
 	allow_metadata_inventory_move=ironFurnace.allowMetadataInventoryMove,
 	allow_metadata_inventory_put=ironFurnace.allowMetadataInventoryPut,
 	allow_metadata_inventory_take=ironFurnace.allowMetadataInventoryTake,
 	on_metadata_inventory_move=ironFurnace.onMetadataInventoryMove,
 	on_metadata_inventory_put=ironFurnace.onMetadataInventoryPut
 }
 if industrialtest.mtgAvailable then
 	definition.groups={
 		cracky=1,
 		level=2
 	}
 	definition.sounds=default.node_sound_metal_defaults()
 	definition.can_dig=function(pos)
 		local meta=minetest.get_meta(pos)
 		local inv=meta:get_inventory()
 		return not (inv:get_list("src")[1]:get_count()>0 or inv:get_list("fuel")[1]:get_count()>0 or inv:get_list("dst")[1]:get_count()>0)
 	end
 elseif industrialtest.mclAvailable then
 	definition.groups={
 		pickaxey=1,
 		container=2
 	}
 	definition.after_dig_node=function(pos,oldnode,oldmeta)
 		industrialtest.internal.mclAfterDigNode(pos,oldmeta,{"src","fuel","dst"})
 	end
 	definition.sounds=mcl_sounds.node_sound_metal_defaults()
 	definition._mcl_blast_resistance=3
 	definition._mcl_hardness=3.5
 	definition._mcl_hoppers_on_try_pull = mcl_furnaces.hoppers_on_try_pull
 	definition._mcl_hoppers_on_try_push = mcl_furnaces.hoppers_on_try_push
 	definition._mcl_hoppers_on_after_push = function(pos)
 		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 	end
 end
 minetest.register_node("industrialtest:iron_furnace",definition)
 definition=table.copy(definition)
 definition.description=nil
 definition.tiles={
 	"industrialtest_machine_block.png",
 	"industrialtest_machine_block.png",
 	"industrialtest_machine_block.png",
 	"industrialtest_machine_block.png",
 	"industrialtest_machine_block.png",
 	"industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png",
 	"industrialtest_machine_block.png"
 }
 definition.light_source=8
 definition.drop="industrialtest:iron_furnace"
 definition.on_timer=ironFurnace.activeOnTimer
 if industrialtest.mclAvailable then
 	definition.groups={
 		not_in_creative_inventory=1,
 		pickaxey=1,
 		container=2
 	}
 	definition._doc_items_create_entry=false
 end
 minetest.register_node("industrialtest:iron_furnace_active",definition)
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:iron_furnace",
--- a/machines/macerator.lua
+++ b/machines/macerator.lua
@@ -15,18 +15,55 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.Macerator=table.copy(industrialtest.SimpleElectricItemProcessor)
-industrialtest.internal.registerSimpleElectricItemProcessor({
+industrialtest.internal.unpackTableInto(industrialtest.Macerator,{
-	name="macerator",
+	name="industrialtest:macerator",
-	displayName=S("Macerator"),
+	description=S("Macerator"),
-	customFrontTexture=true,
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_macerator_front.png"
 	},
 	requiresWrench=true,
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_macerator_front_active.png"
 		}
 	},
 	capacity=1200,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=100,
 	method="industrialtest.macerating",
 	efficiency=1
 })
 function industrialtest.Macerator.getCraftResult(self,itemstack)
 	local output=industrialtest.api.getMaceratorRecipeResult(itemstack:get_name())
 	if not output then
 		return {
 			item=ItemStack(),
 			time=0,
 			src=itemstack
 		}
 	end
 	local srcAfter=ItemStack(itemstack:get_name())
 	srcAfter:set_count(itemstack:get_count()-1)
 	return {
 		item=ItemStack(output.output),
 		time=output.time,
 		src=srcAfter
 	}
 end
 industrialtest.Macerator:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:macerator",
--- a/machines/machine.lua
+++ b/machines/machine.lua
@@ -0,0 +1,273 @@
 -- IndustrialTest
 -- Copyright (C) 2024 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 industrialtest.Machine={}
 function industrialtest.Machine.onConstruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	meta:set_string("formspec",self:getFormspec(pos))
 	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 end
 function industrialtest.Machine.onDestruct(self)
 	-- dummy function
 end
 function industrialtest.Machine.getFormspec(self,pos)
 	local formspec
 	if industrialtest.mtgAvailable then
 		formspec={
 			"formspec_version[4]",
 			"size[10.8,12]",
 			"label[0.5,0.5;"..self.description.."]",
 			"list[current_player;main;0.5,6.25;8,1]",
 			"list[current_player;main;0.5,7.5;8,3;8]",
 			"listring[current_player;main]"
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
 			"size[10.04,12]",
 			"label[0.25,0.25;"..self.description.."]",
 			"list[current_player;main;0.5,7;9,3;9]",
 			mcl_formspec.get_itemslot_bg(0.5,7,9,3),
 			"list[current_player;main;0.5,10.24;9,1]",
 			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
 			"listring[current_player;main]"
 		}
 	end
 	return table.concat(formspec,"")
 end
 function industrialtest.Machine.updateFormspec(self,pos)
 	if self.withoutFormspec then
 		return
 	end
 	local meta=minetest.get_meta(pos)
 	meta:set_string("formspec",self:getFormspec(pos))
 end
 function industrialtest.Machine.canUpdate(self,pos)
 	return false
 end
 function industrialtest.Machine.trigger(self,pos)
 	local timer=minetest.get_node_timer(pos)
 	if not timer:is_started() then
 		minetest.debug("updating "..minetest.serialize(pos))
 		timer:start(industrialtest.updateDelay)
 	end
 end
 function industrialtest.Machine.triggerIfNeeded(self,pos)
 	if self:canUpdate(pos) then
 		self:trigger(pos)
 	end
 end
 function industrialtest.Machine.onTimer(self,pos,elapsed)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local shouldRerunTimer=false
 	local shouldUpdateFormspec=false
 	if self.update then
 		shouldRerunTimer,shouldUpdateFormspec=self:update(pos,elapsed,meta,inv)
 	end
 	if shouldUpdateFormspec then
 		self:updateFormspec(pos)
 	end
 	return shouldRerunTimer
 end
 function industrialtest.Machine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local movedItemStack=inv:get_stack(fromList,1)
 	if toList=="upgrades" then
 		return self.allowMoveToUpgradeSlot(pos,toIndex,movedItemStack)
 	end
 	return count
 end
 function industrialtest.Machine.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
 	if listname=="upgrades" then
 		return self.allowMoveToUpgradeSlot(pos,index,stack)
 	end
 	return stack:get_count()
 end
 function industrialtest.Machine.allowMetadataInventoryTake(self,pos,listname,index,stack,player)
 	return stack:get_count()
 end
 function industrialtest.Machine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	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)
 	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)
 	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)
 	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)
 	end
 end
 function industrialtest.Machine.createDefinitionTable(self)
 	local def={
 		description=self.description,
 		tiles=self.tiles,
 		on_construct=function(pos)
 			self:onConstruct(pos)
 		end,
 		on_destruct=function(pos)
 			self:onDestruct(pos)
 		end,
 		on_timer=function(pos,elapsed)
 			return self:onTimer(pos,elapsed)
 		end,
 		allow_metadata_inventory_move=function(pos,fromList,fromIndex,toList,toIndex,count)
 			return self:allowMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex,count)
 		end,
 		allow_metadata_inventory_put=function(pos,listname,index,stack,player)
 			return self:allowMetadataInventoryPut(pos,listname,index,stack,player)
 		end,
 		allow_metadata_inventory_take=function(pos,listname,index,stack,player)
 			return self:allowMetadataInventoryTake(pos,listname,index,stack,player)
 		end,
 		on_metadata_inventory_put=function(pos,listname,index,stack,player)
 			self:onMetadataInventoryPut(pos,listname,index,stack)
 		end,
 		on_metadata_inventory_move=function(pos,fromList,fromIndex,toList,toIndex,count)
 			self:onMetadataInventoryMove(pos,fromList,fromIndex,toList,toIndex)
 		end,
 		on_metadata_inventory_take=function(pos,listname,index,stack,player)
 			self:onMetadataInventoryTake(pos,listname,index,stack)
 		end,
 		_industrialtest_self=self
 	}
 	if industrialtest.mtgAvailable then
 		def.groups={cracky=2}
 		if self.sounds=="metal" then
 			def.sounds=default.node_sound_metal_defaults()
 		elseif self.sounds=="wood" then
 			def.sounds=default.node_sound_wood_defaults()
 		end
 		def.can_dig=function(pos)
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			for _,value in ipairs(self.storageLists) do
 				if inv:get_stack(value,1):get_count()>0 then
 					return false
 				end
 			end
 			return true
 		end
 	elseif industrialtest.mclAvailable then
 		def.after_dig_node=function(pos,oldnode,oldmeta)
 			industrialtest.internal.mclAfterDigNode(pos,oldmeta,self.storageLists)
 		end
 		if self.sounds=="metal" then
 			def.sounds=mcl_sounds.node_sound_metal_defaults()
 		elseif sounds=="wood" then
 			def.sounds=mcl_sounds.node_sound_wood_defaults()
 		end
 		def.groups={
 			pickaxey=1,
 			container=2
 		}
 		def._mcl_blast_resistance=3.5
 		def._mcl_hardness=3.9
 		def._mcl_hoppers_on_try_pull=function(pos, hop_pos, hop_inv, hop_list)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
 			local stack = inv:get_stack("dst", 1)
 			if not stack:is_empty() and hop_inv:room_for_item(hop_list, stack) then
 				return inv, "dst", 1
 			end
 			return nil, nil, nil
 		end
 		def._mcl_hoppers_on_try_push=function(pos, hop_pos, hop_inv, hop_list)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
 			return inv, "src", mcl_util.select_stack(hop_inv, hop_list, inv, "src")
 		end
 		def._mcl_hoppers_on_after_push=function(pos)
 			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 		end
 	end
 	def.groups._industrialtest_wrenchUnmountable=1
 	if self.requiresWrench then
 		def.drop="industrialtest:machine_block"
 	end
 	if self.facedir then
 		def.paramtype2="facedir"
 		def.legacy_facedir_simple=true
 	end
 	if self.hasPowerInput then
 		def.groups._industrialtest_hasPowerInput=1
 	end
 	if self.hasPowerOutput then
 		def.groups._industrialtest_hasPowerOutput=1
 	end
 	return def
 end
 function industrialtest.Machine.register(self)
 	local def=self:createDefinitionTable()
 	minetest.register_node(self.name,def)
 	industrialtest.api.addTag(self.name,"usesTimer")
 end
 function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,stack)
 	local def=minetest.registered_items[stack:get_name()]
 	if not def or not def.groups or not def.groups._industrialtest_machineUpgrade then
 		return 0
 	end
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local targetSlot=inv:get_stack("upgrades",toIndex)
 	if not targetSlot:is_empty() then
 		return 0
 	end
 	return stack:get_count()
 end
--- a/machines/mass_fabricator.lua
+++ b/machines/mass_fabricator.lua
@@ -15,20 +15,54 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-local massFabricator={}
+industrialtest.MassFabricator=table.copy(industrialtest.SimpleElectricItemProcessor)
-
+industrialtest.internal.unpackTableInto(industrialtest.MassFabricator,{
-industrialtest.internal.registerSimpleElectricItemProcessor({
+	name="industrialtest:mass_fabricator",
-	name="mass_fabricator",
+	description=S("Mass Fabricator"),
-	displayName=S("Mass Fabricator"),
+	tiles={
-	capacity=100000,
+		"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_mass_fabricator_front.png"
 	},
 	requiresWrench=true,
 	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_mass_fabricator_front_active.png"
 		}
 	},
 	capacity=100000,
 	flow=industrialtest.api.evPowerFlow,
 	opPower=10000,
 	machineBlockTexture="industrialtest_advanced_machine_block.png",
 	customFrontTexture=true,
 	method="industrialtest.mass_fabricating",
 	efficiency=1
 })
 function industrialtest.MassFabricator.getCraftResult(self,itemstack)
 	if itemstack:get_count()<34 or itemstack:get_name()~="industrialtest:scrap" then
 		return {
 			item=ItemStack(),
 			time=0,
 			src=itemstack
 		}
 	end
 	local srcAfter=ItemStack(itemstack:get_name())
 	srcAfter:set_count(itemstack:get_count()-34)
 	return {
 		item=ItemStack("industrialtest:uu_matter"),
 		time=15,
 		src=srcAfter
 	}
 end
 industrialtest.MassFabricator:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:mass_fabricator",
--- a/machines/recycler.lua
+++ b/machines/recycler.lua
@@ -15,18 +15,47 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.Recycler=table.copy(industrialtest.SimpleElectricItemProcessor)
-industrialtest.internal.registerSimpleElectricItemProcessor({
+industrialtest.internal.unpackTableInto(industrialtest.Recycler,{
-	name="recycler",
+	name="industrialtest:recycler",
-	displayName=S("Recycler"),
+	description=S("Recycler"),
-	customTopTexture=true,
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png^industrialtest_recycler_front.png"
 	},
 	requiresWrench=true,
 	active={
 		tiles={
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png",
 			"industrialtest_machine_block.png^industrialtest_recycler_front_active.png"
 		}
 	},
 	capacity=80,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=40,
 	method="industrialtest.recycling",
 	efficiency=1
 })
 function industrialtest.Recycler.getCraftResult(self,itemstack)
 	local srcAfter=ItemStack(itemstack:get_name())
 	srcAfter:set_count(itemstack:get_count()-1)
 	return {
 		item=ItemStack(industrialtest.random:next(1,8)==1 and "industrialtest:scrap" or ""),
 		time=2,
 		src=srcAfter
 	}
 end
 industrialtest.Recycler:register()
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:recycler",
--- a/machines/simple_electric_item_processor.lua
+++ b/machines/simple_electric_item_processor.lua
@@ -0,0 +1,220 @@
 -- IndustrialTest
 -- Copyright (C) 2025 mrkubax10
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 industrialtest.SimpleElectricItemProcessor=table.copy(industrialtest.ActivatedElectricMachine)
 industrialtest.internal.unpackTableInto(industrialtest.SimpleElectricItemProcessor,{
 	facedir=true,
 	sounds="metal",
 	storageLists={
 		"src",
 		"dst",
 		"powerStorage",
 		"upgrades"
 	},
 	powerLists={
 		{
 			list="powerStorage",
 			direction="i"
 		}
 	},
 	hasPowerInput=true,
 	ioConfig="iiiiii"
 })
 function industrialtest.SimpleElectricItemProcessor.onConstruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	inv:set_size("src",1)
 	inv:set_size("dst",1)
 	inv:set_size("powerStorage",1)
 	inv:set_size("upgrades",4)
 	meta:set_float("srcTime",-1)
 	meta:set_float("maxSrcTime",0)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
 function industrialtest.SimpleElectricItemProcessor.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 srcPercent=meta:get_float("srcTime")/meta:get_float("maxSrcTime")*100
 	local formspec={
 		"list[context;src;3.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
 		(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;powerStorage;3.4,3.9;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
 		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 		"list[context;dst;6.4,2.8;1,1]",
 		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
 		"list[context;upgrades;9,0.9;1,4]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
 		"listring[context;src]",
 		"listring[context;dst]"
 	}
 	return parentFormspec..table.concat(formspec,"")
 end
 function industrialtest.SimpleElectricItemProcessor.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count)
 	if toList=="dst" then
 		return 0
 	end
 	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count)
 end
 function industrialtest.SimpleElectricItemProcessor.allowMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="dst" then
 		return 0
 	elseif listname=="src" then
 		local meta=minetest.get_meta(pos)
 		local inv=meta:get_inventory()
 		local srcSlot=inv:get_stack("src",1)
 		if srcSlot:get_name()~=stack:get_name() then
 			meta:set_float("srcTime",-1)
 			meta:set_float("maxSrcTime",0)
 		end
 	end
 	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack)
 end
 function industrialtest.SimpleElectricItemProcessor.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if fromList=="src" and srcSlot:is_empty() then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		self:updateFormspec(pos)
 	elseif fromList=="dst" and dstSlot:get_free_space()>0 then
 		self:triggerIfNeeded(pos)
 	end
 end
 function industrialtest.SimpleElectricItemProcessor.onMetadataInventoryPut(self,pos)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos)
 	self:triggerIfNeeded(pos)
 end
 function industrialtest.SimpleElectricItemProcessor.onMetadataInventoryTake(self,pos,listname,index,stack)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryTake(self,pos,listname,index,stack)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local srcSlot=inv:get_stack("src",1)
 	local dstSlot=inv:get_stack("dst",1)
 	if listname=="src" and srcSlot:is_empty() then
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		self:updateFormspec(pos)
 	elseif listname=="dst" and dstSlot:get_free_space()>0 then
 		self:triggerIfNeeded(pos)
 	end
 end
 function industrialtest.SimpleElectricItemProcessor.register(self)
 	industrialtest.ActivatedElectricMachine.register(self)
 	industrialtest.api.addTag(self.name,"simpleElectricItemProcessor")
 end
 function industrialtest.SimpleElectricItemProcessor.shouldActivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	if meta:get_float("maxSrcTime")>0 and meta:get_float("srcTime")>=0 then
 		return false
 	end
 	-- TODO: Take elapsed time into account
 	local requiredPower=self.opPower*industrialtest.api.getMachineSpeed(meta)
 	if meta:get_int("industrialtest.powerAmount")<requiredPower then
 		return false
 	end
 	local srcSlot=inv:get_stack("src",1)
 	if srcSlot:get_count()>0 then
 		local output=self:getCraftResult(srcSlot)
 		return output and output.time>0 and inv:room_for_item("dst",output.item)
 	end
 	return false
 end
 function industrialtest.SimpleElectricItemProcessor.shouldDeactivate(self,pos)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	-- TODO: Take elapsed time into account
 	local requiredPower=self.opPower*industrialtest.api.getMachineSpeed(meta)
 	if meta:get_int("industrialtest.powerAmount")<requiredPower then
 		return true
 	end
 	local srcSlot=inv:get_stack("src",1)
 	if srcSlot:is_empty() then
 		return true
 	end
 	local output=self:getCraftResult(srcSlot)
 	return not output or output.time==0 or not inv:room_for_item("dst",output.item)
 end
 function industrialtest.SimpleElectricItemProcessor.activeUpdate(self,pos,elapsed,meta,inv)
 	local srcSlot=inv:get_stack("src",1)
 	local srcTime=0
 	local maxSrcTime
 	if meta:get_float("maxSrcTime")<=0 then
 		local output=self:getCraftResult(srcSlot)
 		maxSrcTime=output.time*self.efficiency
 		meta:set_float("srcTime",0)
 		meta:set_float("maxSrcTime",maxSrcTime)
 		shouldUpdateFormspec=true
 	else
 		srcTime=meta:get_float("srcTime")
 		maxSrcTime=meta:get_float("maxSrcTime")
 	end
 	local speed=industrialtest.api.getMachineSpeed(meta)
 	local requiredPower=elapsed*self.opPower*speed
 	industrialtest.api.addPower(meta,-requiredPower)
 	srcTime=srcTime+elapsed
 	meta:set_int("srcTime",srcTime)
 	if srcTime>=maxSrcTime then
 		local output=self:getCraftResult(srcSlot)
 		local usedItems=srcSlot:get_count()-output.src:get_count()
 		local multiplier=1
 		if srcSlot:get_count()>=speed*usedItems then
 			multiplier=speed
 		end
 		if output.item:get_count()>0 then
 			output.item:set_count(output.item:get_count()*multiplier)
 			inv:add_item("dst",output.item)
 		end
 		meta:set_float("srcTime",-1)
 		meta:set_float("maxSrcTime",0)
 		srcSlot:set_count(srcSlot:get_count()-multiplier*usedItems)
 		inv:set_stack("src",1,srcSlot)
 	end
 	return true
 end
 function industrialtest.SimpleElectricItemProcessor.getCraftResult(self,itemstack)
 	-- Dummy method
 end
--- a/mod.conf
+++ b/mod.conf
@@ -1,5 +1,5 @@
 name=industrialtest
 description=Adds various machinery
-optional_depends=default,bucket,3d_armor,mcl_core,mcl_copper,mcl_armor,mcl_deepslate,mcl_nether,mcl_buckets,mcl_util,mcl_dye,mcl_rubber,pipeworks,mesecons
+optional_depends=default,bucket,3d_armor,mcl_core,mcl_copper,mcl_armor,mcl_deepslate,mcl_nether,mcl_buckets,mcl_util,mcl_dye,mcl_rubber,pipeworks,logistica,mesecons
 author=IndustrialTest Team
 title=IndustrialTest
--- a/textures/industrialtest_recycler_front.png
+++ b/textures/industrialtest_recycler_front.png
--- a/textures/industrialtest_recycler_front_active.png
+++ b/textures/industrialtest_recycler_front_active.png
Author	SHA1	Message	Date
mrkubax10	29662f1821	Remove duplicated `tiles` entry in some machines	2025-03-17 19:51:12 +01:00
mrkubax10	80cbc12a8a	Refactor Induction Furnace	2025-03-17 18:52:13 +01:00
mrkubax10	4c6b4b9df0	Fix machines not triggered when item with power storage is placed in inventory	2025-03-16 20:20:54 +01:00
mrkubax10	3a1cfad7d4	Add workaround for `NodeTimerRef.is_started` not returning correct value	2025-03-16 11:38:43 +01:00
mrkubax10	d3c9d3ed7a	Refactor fluid generators	2025-03-16 11:37:44 +01:00
mrkubax10	abfb829cea	Use `Machine.triggerIfNeeded` to request power	2025-03-16 11:35:53 +01:00
mrkubax10	8e30412515	Refactor Mass Fabricator	2025-03-11 22:19:46 +01:00
mrkubax10	d247060c2e	Refactor Recycler	2025-03-11 21:25:01 +01:00
mrkubax10	ef88c5cd6b	Refactor Macerator	2025-03-11 19:55:29 +01:00
mrkubax10	5e99610747	Refactor Extractor	2025-03-11 19:45:56 +01:00
mrkubax10	9a49e49fe3	Refactor Electric Furnace	2025-03-11 19:40:31 +01:00
mrkubax10	5ddeeed36f	Refactor Cable Former	2025-03-11 19:12:57 +01:00
mrkubax10	c379b133dc	Update formspec after item is taken when it's actually needed	2025-03-11 18:55:11 +01:00
mrkubax10	70dacf9a8c	Make sure to properly distribute available power across all endpoints	2025-03-10 11:55:48 +01:00
mrkubax10	4698266b33	Don't take fuel input in `Generator.shouldActivate`	2025-03-10 11:46:09 +01:00
mrkubax10	165450f857	Refactor Compressor	2025-03-10 11:16:36 +01:00
mrkubax10	18a1cbc983	Refactor base for simple electric item processors	2025-03-10 11:15:31 +01:00
mrkubax10	ab7d011afd	Remove redundant return value from `ActivatedMachine.activeUpdate`	2025-03-10 11:06:38 +01:00
mrkubax10	371ef36ce3	Refactor Chargepad	2025-03-03 11:45:36 +01:00
mrkubax10	8f529ad6c3	Fix few oversights and bring back some missing features	2025-03-03 11:44:18 +01:00
mrkubax10	09a0d9c855	Use appropriate item power exchange direction	2025-01-20 22:21:06 +01:00
mrkubax10	fd45e58e9c	Change MineClone2 to VoxeLibre in README.md	2025-01-08 22:50:53 +01:00
mrkubax10	ca99ab38b5	Refactor Canning Machine	2025-01-08 22:47:11 +01:00
mrkubax10	6934a8b342	Fix some oversights	2025-01-08 22:46:16 +01:00
mrkubax10	752fe4f192	Optimize electric network operations a little	2025-01-08 22:45:12 +01:00
mrkubax10	6e2a3c22cf	Create fluid utility functions in API	2025-01-08 22:43:30 +01:00
mrkubax10	c50871a96b	Change `Machine.storageSlots` to `Machine.storageLists`	2024-10-25 12:42:42 +02:00
mrkubax10	78637a4759	Refactor Generator	2024-10-25 12:42:04 +02:00
mrkubax10	83ee6fb4c8	Fixes in ActivatedElectricMachine and ElectricMachine	2024-10-25 12:40:27 +02:00
mrkubax10	1f6f711b64	Forgot to add `fuel` slot to `storageSlots`	2024-10-24 16:36:38 +02:00
mrkubax10	6befcdeb01	Refactor Iron Furnace	2024-10-24 16:33:34 +02:00
mrkubax10	d799b10242	Some fixes in Machine and ActivatedMachine	2024-10-24 16:32:57 +02:00
mrkubax10	442d3a42b1	Change Activated{Electric}Machine.before{Activation\|Deactivation} to Activated{Electric}Machine.after{Activation\|Deactivation}	2024-10-24 16:30:20 +02:00
mrkubax10	fd3df487e5	Implement util function for merging 2 tables	2024-10-24 16:28:18 +02:00
mrkubax10	52aea868a5	Begin implementing more OOP-like design	2024-10-15 16:28:59 +02:00
mrkubax10	db1d7fe820	Add Logistica to optional dependencies in README.md	2024-09-16 10:27:06 +02:00
mrkubax10	959c5ac6b8	Remove debug log message	2024-09-16 10:25:36 +02:00
mrkubax10	19c97f0173	Implement Logistica compatibility	2024-09-14 17:35:57 +02:00
mrkubax10	3419fcb660	Introduce tag system for further usage	2024-09-11 15:29:03 +02:00
mrkubax10	636c0cda64	Remove unnecessary constant	2024-09-11 15:04:36 +02:00
mrkubax10	ce4e1b52ba	Some leftover API files fixes	2024-09-08 22:57:08 +02:00
mrkubax10	07ea380ed7	Extract registration API functions to separate file	2024-09-08 22:53:09 +02:00
mrkubax10	e18789451c	Extract network API functions to separate file	2024-09-08 22:46:41 +02:00
mrkubax10	e2d91cd8c5	Extract tool API functions to separate file	2024-09-08 22:41:37 +02:00
mrkubax10	0363a2ba26	Extract fluid API functions to separate file	2024-09-08 22:36:33 +02:00
mrkubax10	cb41e76742	Extract side API functions to separate file	2024-09-08 22:31:26 +02:00
mrkubax10	9436c7033b	Extract power API functions to separate file	2024-09-08 22:27:36 +02:00