Release IndustrialTest 2.0.0 (stable, release)

TEXTURES_TODO.md

@@ -1,4 +0,0 @@
-# List of textures that still have to be done
-- bronze toolset for MCL
-- bronze nugget for MCL
-- advanced electronic circuit

api/fluid.lua

@@ -16,19 +16,13 @@
 
 local S=minetest.get_translator("industrialtest")
 
--- \brief Prepares itemstack containing fluid storage
+local function createItemFluidStorageText(itemstack)
--- \param itemstack ItemStack
--- \returns bool
-function industrialtest.api.prepareFluidStorageItem(itemstack)
 	local meta=itemstack:get_meta()
-	local def=itemstack:get_definition()
+	local fluidCapacity=meta:get_int("industrialtest.fluidCapacity")
-	if industrialtest.api.itemHasFluidStorage(itemstack) or not def.groups or not def.groups._industrialtest_fluidStorage or not def._industrialtest_fluidCapacity then
+	local fluidAmount=meta:get_int("industrialtest.fluidAmount")
-		return false
+	local lowerLimit=math.floor(fluidCapacity*0.25)
-	end
+	local color=(fluidAmount>lowerLimit and "#0000FF" or "#FF0000")
-	meta:set_int("industrialtest.fluidAmount",0)
+	return minetest.colorize(color,S("@1 / @2 mB",fluidAmount,fluidCapacity))
-	meta:set_int("industrialtest.fluidCapacity",def._industrialtest_fluidCapacity)
-	industrialtest.api.updateItemFluidText(itemstack)
-	return true
 end
 
 -- \brief Check if itemstack contains fluid storage
@@ -80,8 +74,13 @@ end
 -- \returns nil
 function industrialtest.api.updateItemFluidText(itemstack)
 	local meta=itemstack:get_meta()
-	local def=itemstack:get_definition()
+	if industrialtest.mtgAvailable then
-	meta:set_string("description",S("@1\n@2 / @3 mB",def.description,meta:get_int("industrialtest.fluidAmount"),meta:get_int("industrialtest.fluidCapacity")))
+		local def=itemstack:get_definition()
+		local fluidStorageText=createItemFluidStorageText(itemstack)
+		meta:set_string("description",string.format("%s\n%s",def.description,fluidStorageText))
+	elseif industrialtest.mclAvailable then
+		tt.reload_itemstack_description(itemstack)
+	end
 	itemstack:set_wear(65535-meta:get_int("industrialtest.fluidAmount")/meta:get_int("industrialtest.fluidCapacity")*65534)
 end
 
@@ -119,3 +118,15 @@ function industrialtest.api.transferFluidToItem(srcItemstack,itemstack,amount)
 	industrialtest.api.updateItemFluidText(srcItemstack)
 	return actualFlow
 end
+
+if industrialtest.mclAvailable then
+	tt.register_snippet(function(itemstring,toolCapabilities,itemstack)
+		if not itemstack then
+			return nil
+		end
+		if not industrialtest.api.itemHasFluidStorage(itemstack) then
+			return nil
+		end
+		return createItemFluidStorageText(itemstack),false
+	end)
+end

api/network.lua

@@ -41,6 +41,102 @@ local function clampFlow(pos,flow)
 	return math.min(flow,newFlow)
 end
 
+-- \brief Finds path from pos to dest in network. Function finished if either dest is found or every node was visited
+-- \param pos Vector
+-- \param dest Vector
+-- \returns table or nil
+function industrialtest.api.findPathInNetwork(pos,dest)
+	local connections=industrialtest.api.getConnections(pos,"i")
+	if #connections==0 then
+		return nil
+	end
+
+	local workers={}
+	local serializedSourcePos=pos.x..","..pos.y..","..pos.z
+	local visitedNodes={[serializedSourcePos]=true}
+	for _,conn in ipairs(connections) do
+		local sideVector=vector.subtract(conn,pos)
+		table.insert(workers,{
+			position=conn,
+			direction=sideVector,
+			path={[1]=conn}
+		})
+	end
+
+	while #workers>0 do
+		for i=1,#workers do
+			local worker=workers[i]
+			local serializedPos=worker.position.x..","..worker.position.y..","..worker.position.z
+			if visitedNodes[serializedPos] then
+				table.remove(workers,i)
+				break
+			end
+			visitedNodes[serializedPos]=true
+
+			if worker.position.x==dest.x and worker.position.y==dest.y and worker.position.z==dest.z then
+				return worker.path
+			end
+
+			local def=minetest.registered_nodes[minetest.get_node(worker.position).name]
+			if def and def.groups and def.groups._industrialtest_cable then
+				connections=industrialtest.api.getConnections(worker.position,"i")
+				for j=1,#connections do
+					local direction=vector.subtract(connections[j],worker.position)
+					local oppositeDirection=vector.multiply(worker.direction,vector.new(-1,-1,-1))
+					if direction.x~=oppositeDirection.x or direction.y~=oppositeDirection.y or direction.z~=oppositeDirection.z then
+						if worker.direction.x~=direction.x or worker.direction.y~=direction.y or worker.direction.z~=direction.z then
+							table.insert(worker.path,worker.position)
+						end
+						for c=1,#connections do
+							local nextDirection=vector.subtract(connections[c],worker.position)
+							if c~=j and (nextDirection.x~=oppositeDirection.x or nextDirection.y~=oppositeDirection.y or nextDirection.z~=oppositeDirection.z) then
+								local newWorker={
+									position=connections[c],
+									direction=nextDirection,
+									path=table.copy(worker.path)
+								}
+								table.insert(newWorker.path,worker.position)
+								table.insert(workers,newWorker)
+							end
+						end
+						worker.direction=direction
+						worker.position=connections[j]
+						break
+					end
+				end
+
+				if #connections>2 then
+					break
+				end
+			else
+				table.remove(workers,i)
+				break
+			end
+		end
+	end
+
+	return nil
+end
+
+-- \brief Goes through path vertices specified by path running callback on each node.
+--        Function finishes if either callback returns false or entire path is went over.
+-- \param path table
+-- \param callback function
+-- \returns nil
+function industrialtest.api.walkPath(path,callback)
+	local pos=path[1]
+	for i=2,#path do
+		local pathNode=path[i]
+		local direction=vector.normalize(vector.subtract(pathNode,pos))
+		while pos.x~=pathNode.x or pos.y~=pathNode.y or pos.z~=pathNode.z do
+			if not callback(pos) then
+				return
+			end
+			pos=vector.add(pos,direction)
+		end
+	end
+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
@@ -94,14 +190,42 @@ function industrialtest.api.powerFlow(pos,sides,flowOverride)
 					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)
+					minetest.get_node_timer(endpoint.position):start(industrialtest.config.updateDelay)
 				end
 				if not industrialtest.api.isFullyCharged(endpointMeta) then
 					roomAvailable=true
 				end
 			else
-				minetest.remove_node(endpoint.position)
+				local path=industrialtest.api.findPathInNetwork(pos,endpoint.position)
-				industrialtest.internal.explode(endpoint.position,2)
+				if path and #path>0 then
+					table.insert(path,endpoint.position)
+					local removed=false
+					industrialtest.api.walkPath(path,function(pathPos)
+						local def=minetest.registered_nodes[minetest.get_node(pathPos).name]
+						if not def or not def.groups or not def.groups._industrialtest_cable then
+							return false
+						end
+						if powerDistribution>def._industrialtest_cableFlow then
+							removed=true
+							minetest.swap_node(pathPos,{
+								name="air"
+							})
+							minetest.remove_node(pathPos)
+							minetest.check_for_falling(pathPos)
+							minetest.sound_play("default_cool_lava",{
+								pos=pathPos,
+								max_hear_distance=5,
+								gain=0.7
+							})
+						end
+						return true
+					end)
+					if not removed and powerDistribution>endpoint.originalFlow then
+						minetest.remove_node(endpoint.position)
+						industrialtest.internal.explode(endpoint.position,2)
+					end
+					industrialtest.api.createNetworkMapForNode(pos)
+				end
 			end
 		end
 	end
@@ -199,6 +323,7 @@ function industrialtest.api.createNetworkMap(pos,addCables,omit)
 					position=worker.position,
 					distance=worker.distance,
 					flow=math.min(worker.flow,flow),
+					originalFlow=flow,
 					side=connectionSide,
 					sourceSide=worker.sourceSide
 				})
@@ -271,6 +396,34 @@ function industrialtest.api.getNetwork(meta)
 	return minetest.deserialize(meta:get_string("industrialtest.network"))
 end
 
+-- \brief Returns amount of power that will flow from specified network master
+-- \param pos Vector
+-- \returns number
+function industrialtest.api.getFlowingCurrent(pos)
+	local meta=minetest.get_meta(pos)
+	if not industrialtest.api.hasPowerStorage(meta) or meta:get_int("industrialtest.powerAmount")==0 then
+		return 0
+	end
+	local network=industrialtest.api.getNetwork(meta)
+	if not network then
+		return 0
+	end
+
+	local amount=meta:get_int("industrialtest.powerAmount")
+	if amount==0 then
+		return 0
+	end
+	local demand=0
+	for _,endpoint in ipairs(network) do
+		local endpointMeta=minetest.get_meta(endpoint.position)
+		if industrialtest.api.hasPowerStorage(endpointMeta) then
+			demand=demand+math.min(endpointMeta:get_int("industrialtest.powerCapacity")-endpointMeta:get_int("industrialtest.powerAmount"),endpoint.flow)
+		end
+	end
+
+	return math.min(amount,demand)
+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

api/power.lua

@@ -16,6 +16,15 @@
 
 local S=minetest.get_translator("industrialtest")
 
+local function createItemPowerText(itemstack)
+	local meta=itemstack:get_meta()
+	local powerCapacity=meta:get_int("industrialtest.powerCapacity")
+	local powerAmount=meta:get_int("industrialtest.powerAmount")
+	local lowerLimit=math.floor(powerCapacity*0.25)
+	local color=(powerAmount>lowerLimit and "#00FFFF" or "#FF0000")
+	return minetest.colorize(color,S("@1 / @2 EU",powerAmount,powerCapacity))
+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
@@ -158,24 +167,15 @@ end
 -- \returns nil
 function industrialtest.api.updateItemPowerText(itemstack)
 	local meta=itemstack:get_meta()
-	local def=minetest.registered_tools[itemstack:get_name()]
+	if industrialtest.mtgAvailable then
-	local desc=meta:contains("industrialtest.descriptionOverride") and meta:get_string("industrialtest.descriptionOverride") or def.description
+		local def=minetest.registered_tools[itemstack:get_name()]
-	meta:set_string("description",S("@1\n@2 / @3 EU",desc,meta:get_int("industrialtest.powerAmount"),meta:get_int("industrialtest.powerCapacity")))
+		local desc=meta:contains("industrialtest.descriptionOverride") and meta:get_string("industrialtest.descriptionOverride") or def.description
-	itemstack:set_wear(65535-meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*65534)
+		local powerText=createItemPowerText(itemstack)
-end
+		meta:set_string("description",string.format("%s\n%s",desc,powerText))
-
+	elseif industrialtest.mclAvailable then
--- \brief Adds power storage to item depending on it's definition
+		tt.reload_itemstack_description(itemstack)
--- \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")
+	itemstack:set_wear(65535-meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*65534)
-	industrialtest.api.updateItemPowerText(itemstack)
-	return true
 end
 
 -- \brief Adds power to itemstack. Function checks if itemstack has power storage.
@@ -223,3 +223,15 @@ function industrialtest.api.transferPowerFromItem(srcItemstack,meta,amount)
 	return actualFlow
 end
 
+if industrialtest.mclAvailable then
+	tt.register_snippet(function(itemstring,toolCapabilities,itemstack)
+		if not itemstack then
+			return nil
+		end
+		local meta=itemstack:get_meta()
+		if not industrialtest.api.hasPowerStorage(meta) then
+			return nil
+		end
+		return createItemPowerText(itemstack),false
+	end)
+end

api/tool.lua

@@ -1,60 +0,0 @@
--- 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

cables.lua

@@ -15,27 +15,43 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-local cable={}
 
-cable.onConstruct=function(pos)
+industrialtest.Cable={}
+
+function industrialtest.Cable.onConstruct(self,pos)
 	local connections=industrialtest.api.getConnections(pos)
 	for _,conn in ipairs(connections) do
 		local meta=minetest.get_meta(conn)
 		if industrialtest.api.isNetworkMaster(meta) then
 			industrialtest.api.createNetworkMapForNode(conn)
+			local networkNode=minetest.get_node(conn)
+			local def=minetest.registered_nodes[networkNode.name]
+			if def and def._industrialtest_self then
+				def._industrialtest_self:triggerIfNeeded(conn)
+			else
+				-- Support for bare definitions that don't use industrialtest pseudo-OOP
+				minetest.get_node_timer(conn):start(industrialtest.config.updateDelay)
+			end
 		else
 			local networks=industrialtest.api.isAttachedToNetwork(meta)
 			if networks then
 				for _,network in ipairs(networks) do
 					industrialtest.api.createNetworkMapForNode(network)
-					minetest.get_node_timer(network):start(industrialtest.updateDelay)
+					local networkNode=minetest.get_node(network)
+					local def=minetest.registered_nodes[networkNode.name]
+					if def and def._industrialtest_self then
+						def._industrialtest_self:triggerIfNeeded(network)
+					else
+						-- Support for bare definitions that don't use industrialtest pseudo-OOP
+						minetest.get_node_timer(network):start(industrialtest.config.updateDelay)
+					end
 				end
 			end
 		end
 	end
 end
 
-cable.onDestruct=function(pos)
+function industrialtest.Cable.onDestruct(self,pos)
 	local meta=minetest.get_meta(pos)
 	local networks=industrialtest.api.isAttachedToNetwork(meta)
 	if networks then
@@ -45,14 +61,16 @@ cable.onDestruct=function(pos)
 	end
 end
 
-local function registerCable(name,displayName,size,flow,registerInsulated)
+function industrialtest.Cable.createDefinitionTable(self,description,inventoryImage,tile,insulated)
-	local definition={
+	local size=(insulated and self.size+0.02 or self.size)
-		description=S(displayName.." Cable"),
+	local def={
-		inventory_image="industrialtest_"..name.."_cable_inv.png",
+		description=description,
-		tiles={"industrialtest_"..name.."_cable.png"},
+		inventory_image=inventoryImage,
-		wield_image="industrialtest_"..name.."_cable_inv.png",
+		wield_image=inventoryImage,
+		tiles={tile},
 		paramtype="light",
 		sunlight_propagates=true,
+		use_texture_alpha=(self.transparent and "clip" or "opaque"),
 		drawtype="nodebox",
 		node_box={
 			type="connected",
@@ -118,39 +136,67 @@ local function registerCable(name,displayName,size,flow,registerInsulated)
 			"group:_industrialtest_hasPowerOutput",
 			"group:_industrialtest_cable"
 		},
-		on_construct=cable.onConstruct,
+		on_construct=function(pos)
-		on_destruct=cable.onDestruct,
+			self:onConstruct(pos)
-		_industrialtest_cableFlow=flow
+		end,
+		on_destruct=function(pos)
+			self:onDestruct(pos)
+		end,
+		_industrialtest_cableFlow=self.flow
 	}
+
 	if industrialtest.mtgAvailable then
-		definition.groups={
+		def.groups={
 			cracky=1,
 			level=1,
 			oddly_breakable_by_hand=1
 		}
-		definition.sound=default.node_sound_metal_defaults()
+		def.sound=default.node_sound_metal_defaults()
 	elseif industrialtest.mclAvailable then
-		definition.groups={
+		def.groups={
 			handy=1,
 			pickaxey=1
 		}
-		definition._mcl_blast_resistance=1
+		def._mcl_blast_resistance=1
-		definition._mcl_hardness=0.5
+		def._mcl_hardness=0.5
-		definition.sound=mcl_sounds.node_sound_metal_defaults()
+		def.sound=mcl_sounds.node_sound_metal_defaults()
 	end
-	definition.groups._industrialtest_cable=1
+	def.groups._industrialtest_cable=1
-	minetest.register_node("industrialtest:"..name.."_cable",definition)
+	if insulated then
-	if registerInsulated then
+		def.groups._industrialtest_insulatedCable=1
-		definition=table.copy(definition)
+	end
-		definition.description=S("Insulated "..displayName.." Cable")
+
-		definition.inventory_image="industrialtest_insulated_"..name.."_cable_inv.png"
+	return def
-		definition.tiles={"industrialtest_insulated_"..name.."_cable.png"}
+end
-		definition.wield_image="industrialtest_insulated_"..name.."_cable_inv.png"
+
-		minetest.register_node("industrialtest:insulated_"..name.."_cable",definition)
+function industrialtest.Cable.register(self)
+	local def=self:createDefinitionTable(self.description,self.inventoryImage,self.tile,self.safe)
+	minetest.register_node(self.name,def)
+
+	if self.insulated then
+		def=self:createDefinitionTable(self.insulated.description,self.insulated.inventoryImage,self.insulated.tile,true)
+		minetest.register_node(self.insulated.name,def)
 	end
 end
 
-registerCable("tin","Tin",0.19,industrialtest.api.lvPowerFlow,true)
+industrialtest.TinCable=table.copy(industrialtest.Cable)
+industrialtest.internal.unpackTableInto(industrialtest.TinCable,{
+	name="industrialtest:tin_cable",
+	description=S("Tin Cable"),
+	inventoryImage="industrialtest_tin_cable_inv.png",
+	tile="industrialtest_tin_cable.png",
+	size=0.19,
+	flow=industrialtest.api.lvPowerFlow,
+	insulated={
+		name="industrialtest:insulated_tin_cable",
+		description=S("Insulated Tin Cable"),
+		inventoryImage="industrialtest_insulated_tin_cable_inv.png",
+		tile="industrialtest_insulated_tin_cable.png"
+	}
+})
+
+industrialtest.TinCable:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:tin_cable 6",
@@ -158,6 +204,7 @@ minetest.register_craft({
 		{industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.tinIngot}
 	}
 })
+
 minetest.register_craft({
 	type="shapeless",
 	output="industrialtest:insulated_tin_cable",
@@ -166,6 +213,7 @@ minetest.register_craft({
 		industrialtest.elementKeys.rubber
 	}
 })
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:insulated_tin_cable 6",
@@ -175,13 +223,31 @@ minetest.register_craft({
 		{industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber}
 	}
 })
+
 industrialtest.api.registerCableFormerRecipe({
 	output="industrialtest:tin_cable 12",
 	recipe=industrialtest.elementKeys.tinIngot,
 	time=1
 })
 
-registerCable("copper","Copper",0.15,industrialtest.api.mvPowerFlow,true)
+industrialtest.CopperCable=table.copy(industrialtest.Cable)
+industrialtest.internal.unpackTableInto(industrialtest.CopperCable,{
+	name="industrialtest:copper_cable",
+	description=S("Copper Cable"),
+	inventoryImage="industrialtest_copper_cable_inv.png",
+	tile="industrialtest_copper_cable.png",
+	size=0.15,
+	flow=industrialtest.api.mvPowerFlow,
+	insulated={
+		name="industrialtest:insulated_copper_cable",
+		description=S("Insulated Copper Cable"),
+		inventoryImage="industrialtest_insulated_copper_cable_inv.png",
+		tile="industrialtest_insulated_copper_cable.png"
+	}
+})
+
+industrialtest.CopperCable:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:copper_cable 6",
@@ -189,6 +255,7 @@ minetest.register_craft({
 		{industrialtest.elementKeys.copperIngot,industrialtest.elementKeys.copperIngot,industrialtest.elementKeys.copperIngot}
 	}
 })
+
 minetest.register_craft({
 	type="shapeless",
 	output="industrialtest:insulated_copper_cable",
@@ -197,6 +264,7 @@ minetest.register_craft({
 		industrialtest.elementKeys.rubber
 	}
 })
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:insulated_copper_cable 6",
@@ -206,12 +274,30 @@ minetest.register_craft({
 		{industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber}
 	}
 })
+
 industrialtest.api.registerCableFormerRecipe({
 	output="industrialtest:copper_cable 12",
 	recipe=industrialtest.elementKeys.copperIngot
 })
 
-registerCable("gold","Gold",0.15,industrialtest.api.hvPowerFlow,true)
+industrialtest.GoldCable=table.copy(industrialtest.Cable)
+industrialtest.internal.unpackTableInto(industrialtest.GoldCable,{
+	name="industrialtest:gold_cable",
+	description=S("Gold Cable"),
+	inventoryImage="industrialtest_gold_cable_inv.png",
+	tile="industrialtest_gold_cable.png",
+	size=0.15,
+	flow=industrialtest.api.hvPowerFlow,
+	insulated={
+		name="industrialtest:insulated_gold_cable",
+		description=S("Insulated Gold Cable"),
+		inventoryImage="industrialtest_insulated_gold_cable_inv.png",
+		tile="industrialtest_insulated_gold_cable.png"
+	}
+})
+
+industrialtest.GoldCable:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:gold_cable 6",
@@ -219,6 +305,7 @@ minetest.register_craft({
 		{industrialtest.elementKeys.goldIngot,industrialtest.elementKeys.goldIngot,industrialtest.elementKeys.goldIngot}
 	}
 })
+
 minetest.register_craft({
 	type="shapeless",
 	output="industrialtest:insulated_gold_cable",
@@ -227,6 +314,7 @@ minetest.register_craft({
 		industrialtest.elementKeys.rubber
 	}
 })
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:insulated_gold_cable 6",
@@ -236,12 +324,30 @@ minetest.register_craft({
 		{industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber}
 	}
 })
+
 industrialtest.api.registerCableFormerRecipe({
 	output="industrialtest:gold_cable 12",
 	recipe=industrialtest.elementKeys.goldIngot
 })
 
-registerCable("iron","Iron",0.15,industrialtest.api.evPowerFlow,true)
+industrialtest.IronCable=table.copy(industrialtest.Cable)
+industrialtest.internal.unpackTableInto(industrialtest.IronCable,{
+	name="industrialtest:iron_cable",
+	description=S("Iron Cable"),
+	inventoryImage="industrialtest_iron_cable_inv.png",
+	tile="industrialtest_iron_cable.png",
+	size=0.15,
+	flow=industrialtest.api.evPowerFlow,
+	insulated={
+		name="industrialtest:insulated_iron_cable",
+		description=S("Insulated Iron Cable"),
+		inventoryImage="industrialtest_insulated_iron_cable_inv.png",
+		tile="industrialtest_insulated_iron_cable.png"
+	}
+})
+
+industrialtest.IronCable:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:iron_cable 6",
@@ -249,6 +355,7 @@ minetest.register_craft({
 		{"industrialtest:refined_iron_ingot","industrialtest:refined_iron_ingot","industrialtest:refined_iron_ingot"}
 	}
 })
+
 minetest.register_craft({
 	type="shapeless",
 	output="industrialtest:insulated_iron_cable",
@@ -257,6 +364,7 @@ minetest.register_craft({
 		industrialtest.elementKeys.rubber
 	}
 })
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:insulated_iron_cable 6",
@@ -266,13 +374,27 @@ minetest.register_craft({
 		{industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber,industrialtest.elementKeys.rubber}
 	}
 })
+
 industrialtest.api.registerCableFormerRecipe({
 	output="industrialtest:iron_cable 12",
 	recipe="industrialtest:refined_iron_ingot",
 	time=3
 })
 
-registerCable("glass_fibre","Glass Fibre",0.15,industrialtest.api.ivPowerFlow,false)
+industrialtest.GlassFibreCable=table.copy(industrialtest.Cable)
+industrialtest.internal.unpackTableInto(industrialtest.GlassFibreCable,{
+	name="industrialtest:glass_fibre_cable",
+	description=S("Glass Fibre Cable"),
+	inventoryImage="industrialtest_glass_fibre_cable_inv.png",
+	transparent=true,
+	tile="industrialtest_glass_fibre_cable.png",
+	safe=true,
+	size=0.12,
+	flow=industrialtest.api.ivPowerFlow
+})
+
+industrialtest.GlassFibreCable:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:glass_fibre_cable 4",
@@ -283,3 +405,52 @@ minetest.register_craft({
 	}
 })
 -- TODO: Add glass fibre cable craft with silver ingot
+
+if industrialtest.config.electrocution then
+	local electrocutionDelta=0
+	minetest.register_globalstep(function(dtime)
+		electrocutionDelta=electrocutionDelta+dtime
+		if electrocutionDelta<industrialtest.config.updateDelay then
+			return
+		end
+		electrocutionDelta=0
+
+		local offsets={
+			vector.new(0,0,0),
+			vector.new(-0.7,0,0),
+			vector.new(-0.7,1,0),
+			vector.new(0,1,0),
+			vector.new(0.7,0,0),
+			vector.new(0.7,1,0),
+			vector.new(0,0,-0.7),
+			vector.new(0,1,-0.7),
+			vector.new(0,0,0.7),
+			vector.new(0,1,0.7)
+		}
+
+		local players=minetest.get_connected_players()
+		for _,player in ipairs(players) do
+			local pos=player:get_pos()
+			for _,offset in ipairs(offsets) do
+				local nodePos=vector.add(pos,offset)
+				local node=minetest.get_node(nodePos)
+				local def=minetest.registered_nodes[node.name]
+				if def and def.groups and def.groups._industrialtest_cable and not def.groups._industrialtest_insulatedCable then
+					local meta=minetest.get_meta(pos)
+					local networks=industrialtest.api.isAttachedToNetwork(meta)
+					if networks then
+						local current=0
+						for _,network in ipairs(networks) do
+							current=current+industrialtest.api.getFlowingCurrent(network)
+						end
+						if current>0 then
+							local removed=math.ceil(current/500)
+							player:set_hp(player:get_hp()-removed,"electrocution")
+							break
+						end
+					end
+				end
+			end
+		end
+	end)
+end

compat/logistica.lua

@@ -48,14 +48,17 @@ for _,name in ipairs(logistica.group_get_all_nodes_for_group("injectors")) do
 	minetest.override_item(name,override)
 end
 
-local function startNodeTimer(pos)
+local function afterLogisticaAction(pos)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	local def=minetest.registered_nodes[minetest.get_node(pos).name]
+	if def and def._industrialtest_self then
+		def._industrialtest_self:triggerIfNeeded(pos)
+	end
 end
 
 local function addLogisticaCompatibility(name)
 	local override={
-		_logistica_afterRequesterItemstackInsert=startNodeTimer,
+		_logistica_afterRequesterItemstackInsert=afterLogisticaAction,
-		_logistica_afterInjectorItemstackTake=startNodeTimer
+		_logistica_afterInjectorItemstackTake=afterLogisticaAction
 	}
 	minetest.override_item(name,override)
 end

compat/mesecons.lua

@@ -27,16 +27,15 @@ local override={
 				meta:set_int("maintainSpeed",1)
 
 				local def=minetest.registered_nodes[node.name]
-				def._industrialtest_updateFormspec(pos)
+				def._industrialtest_self:updateFormspec(pos)
-
+				def._industrialtest_self:trigger(pos)
-				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
 			end,
 			action_off=function(pos,node)
 				local meta=minetest.get_meta(pos)
 				meta:set_int("maintainSpeed",0)
 
 				local def=minetest.registered_nodes[node.name]
-				def._industrialtest_updateFormspec(pos)
+				def._industrialtest_self:updateFormspec(pos)
 			end
 		}
 	}
@@ -69,13 +68,13 @@ override={
 				meta:set_int("stateChanged",1)
 
 				local def=minetest.registered_nodes[node.name]
-				def._industrialtest_updateFormspec(pos)
+				def._industrialtest_self:updateFormspec(pos)
 
 				if isChamber then
-					def._industrialtest_synchronizeToChamber(originalPos)
+					def._industrialtest_self:synchronizeToChamber(originalPos)
 				end
 
-				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+				def._industrialtest_self:triggerIfNeeded(pos)
 			end,
 			action_off=function(pos,node)
 				local isChamber=node.name=="industrialtest:nuclear_reactor_chamber"
@@ -107,10 +106,10 @@ override={
 				meta:set_int("stateChanged",1)
 
 				local def=minetest.registered_nodes[node.name]
-				def._industrialtest_updateFormspec(pos)
+				def._industrialtest_self:updateFormspec(pos)
 
 				if isChamber then
-					def._industrialtest_synchronizeToChamber(originalPos)
+					def._industrialtest_self:synchronizeToChamber(originalPos)
 				end
 			end
 		}

compat/pipeworks.lua

@@ -41,7 +41,10 @@ local function addPipeworksCompatibility(name,sides,inputInventory)
 					return nil
 				end
 				local result=inv:add_item(listname,stack)
-				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+				local def=minetest.registered_nodes[node.name]
+				if def and def._industrialtest_self then
+					def._industrialtest_self:triggerIfNeeded(pos)
+				end
 				return result
 			end,
 			can_insert=function(pos,node,stack,direction)
@@ -53,6 +56,16 @@ local function addPipeworksCompatibility(name,sides,inputInventory)
 				end
 				return inv:room_for_item(listname,stack)
 			end,
+			remove_items=function(pos,node,stack,direction,count,listname)
+				local meta=minetest.get_meta(pos)
+				local inv=meta:get_inventory()
+				inv:remove_item(listname,stack)
+				local def=minetest.registered_nodes[node.name]
+				if def and def._industrialtest_self then
+					def._industrialtest_self:triggerIfNeeded(pos)
+				end
+				return stack
+			end,
 			input_inventory=inputInventory,
 			connect_sides={
 				left=1,
@@ -157,7 +170,8 @@ local override={
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			local result=inv:add_item(listname,stack)
-			minetest.registered_nodes["industrialtest:nuclear_reactor"].on_metadata_inventory_put(pos)
+			industrialtest.Reactor.synchronizeChambers(pos)
+			industrialtest.Reactor:triggerIfNeeded(pos)
 			return result
 		end,
 		can_insert=function(pos,node,stack,direction)
@@ -171,6 +185,14 @@ local override={
 			local inv=meta:get_inventory()
 			return inv:room_for_item(listname,stack)
 		end,
+		remove_items=function(pos,node,stack,direction,count,listname)
+			local meta=minetest.get_meta(pos)
+			local inv=meta:get_inventory()
+			inv:remove_item(listname,stack)
+			industrialtest.Reactor.synchronizeChambers(pos)
+			industrialtest.Reactor:triggerIfNeeded(pos)
+			return stack
+		end,
 		input_inventory="fuel",
 		connect_sides={
 			left=1,
@@ -207,10 +229,22 @@ override.tube.insert_object=function(pos,node,stack,direction)
 	local meta=minetest.get_meta(pos)
 	local inv=meta:get_inventory()
 	local result=inv:add_item(listname,stack)
-	minetest.registered_nodes["industrialtest:nuclear_reactor_chamber"].on_metadata_inventory_put(pos)
+	industrialtest.Reactor:synchronizeToChamber(pos)
+	local reactorPos=minetest.deserialize(meta:get_string("reactor"))
+	industrialtest.Reactor:triggerIfNeeded(reactorPos)
 	return result
 end
 
+override.tube.remove_items=function(pos,node,stack,direction,count,listname)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	inv:remove_item(listname,stack)
+	industrialtest.Reactor:synchronizeToChamber(pos)
+	local reactorPos=minetest.deserialize(meta:get_string("reactor"))
+	industrialtest.Reactor:triggerIfNeeded(reactorPos)
+	return stack
+end
+
 override.after_place_node_old=def.after_place_node
 override.after_place_node=function(pos)
 	minetest.registered_nodes["industrialtest:nuclear_reactor_chamber"].after_place_node_old(pos)
@@ -269,20 +303,21 @@ override={
 			if direction.y==1 then
 				listname="powerStorage"
 			elseif direction.y==-1 then
-				listname="fuel"
+				listname="src"
 			else
-				listname="target"
+				listname="dst"
 			end
 			local def=stack:get_definition()
 			if (listname=="powerStorage" and not industrialtest.api.hasPowerStorage(stack:get_meta())) or
-				(listname=="fuel" and (not def.groups or not def.groups._industrialtest_fuel)) or
+				(listname=="src" and (not def.groups or not def.groups._industrialtest_fuel)) or
-				(listname=="target" and (not def.groups or not def.groups._industrialtest_fueled)) then
+				(listname=="dst" and (not def.groups or not def.groups._industrialtest_fueled)) then
 				return nil
 			end
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			local result=inv:add_item(listname,stack)
-			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+			local nodeDef=minetest.registered_nodes[node.name]
+			nodeDef._industrialtest_self:triggerIfNeeded(pos)
 			return result
 		end,
 		can_insert=function(pos,node,stack,direction)
@@ -290,21 +325,28 @@ override={
 			if direction.y==1 then
 				listname="powerStorage"
 			elseif direction.y==-1 then
-				listname="fuel"
+				listname="src"
 			else
-				listname="target"
+				listname="dst"
 			end
 			local def=stack:get_definition()
 			if (listname=="powerStorage" and not industrialtest.api.hasPowerStorage(stack:get_meta())) or
-				(listname=="fuel" and (not def.groups or not def.groups._industrialtest_fuel)) or
+				(listname=="src" and (not def.groups or not def.groups._industrialtest_fuel)) or
-				(listname=="target" and (not def.groups or not def.groups._industrialtest_fueled)) then
+				(listname=="dst" and (not def.groups or not def.groups._industrialtest_fueled)) then
 				return false
 			end
 			local meta=minetest.get_meta(pos)
 			local inv=meta:get_inventory()
 			return inv:room_for_item(listname,stack)
 		end,
-		input_inventory="target",
+		remove_items=function(pos,node,stack,direction,count,listname)
+			local meta=minetest.get_meta(pos)
+			local inv=meta:get_inventory()
+			inv:remove_item(listname,stack)
+			industrialtest.CanningMachine:triggerIfNeeded(pos)
+			return stack
+		end,
+		input_inventory="dst",
 		connect_sides={
 			left=1,
 			right=1,

compatibility.lua

@@ -450,6 +450,7 @@ if industrialtest.mclAvailable then
 	industrialtest.elementKeys.stick="mcl_core:stick"
 	industrialtest.elementKeys.flint="mcl_core:flint"
 	industrialtest.elementKeys.snowball="mcl_throwing:snowball"
+	industrialtest.elementKeys.snowBlock="mcl_core:snowblock"
 	industrialtest.elementKeys.string="mcl_mobitems:string"
 	industrialtest.elementKeys.junglePlanks="mcl_core:junglewood"
 	industrialtest.elementKeys.wood="mcl_core:tree"
@@ -505,6 +506,7 @@ if industrialtest.mclAvailable then
 	industrialtest.elementKeys.dryShrub="mcl_core:deadbush"
 	industrialtest.elementKeys.cactus="mcl_core:cactus"
 	industrialtest.elementKeys.gunpowder="mcl_mobitems:gunpowder"
+	industrialtest.elementKeys.chest="mcl_chests:chest_small"
 	industrialtest.elementKeys.groupSapling="group:sapling"
 	industrialtest.elementKeys.groupLeaves="group:leaves"
 	industrialtest.elementKeys.stickyResin=(industrialtest.mods.mclRubber and "mcl_rubber:rubber_raw" or "industrialtest:sticky_resin")
@@ -690,6 +692,7 @@ elseif industrialtest.mtgAvailable then
 	industrialtest.elementKeys.stick="default:stick"
 	industrialtest.elementKeys.flint="default:flint"
 	industrialtest.elementKeys.snowball="default:snow"
+	industrialtest.elementKeys.snowBlock="default:snowblock"
 	industrialtest.elementKeys.blueDye="dye:blue"
 	industrialtest.elementKeys.yellowDust="dye:yellow"
 	industrialtest.elementKeys.bucket="bucket:bucket_empty"
@@ -738,6 +741,7 @@ elseif industrialtest.mtgAvailable then
 	industrialtest.elementKeys.dryShrub="default:dry_shrub"
 	industrialtest.elementKeys.cactus="default:cactus"
 	industrialtest.elementKeys.gunpowder="tnt:gunpowder"
+	industrialtest.elementKeys.chest="default:chest"
 	industrialtest.elementKeys.groupSapling="group:sapling"
 	industrialtest.elementKeys.groupLeaves="group:leaves"
 	industrialtest.elementKeys.stickyResin="industrialtest:sticky_resin"

craftitems.lua

@@ -41,75 +41,6 @@ local colors={
 	coolant="#188676ff"
 }
 
--- Power storage items
-minetest.register_tool("industrialtest:re_battery",{
-	description=S("RE-Battery"),
-	inventory_image="industrialtest_re_battery.png",
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=7000,
-	_industrialtest_powerFlow=industrialtest.api.lvPowerFlow
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:re_battery",
-	recipe={
-		{"","industrialtest:insulated_tin_cable",""},
-		{industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.tinIngot},
-		{industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.tinIngot}
-	}
-})
-
-minetest.register_tool("industrialtest:advanced_re_battery",{
-	description=S("Advanced RE-Battery"),
-	inventory_image="industrialtest_advanced_re_battery.png",
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=100000,
-	_industrialtest_powerFlow=industrialtest.api.mvPowerFlow
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:advanced_re_battery",
-	recipe={
-		{"industrialtest:insulated_copper_cable",industrialtest.elementKeys.bronzeIngot,"industrialtest:insulated_copper_cable"},
-		{industrialtest.elementKeys.bronzeIngot,"industrialtest:sulfur_dust",industrialtest.elementKeys.bronzeIngot},
-		{industrialtest.elementKeys.bronzeIngot,"industrialtest:lead_dust",industrialtest.elementKeys.bronzeIngot}
-	}
-})
-
-minetest.register_tool("industrialtest:energy_crystal",{
-	description=S("Energy Crystal"),
-	inventory_image="industrialtest_energy_crystal.png",
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=100000,
-	_industrialtest_powerFlow=industrialtest.api.hvPowerFlow
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:energy_crystal",
-	recipe={
-		{industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier},
-		{industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.diamond,industrialtest.elementKeys.powerCarrier},
-		{industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier}
-	}
-})
-
-minetest.register_tool("industrialtest:lapotron_crystal",{
-	description=S("Lapotron Crystal"),
-	inventory_image="industrialtest_lapotron_crystal.png",
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=1000000,
-	_industrialtest_powerFlow=industrialtest.api.evPowerFlow
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:lapotron_crystal",
-	recipe={
-		{industrialtest.elementKeys.blueDye,"industrialtest:electronic_circuit",industrialtest.elementKeys.blueDye},
-		{industrialtest.elementKeys.blueDye,"industrialtest:energy_crystal",industrialtest.elementKeys.blueDye},
-		{industrialtest.elementKeys.blueDye,"industrialtest:electronic_circuit",industrialtest.elementKeys.blueDye}
-	}
-})
-
 -- Other resources
 minetest.register_craftitem("industrialtest:refined_iron_ingot",{
 	description=S("Refined Iron Ingot"),
@@ -871,38 +802,3 @@ industrialtest.api.registerCompressorRecipe({
 	recipe="industrialtest:plantball",
 	time=5
 })
-
-minetest.register_tool("industrialtest:fuel_can",{
-	description=S("Fuel Can"),
-	inventory_image="industrialtest_fuel_can.png",
-	groups={
-		_industrialtest_fueled=1,
-		_industrialtest_fuel=1,
-		_industrialtest_fluidStorage=1
-	},
-	_industrialtest_fluidCapacity=10000
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:fuel_can",
-	recipe={
-		{"","industrialtest:tin_plate","industrialtest:tin_plate"},
-		{"industrialtest:tin_plate","","industrialtest:tin_plate"},
-		{"industrialtest:tin_plate","industrialtest:tin_plate","industrialtest:tin_plate"}
-	}
-})
-
--- Item callbacks
-minetest.register_on_player_inventory_action(function(player,action,inventory,info)
-	if action=="put" then
-		if industrialtest.api.preparePowerStorageItem(info.stack) or industrialtest.api.prepareToolItem(info.stack) or industrialtest.api.prepareFluidStorageItem(info.stack) then
-			inventory:set_stack(info.listname,info.index,info.stack)
-		end
-	end
-end)
-minetest.register_on_craft(function(itemstack)
-	if industrialtest.api.preparePowerStorageItem(itemstack) or industrialtest.api.prepareToolItem(itemstack) then
-		return
-	end
-	industrialtest.api.prepareFluidStorageItem(itemstack)
-end)

init.lua

@@ -19,9 +19,12 @@ local modpath=minetest.get_modpath("industrialtest")
 -- table with global functions, variables etc
 industrialtest={}
 
--- Initial constants
+-- Settings
-industrialtest.updateDelay=1 -- Note: Make this value smaller to make machines update more frequently (it may make server more laggy)
+industrialtest.config={
-industrialtest.developerMode=true -- Enables additional utils useful when developing mod
+	updateDelay=tonumber(minetest.settings:get("industrialtest.updateDelay") or "1"),
+	electrocution=minetest.settings:get_bool("industrialtest.electrocution",true),
+	developerMode=minetest.settings:get_bool("industrialtest.developerMode",false)
+}
 
 -- Others
 industrialtest.random=PseudoRandom(os.time())
@@ -36,7 +39,6 @@ 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/machine.lua")
 dofile(modpath.."/machines/activated_machine.lua")
@@ -55,6 +57,7 @@ dofile(modpath.."/machines/induction_furnace.lua")
 dofile(modpath.."/machines/iron_furnace.lua")
 dofile(modpath.."/machines/macerator.lua")
 dofile(modpath.."/machines/mass_fabricator.lua")
+dofile(modpath.."/machines/miner.lua")
 dofile(modpath.."/machines/nuclear_reactor.lua")
 dofile(modpath.."/machines/power_storage.lua")
 dofile(modpath.."/machines/recycler.lua")
@@ -65,14 +68,26 @@ dofile(modpath.."/machines/solar_panel_generator.lua")
 dofile(modpath.."/machines/wind_mill.lua")
 
 dofile(modpath.."/tools/common.lua")
+dofile(modpath.."/tools/item.lua")
+dofile(modpath.."/tools/electric_item.lua")
+dofile(modpath.."/tools/electric_armor.lua")
+dofile(modpath.."/tools/fluid_container_item.lua")
+dofile(modpath.."/tools/tool.lua")
+dofile(modpath.."/tools/gear_tool.lua")
+dofile(modpath.."/tools/electric_tool.lua")
+dofile(modpath.."/tools/activated_electric_tool.lua")
+dofile(modpath.."/tools/electric_gear_tool.lua")
 dofile(modpath.."/tools/batpack.lua")
 dofile(modpath.."/tools/electric_chainsaw.lua")
 dofile(modpath.."/tools/electric_drill.lua")
 dofile(modpath.."/tools/electric_hoe.lua")
 dofile(modpath.."/tools/electric_saber.lua")
+dofile(modpath.."/tools/fluid_storage.lua")
 dofile(modpath.."/tools/jetpack.lua")
 dofile(modpath.."/tools/mining_laser.lua")
 dofile(modpath.."/tools/nano_suit.lua")
+dofile(modpath.."/tools/power_storage.lua")
+dofile(modpath.."/tools/scanner.lua")
 dofile(modpath.."/tools/solar_helmet.lua")
 dofile(modpath.."/tools/static_boots.lua")
 dofile(modpath.."/tools/treetap.lua")
@@ -82,7 +97,7 @@ dofile(modpath.."/tools/wrench.lua")
 dofile(modpath.."/upgrades.lua")
 dofile(modpath.."/craftitems.lua")
 dofile(modpath.."/nodes.lua")
-if industrialtest.developerMode then
+if industrialtest.config.developerMode then
 	dofile(modpath.."/utils.lua")
 end
 dofile(modpath.."/cables.lua")

machines/activated_machine.lua

@@ -66,7 +66,7 @@ function industrialtest.ActivatedMachine.activate(self,pos)
 		param2=minetest.get_node(pos).param2
 	})
 	self:afterActivation(pos)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	minetest.get_node_timer(pos):start(industrialtest.config.updateDelay)
 end
 
 function industrialtest.ActivatedMachine.deactivate(self,pos)
@@ -75,7 +75,7 @@ function industrialtest.ActivatedMachine.deactivate(self,pos)
 		param2=minetest.get_node(pos).param2
 	})
 	self:afterDeactivation(pos)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	minetest.get_node_timer(pos):start(industrialtest.config.updateDelay)
 end
 
 function industrialtest.ActivatedMachine.shouldActivate(self,pos)

machines/canning_machine.lua

@@ -99,7 +99,7 @@ function industrialtest.CanningMachine.getFormspec(self,pos)
 	return parentFormspec..table.concat(formspec,"")
 end
 
-function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count)
+function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
 	if toList=="src" then
 		local inv=minetest.get_meta(pos):get_inventory()
 		local itemstack=inv:get_stack(fromList,fromIndex)
@@ -112,10 +112,13 @@ function industrialtest.CanningMachine.allowMetadataInventoryMove(self,pos,fromL
 		local def=itemstack:get_definition()
 		return (def.groups and def.groups._industrialtest_fueled) and count or 0
 	end
-	return math.min(count,industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,count))
+	if toList=="leftover" then
+		return 0
+	end
+	return math.min(count,industrialtest.ActivatedElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count))
 end
 
-function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listname,index,stack)
+function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player)
 	if listname=="src" then
 		local def=stack:get_definition()
 		return (def.groups and def.groups._industrialtest_fuel) and stack:get_count() or 0
@@ -124,19 +127,22 @@ function industrialtest.CanningMachine.allowMetadataInventoryPut(self,pos,listna
 		local def=stack:get_definition()
 		return (def.groups and def.groups._industrialtest_fueled) and stack:get_count() or 0
 	end
-	return math.min(stack:get_count(),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack))
+	if listname=="leftover" then
+		return 0
+	end
+	return math.min(stack:get_count(),industrialtest.ActivatedElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player))
 end
 
-function industrialtest.CanningMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
+function industrialtest.CanningMachine.allowMetadataInventoryTake(self,pos,listname,index,stack,player)
 	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)
 	if ((listname=="src" and stack:get_count()==fuelSlot:get_count()) or (listname=="dst" and stack:get_count()==targetSlot:get_count())) and meta:get_float("srcTime")>0 then
 		meta:set_float("srcTime",0)
-		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		self:updateFormspec(pos)
 	end
-	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
+	return industrialtest.ActivatedElectricMachine.allowMetadataInventoryTake(self,pos,listname,index,stack,player)
 end
 
 function industrialtest.CanningMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
@@ -147,12 +153,12 @@ function industrialtest.CanningMachine.onMetadataInventoryMove(self,pos,fromList
 	local targetSlot=inv:get_stack("dst",1)
 	if ((fromList=="src" and count==fuelSlot:get_count()) or (fromList=="dst" and count==targetSlot:get_count())) and meta:get_float("srcTime")>0 then
 		meta:set_float("srcTime",0)
-		meta:set_string("formspec",canningMachine.getFormspec(pos))
+		self:updateFormspec(pos)
 	end
 end
 
-function industrialtest.CanningMachine.onMetadataInventoryPut(self,pos)
+function industrialtest.CanningMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	self:triggerIfNeeded(pos)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 
@@ -182,7 +188,7 @@ function industrialtest.CanningMachine.shouldDeactivate(self,pos)
 	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
+		targetMeta:get_int("industrialtest.fluidCapacity")-targetMeta:get_int("industrialtest.fluidAmount")<(fuelDef._industrialtest_fuelAmount or 0) or
 		(fuelDef._industrialtest_emptyVariant and not leftoverSlot:item_fits(ItemStack(fuelDef._industrialtest_emptyVariant)))
 end
 

machines/chargepad.lua

@@ -291,7 +291,7 @@ industrialtest.MFSUChargepad:register()
 minetest.register_abm({
 	label="Chargepad updating",
 	nodenames=industrialtest.internal.chargepads,
-	interval=industrialtest.updateDelay,
+	interval=industrialtest.config.updateDelay,
 	chance=1,
 	action=function(pos,node)
 		local def=minetest.registered_nodes[node.name]

machines/electric_machine.lua

@@ -32,7 +32,7 @@ function industrialtest.ElectricMachine.onConstruct(self,pos)
 					def._industrialtest_self:flowPower(conn)
 				else
 					-- Support for bare definitions that don't use industrialtest pseudo-OOP
-					minetest.get_node_timer(conn):start(industrialtest.updateDelay)
+					minetest.get_node_timer(conn):start(industrialtest.config.updateDelay)
 				end
 			else
 				local def=minetest.registered_nodes[minetest.get_node(conn).name]
@@ -46,7 +46,7 @@ function industrialtest.ElectricMachine.onConstruct(self,pos)
 								def._industrialtest_self:flowPower(network)
 							else
 								-- Support for bare definitions that don't use industrialtest pseudo-OOP
-								minetest.get_node_timer(network):start(industrialtest.updateDelay)
+								minetest.get_node_timer(network):start(industrialtest.config.updateDelay)
 							end
 						end
 					end
@@ -177,7 +177,7 @@ function industrialtest.ElectricMachine.requestPower(self,pos)
 				def._industrialtest_self:flowPower(network)
 			else
 				-- Support for bare definitions that don't use industrialtest pseudo-OOP
-				minetest.get_node_timer(network):start(industrialtest.updateDelay)
+				minetest.get_node_timer(network):start(industrialtest.config.updateDelay)
 			end
 		end
 	end

machines/fluid_generator.lua

@@ -167,6 +167,13 @@ function industrialtest.GeothermalGenerator.onConstruct(self,pos)
 	industrialtest.ActivatedElectricMachine.onConstruct(self,pos)
 end
 
+function industrialtest.GeothermalGenerator.update(self,pos,elapsed,meta,inv)
+	local srcSlot=inv:get_stack("src",1)
+	local dstSlot=inv:get_stack("dst",1)
+	local shouldUpdateFormspec=takeFuelFromItem(self,pos)
+	return (not srcSlot:is_empty() and dstSlot:get_free_space()>0 and not industrialtest.api.isFluidStorageFull(meta)),shouldUpdateFormspec
+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
@@ -191,16 +198,22 @@ end
 
 function industrialtest.GeothermalGenerator.shouldActivate(self,pos)
 	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)
 	local fluidAmount=meta:get_float("fluidAmount")
 
-	return fluidAmount>0 and not industrialtest.api.isFullyCharged(meta)
+	return (fluidAmount>0 or (not srcSlot:is_empty() and dstSlot:get_free_space()>0)) and not industrialtest.api.isFullyCharged(meta)
 end
 
 function industrialtest.GeothermalGenerator.shouldDeactivate(self,pos)
 	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)
 	local fluidAmount=meta:get_float("fluidAmount")
 
-	return fluidAmount<=0 or industrialtest.api.isFullyCharged(meta)
+	return (fluidAmount<=0 and (srcSlot:is_empty() or dstSlot:get_free_space()==0)) or industrialtest.api.isFullyCharged(meta)
 end
 
 function industrialtest.GeothermalGenerator.activeUpdate(self,pos,elapsed)
@@ -270,9 +283,12 @@ end
 
 function industrialtest.WaterMill.canUpdate(self,pos)
 	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)
 	local fluidAmount=meta:get_float("fluidAmount")
 
-	return fluidAmount>0 and not industrialtest.api.isFullyCharged(meta)
+	return (fluidAmount>0 or (not srcSlot:is_empty() and dstSlot:get_free_space()>0)) and not industrialtest.api.isFullyCharged(meta)
 end
 
 function industrialtest.WaterMill.update(self,pos,elapsed)
@@ -350,7 +366,7 @@ minetest.register_abm({
 	label="Water Mill generating",
 	nodenames={"industrialtest:water_mill"},
 	neighbors=neighbors,
-	interval=industrialtest.updateDelay,
+	interval=industrialtest.config.updateDelay,
 	chance=1,
 	action=function(pos)
 		industrialtest.WaterMill:action(pos)

machines/generator.lua

@@ -19,7 +19,7 @@ industrialtest.Generator=table.copy(industrialtest.ActivatedElectricMachine)
 industrialtest.internal.unpackTableInto(industrialtest.Generator,{
 	name="industrialtest:generator",
 	description=S("Generator"),
-		tiles={
+	tiles={
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
 		"industrialtest_machine_block.png",
@@ -85,7 +85,7 @@ function industrialtest.Generator.getFormspec(self,pos)
 end
 
 function industrialtest.Generator.onMetadataInventoryPut(self,pos,listname,index,stack)
-	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	self:triggerIfNeeded(pos)
 	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 

machines/iron_furnace.lua

@@ -131,7 +131,7 @@ function industrialtest.IronFurnace.allowMetadataInventoryTake(self,pos,listname
 			self:updateFormspec(pos)
 		end
 	elseif listname=="dst" and dstSlot:get_free_space()==0 then
-		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		self:triggerIfNeeded(pos)
 	end
 	return industrialtest.ActivatedMachine.allowMetadataInventoryTake(self,pos,listname,index,stack)
 end
@@ -148,13 +148,13 @@ function industrialtest.IronFurnace.onMetadataInventoryMove(self,pos,fromList,fr
 			self:updateFormspec(pos)
 		end
 	elseif fromList=="dst" and dstSlot:get_free_space()==0 then
-		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		self:triggerIfNeeded(pos)
 	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)
+	self:triggerIfNeeded(pos)
 	industrialtest.ActivatedMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 end
 

machines/machine.lua

@@ -32,6 +32,15 @@ function industrialtest.Machine.afterPlaceNode(self,pos,placer,itemstack,pointed
 	-- dummy function
 end
 
+function industrialtest.Machine.afterDigNode(self,pos,oldnode,oldmetadata,digger)
+	-- dummy function
+end
+
+function industrialtest.Machine.onDig(self,pos,node,digger)
+	-- dummy function
+	return minetest.node_dig(pos,node,digger)
+end
+
 function industrialtest.Machine.getFormspec(self,pos)
 	local formspec
 	if industrialtest.mtgAvailable then
@@ -73,8 +82,7 @@ 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.config.updateDelay)
-		timer:start(industrialtest.updateDelay)
 	end
 end
 
@@ -129,27 +137,37 @@ function industrialtest.Machine.onMetadataInventoryMove(self,pos,fromList,fromIn
 	if toList=="upgrades" then
 		local meta=minetest.get_meta(pos)
 		local inv=meta:get_inventory()
-		local stack=inv:get_stack(fromList,fromIndex)
+		local itemstack=inv:get_stack(fromList,fromIndex)
-		industrialtest.internal.applyUpgrade(pos,meta,stack)
+		local def=itemstack:get_definition()
+		if def and def._industrialtest_self and def._industrialtest_self.apply then
+			def._industrialtest_self:apply(pos)
+		end
 	elseif fromList=="upgrades" then
 		local meta=minetest.get_meta(pos)
 		local inv=meta:get_inventory()
-		local stack=inv:get_stack(fromList,fromIndex)
+		local itemstack=inv:get_stack(fromList,fromIndex)
-		industrialtest.internal.removeUpgrade(pos,meta,stack)
+		local def=itemstack:get_definition()
+		if def and def._industrialtest_self and def._industrialtest_self.remove then
+			def._industrialtest_self:remove(pos)
+		end
 	end
 end
 
 function industrialtest.Machine.onMetadataInventoryPut(self,pos,listname,index,stack)
 	if listname=="upgrades" then
-		local meta=minetest.get_meta(pos)
+		local def=stack:get_definition()
-		industrialtest.internal.applyUpgrade(pos,meta,stack)
+		if def and def._industrialtest_self and def._industrialtest_self.apply then
+			def._industrialtest_self:apply(pos)
+		end
 	end
 end
 
 function industrialtest.Machine.onMetadataInventoryTake(self,pos,listname,index,stack)
 	if listname=="upgrades" then
-		local meta=minetest.get_meta(pos)
+		local def=stack:get_definition()
-		industrialtest.internal.removeUpgrade(pos,meta,stack)
+		if def and def._industrialtest_self and def._industrialtest_self.remove then
+			def._industrialtest_self:remove(pos)
+		end
 	end
 end
 
@@ -186,6 +204,12 @@ function industrialtest.Machine.createDefinitionTable(self)
 		after_place_node=function(pos,placer,itemstack,pointed)
 			self:afterPlaceNode(pos,placer,itemstack,pointed)
 		end,
+		after_dig_node=function(pos,oldnode,oldmetadata,digger)
+			self:afterDigNode(pos,oldnode,oldmetadata,digger)
+		end,
+		on_dig=function(pos,node,digger)
+			return self:onDig(pos,node,digger)
+		end,
 		on_timer=function(pos,elapsed)
 			return self:onTimer(pos,elapsed)
 		end,
@@ -260,7 +284,7 @@ function industrialtest.Machine.createDefinitionTable(self)
 			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)
+			self:triggerIfNeeded(pos)
 		end
 	end
 
@@ -290,8 +314,8 @@ function industrialtest.Machine.register(self)
 	industrialtest.api.addTag(self.name,"usesTimer")
 end
 
-function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,stack)
+function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,itemstack)
-	local def=minetest.registered_items[stack:get_name()]
+	local def=itemstack:get_definition()
 	if not def or not def.groups or not def.groups._industrialtest_machineUpgrade then
 		return 0
 	end
@@ -301,5 +325,5 @@ function industrialtest.Machine.allowMoveToUpgradeSlot(pos,toIndex,stack)
 	if not targetSlot:is_empty() then
 		return 0
 	end
-	return stack:get_count()
+	return itemstack:get_count()
 end

machines/miner.lua

@@ -0,0 +1,388 @@
+-- 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/>.
+
+local S=minetest.get_translator("industrialtest")
+
+local function destructMiningPipe(pos,player)
+	local count=0
+	local originalPos=table.copy(pos)
+	local node=minetest.get_node(pos)
+	while node.name=="industrialtest:mining_pipe" do
+		count=count+1
+		pos.y=pos.y-1
+		node=minetest.get_node(pos)
+		if node.name=="ignore" then
+			minetest.load_area(pos)
+			node=minetest.get_node(pos)
+		end
+	end
+	local endPos=table.copy(pos)
+
+	local manip=minetest.get_voxel_manip()
+	local minp,maxp=manip:read_from_map(pos,originalPos)
+	local data=manip:get_data()
+	local area=VoxelArea(minp,maxp)
+	pos=table.copy(originalPos)
+	while pos.y>endPos.y do
+		data[area:index(pos.x,pos.y,pos.z)]=minetest.CONTENT_AIR
+		pos.y=pos.y-1
+	end
+	manip:set_data(data)
+	manip:write_to_map()
+
+	if player then
+		local itemstack=ItemStack("industrialtest:mining_pipe "..tostring(count))
+		if industrialtest.mtgAvailable then
+			local inv=player:get_inventory()
+			local leftover=inv:add_item("main",itemstack)
+			if not leftover:is_empty() then
+				minetest.add_item(player:get_pos(),leftover)
+			end
+		elseif industrialtest.mclAvailable then
+			minetest.add_item(originalPos,itemstack)
+		end
+	end
+end
+
+local function miningPipeUpdateMiner(pos)
+	local meta=minetest.get_meta(pos)
+	if meta:contains("miner") then
+		local minerPos=minetest.deserialize(meta:get_string("miner"))
+		local minerMeta=minetest.get_meta(minerPos)
+		minerMeta:set_int("level",pos.y)
+	end
+end
+
+local definition={
+	description=S("Mining Pipe"),
+	tiles={"industrialtest_mining_pipe.png"},
+	paramtype="light",
+	sunlight_propagates=true,
+	drawtype="nodebox",
+	node_box={
+		type="fixed",
+		fixed={
+			-0.25,
+			-0.5,
+			-0.25,
+			0.25,
+			0.5,
+			0.25
+		}
+	},
+	on_destruct=function(pos)
+		miningPipeUpdateMiner(pos)
+		destructMiningPipe(pos,nil)
+	end,
+	on_dig=function(pos,node,digger)
+		miningPipeUpdateMiner(pos)
+		destructMiningPipe(pos,digger)
+	end
+}
+if industrialtest.mtgAvailable then
+	definition.groups={
+		cracky=3,
+		oddly_breakable_by_hand=1
+	}
+	definition.sounds=default.node_sound_metal_defaults()
+elseif industrialtest.mclAvailable then
+	definition.groups={
+		pickaxey=1,
+		handy=1
+	}
+	definition.sounds=mcl_sounds.node_sound_metal_defaults()
+	definition._mcl_blast_resistance=1
+	definition._mcl_hardness=1
+end
+minetest.register_node("industrialtest:mining_pipe",definition)
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:mining_pipe 8",
+	recipe={
+		{"industrialtest:refined_iron_ingot","","industrialtest:refined_iron_ingot"},
+		{"industrialtest:refined_iron_ingot","","industrialtest:refined_iron_ingot"},
+		{"industrialtest:refined_iron_ingot",industrialtest.elementKeys.treetap,"industrialtest:refined_iron_ingot"}
+	}
+})
+
+industrialtest.Miner=table.copy(industrialtest.ElectricMachine)
+industrialtest.internal.unpackTableInto(industrialtest.Miner,{
+	name="industrialtest:miner",
+	description=S("Miner"),
+	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_miner_front.png"
+	},
+	sounds="metal",
+	storageLists={
+		"drill",
+		"src",
+		"scanner",
+		"dst",
+		"powerStorage",
+		"upgrades"
+	},
+	powerLists={
+		{
+			list="powerStorage",
+			direction="i"
+		}
+	},
+	requiresWrench=true,
+	facedir=true,
+	flow=industrialtest.api.lvPowerFlow,
+	capacity=5000,
+	ioConfig="iiiiii",
+	hasPowerInput=true,
+	_opPower=1000,
+	_scannerOpPower=10
+})
+
+function industrialtest.Miner.onConstruct(self,pos)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	inv:set_size("drill",1)
+	inv:set_size("src",1)
+	inv:set_size("scanner",1)
+	inv:set_size("dst",15)
+	inv:set_size("powerStorage",1)
+	inv:set_size("upgrades",1)
+	meta:set_int("level",pos.y-1)
+	industrialtest.ElectricMachine.onConstruct(self,pos)
+end
+
+function industrialtest.Miner.onDestruct(self,pos)
+	destructMiningPipe(vector.new(pos.x,pos.y-1,pos.z),nil)
+	industrialtest.ElectricMachine.onDestruct(self,pos)
+end
+
+function industrialtest.Miner.onDig(self,pos,node,digger)
+	destructMiningPipe(vector.new(pos.x,pos.y-1,pos.z),digger)
+	return industrialtest.ElectricMachine.onDig(self,pos,node,digger)
+end
+
+function industrialtest.Miner.getFormspec(self,pos)
+	local parentFormspec=industrialtest.ElectricMachine.getFormspec(self,pos)
+	local meta=minetest.get_meta(pos)
+	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
+	local formspec={
+		"label[0.7,1.2;"..S("Drill").."]",
+		"list[context;drill;0.7,1.5;1,1]",
+		industrialtest.internal.getItemSlotBg(0.7,1.5,1,1),
+		"label[0.7,2.8;"..S("Pipe").."]",
+		"list[context;src;0.7,3.1;1,1]",
+		industrialtest.internal.getItemSlotBg(0.7,3.1,1,1),
+		"label[0.7,4.4;"..S("Scanner").."]",
+		"list[context;scanner;0.7,4.7;1,1]",
+		industrialtest.internal.getItemSlotBg(0.7,4.7,1,1),
+		"list[context;dst;2.28,1.9;5,3]",
+		industrialtest.internal.getItemSlotBg(2.28,1.9,5,3),
+		"list[context;upgrades;9.1,1.2;1,1]",
+		industrialtest.internal.getItemSlotBg(9.1,1.2,1,1),
+		(powerPercent>0 and "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
+		 or "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png]"),
+		"list[context;powerStorage;9.1,3.5;1,1]",
+		industrialtest.internal.getItemSlotBg(9.1,3.5,1,1),
+		"listring[context;src]",
+		"listring[context;dst]"
+	}
+	return parentFormspec..table.concat(formspec,"")
+end
+
+function industrialtest.Miner.canUpdate(self,pos)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local drillSlot=inv:get_stack("drill",1)
+	local srcSlot=inv:get_stack("src",1)
+	local level=meta:get_int("level")
+	local requiredPower=self:getRequiredPower(pos)
+	return meta:get_int("industrialtest.powerAmount")>=requiredPower and not drillSlot:is_empty() and not srcSlot:is_empty() and
+		self:canContinue(pos,level)
+end
+
+function industrialtest.Miner.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local itemstack=inv:get_stack(fromList,fromIndex)
+	if toList=="drill" then
+		return self.allowDrillPut(itemstack) and count or 0
+	end
+	if toList=="src" then
+		return itemstack:get_name()=="industrialtest:mining_pipe" and count or 0
+	end
+	if toList=="scanner" then
+		return self.allowScannerPut(itemstack) and 1 or 0
+	end
+	if toList=="dst" then
+		return 0
+	end
+	return industrialtest.ElectricMachine.allowMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+end
+
+function industrialtest.Miner.allowMetadataInventoryPut(self,pos,listname,index,itemstack,player)
+	if listname=="drill" then
+		return self.allowDrillPut(itemstack) and itemstack:get_count() or 0
+	end
+	if listname=="src" then
+		return itemstack:get_name()=="industrialtest:mining_pipe" and itemstack:get_count() or 0
+	end
+	if listname=="scanner" then
+		return self.allowScannerPut(itemstack) and 1 or 0
+	end
+	if listname=="dst" then
+		return 0
+	end
+	return industrialtest.ElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,itemstack,player)
+end
+
+function industrialtest.Miner.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+	self:onInventoryPut(pos,toList)
+	industrialtest.ElectricMachine.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)
+end
+
+function industrialtest.Miner.onMetadataInventoryPut(self,pos,listname,index,stack)
+	self:onInventoryPut(pos,listname)
+	industrialtest.ElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
+end
+
+function industrialtest.Miner.onMetadataInventoryTake(self,pos,listname,index,stack)
+	if listname=="dst" then
+		self:triggerIfNeeded(pos)
+	end
+end
+
+function industrialtest.Miner.update(self,pos,elapsed,meta,inv)
+	if not self:canUpdate(pos) then
+		return false,false
+	end
+
+	local level=meta:get_int("level")
+	if not self:canContinue(pos,level) then
+		return false,false
+	end
+
+	local srcSlot=inv:get_stack("src",1)
+	srcSlot:take_item(1)
+	inv:set_stack("src",1,srcSlot)
+	local targetPos=vector.new(pos.x,level,pos.z)
+	local drop=self.getNodeDrop(targetPos)
+	self.placeMiningPipe(pos,targetPos)
+	inv:add_item("dst",drop)
+
+	local scannerSlot=inv:get_stack("scanner",1)
+	if not scannerSlot:is_empty() then
+		local def=scannerSlot:get_definition()
+		if def and def._industrialtest_self then
+			local filtered=def._industrialtest_self:filter(targetPos)
+			for _,filteredPos in ipairs(filtered) do
+				drop=self.getNodeDrop(filteredPos)
+				if inv:room_for_item("dst",drop) then
+					minetest.remove_node(filteredPos)
+					inv:add_item("dst",drop)
+				end
+			end
+		end
+	end
+
+	local requiredPower=self:getRequiredPower(pos)
+	meta:set_int("level",level-1)
+	industrialtest.api.addPower(meta,-requiredPower)
+
+	return true,true
+end
+
+function industrialtest.Miner.onInventoryPut(self,pos,listname)
+	if listname=="drill" or listname=="src" then
+		self:triggerIfNeeded(pos)
+	end
+end
+
+function industrialtest.Miner.allowDrillPut(itemstack)
+	local def=itemstack:get_definition()
+	return def and def.groups and def.groups._industrialtest_miningDrill
+end
+
+function industrialtest.Miner.allowScannerPut(itemstack)
+	local def=itemstack:get_definition()
+	return def and def.groups and def.groups._industrialtest_scanner
+end
+
+function industrialtest.Miner.canContinue(self,pos,level)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local targetPos=vector.new(pos.x,level,pos.z)
+	local targetNode=minetest.get_node(targetPos)
+	if targetNode.name=="ignore" then
+		minetest.load_area(targetPos)
+		targetNode=minetest.get_node(targetPos)
+		if targetNode.name=="ignore" then
+			return false
+		end
+	end
+
+	local def=minetest.registered_nodes[targetNode.name]
+	local drop=self.getNodeDrop(vector.new(pos.x,level,pos.z))
+	return not (def and def.groups and def.groups.unbreakable) and inv:room_for_item("dst",drop)
+end
+
+function industrialtest.Miner.getRequiredPower(self,pos)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local scannerSlot=inv:get_stack("scanner",1)
+	local result=self._opPower
+	if not scannerSlot:is_empty() then
+		local def=scannerSlot:get_definition()
+		if def and def._industrialtest_self then
+			local distance=def._industrialtest_self.minerDistance or 0
+			result=result+(distance*distance-1)*self._scannerOpPower
+		end
+	end
+	return result
+end
+
+function industrialtest.Miner.getNodeDrop(pos)
+	local node=minetest.get_node(pos)
+	local def=minetest.registered_nodes[node.name]
+	if not def.pointable then
+		return ItemStack()
+	end
+	return ItemStack((def and def.drop and def.drop~="") and def.drop or node.name)
+end
+
+function industrialtest.Miner.placeMiningPipe(minerPos,pos)
+	minetest.add_node(pos,{
+		name="industrialtest:mining_pipe"
+	})
+	local meta=minetest.get_meta(pos)
+	meta:set_string("miner",minetest.serialize(minerPos))
+end
+
+industrialtest.Miner:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:miner",
+	recipe={
+		{"",industrialtest.elementKeys.chest,""},
+		{"industrialtest:electronic_circuit","industrialtest:machine_block","industrialtest:electronic_circuit"},
+		{"","industrialtest:mining_pipe",""}
+	}
+})

machines/simple_electric_item_processor.lua

@@ -107,8 +107,8 @@ function industrialtest.SimpleElectricItemProcessor.onMetadataInventoryMove(self
 	end
 end
 
-function industrialtest.SimpleElectricItemProcessor.onMetadataInventoryPut(self,pos)
+function industrialtest.SimpleElectricItemProcessor.onMetadataInventoryPut(self,pos,listname,index,stack)
-	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos)
+	industrialtest.ActivatedElectricMachine.onMetadataInventoryPut(self,pos,listname,index,stack)
 	self:triggerIfNeeded(pos)
 end
 

machines/solar_panel_generator.lua

@@ -29,7 +29,8 @@ industrialtest.internal.unpackTableInto(industrialtest.SolarPanelBase,{
 		}
 	},
 	hasPowerOutput=true,
-	ioConfig="oooooo"
+	ioConfig="oooooo",
+	multiplier=1
 })
 
 local solarPanels={}
@@ -66,7 +67,7 @@ function industrialtest.SolarPanelBase.action(self,pos)
 	local amount=minetest.get_natural_light(vector.offset(pos,0,1,0))/15.0
 	local charging=amount>0.5
 	if charging then
-		if industrialtest.api.addPower(meta,math.ceil(amount*self.flow))>0 then
+		if industrialtest.api.addPower(meta,math.ceil(amount*self.flow*self.multiplier))>0 then
 			self:updateFormspec(pos)
 		end
 		self:trigger(pos)
@@ -118,7 +119,8 @@ industrialtest.internal.unpackTableInto(industrialtest.LVSolarArray,{
 		"industrialtest_machine_block.png"
 	},
 	capacity=industrialtest.api.lvPowerFlow*4,
-	flow=industrialtest.api.lvPowerFlow*2
+	flow=industrialtest.api.lvPowerFlow,
+	multiplier=1.5
 })
 
 industrialtest.LVSolarArray:register()
@@ -193,7 +195,7 @@ minetest.register_craft({
 minetest.register_abm({
 	name="Solar panel updating",
 	nodenames=solarPanels,
-	interval=industrialtest.updateDelay,
+	interval=industrialtest.config.updateDelay,
 	chance=1,
 	action=function(pos,node)
 		local def=minetest.registered_nodes[node.name]

machines/wind_mill.lua

@@ -122,7 +122,7 @@ minetest.register_craft({
 minetest.register_abm({
 	name="Wind mill updating",
 	nodenames={"industrialtest:wind_mill"},
-	interval=industrialtest.updateDelay,
+	interval=industrialtest.config.updateDelay,
 	chance=1,
 	action=function(pos)
 		industrialtest.WindMill:action(pos)

nodes.lua

@@ -354,6 +354,19 @@ if not industrialtest.mods.mclRubber then
 					name=="mcl_core:podzol" or name=="mcl_core:podzol_snow" or
 					name=="mcl_core:dirt" or name=="mcl_core:mycelium" or name=="mcl_core:coarse_dirt"
 		end)
+		definition._on_bone_meal=function(itemstack,user,pointed)
+			if industrialtest.random:next(1,100)>45 then
+				return
+			end
+			local meta=minetest.get_meta(pointed.under)
+			local stage=meta:get_int("stage") or 0
+			stage=stage+1
+			if stage>=3 then
+				industrialtest.internal.makeRubberTree(pointed.under)
+			else
+				meta:set_int("stage",stage)
+			end
+		end
 		minetest.register_abm({
 			label="Rubber sapling growing",
 			nodenames={"industrialtest:rubber_sapling"},
@@ -379,23 +392,6 @@ if not industrialtest.mods.mclRubber then
 				end
 			end
 		})
-		mcl_dye.register_on_bone_meal_apply(function(pointed)
-			local node=minetest.get_node(pointed.under)
-			if node.name~="industrialtest:rubber_sapling" then
-				return
-			end
-			if industrialtest.random:next(1,100)>45 then
-				return
-			end
-			local meta=minetest.get_meta(pointed.under)
-			local stage=meta:get_int("stage") or 0
-			stage=stage+1
-			if stage>=3 then
-					industrialtest.internal.makeRubberTree(pointed.under)
-			else
-				meta:set_int("stage",stage)
-			end
-		end)
 	end
 	definition.groups.attached_node=1
 	definition.groups.dig_immediate=3

settingtypes.txt

@@ -0,0 +1,8 @@
+# This determines value how frequently machines update
+industrialtest.updateDelay (Update delay) float 1.0
+
+# Whether electrocution by uninsulated cables is used
+industrialtest.electrocution (Electrocution) bool true
+
+# Enables additional utils useful when developing mod
+industrialtest.developerMode (Developer mode) bool false

textures/SOURCES.md

@@ -3,4 +3,4 @@
 - `industrialtest_gui_water.png` was taken from Minetest Game (by Cisoun licensed with CC BY-SA 3.0)
 - `industrialtest_gui_river_water.png` was taken from Minetest Game (by paramat licensed with CC BY-SA 3.0)
 
-... rest was made either by LuanHawk, mrkubax10 or Migdyn and is licensed with CC BY 4.0 International
+... rest was made either by LuanHawk, mrkubax10, HandfulOfFrogs or Migdyn and is licensed with CC BY 4.0 International

tools/activated_electric_tool.lua

@@ -0,0 +1,160 @@
+-- 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.ActivatedElectricTool=table.copy(industrialtest.ElectricTool)
+
+function industrialtest.ActivatedElectricTool.createDefinitionTable(self)
+	local def=industrialtest.ElectricTool.createDefinitionTable(self)
+
+	def.groups._industrialtest_activatedElectricTool=1
+	def.tool_capabilities.full_punch_interval=self.fullPunchInterval
+	if self.digs then
+		self:defineToolCapabilities(def,nil,self.digSpeed)
+	end
+	if self.hits then
+		def.tool_capabilities.damage_groups={}
+		for _,hitType in ipairs(self.hits) do
+			def.tool_capabilities.damage_groups[hitType]=1
+		end
+	end
+
+	return def
+end
+
+function industrialtest.ActivatedElectricTool.createActiveDefinitionTable(self)
+	local def=self:createDefinitionTable()
+
+	if self.digs or self.hits then
+		self:defineToolCapabilities(def,self.active.times,self.active.digSpeed)
+	end
+
+	def.groups.not_in_creative_inventory=1
+
+	def.after_use=function(itemstack,user,node,digparams)
+		if self:afterUse(itemstack,user,node,digparams) then
+			return itemstack
+		end
+		return nil
+	end
+
+	return def
+end
+
+function industrialtest.ActivatedElectricTool.register(self)
+	industrialtest.ElectricTool.register(self)
+	local def=self:createActiveDefinitionTable()
+	minetest.register_tool(self.name.."_active",def)
+end
+
+function industrialtest.ActivatedElectricTool.beforeUse(self,itemstack,node)
+	local def=itemstack:get_definition()
+	if self:canActivate(itemstack,node) then
+		if not self.isActive(itemstack) then
+			itemstack:set_name(itemstack:get_name().."_active")
+		end
+		return true
+	else
+		itemstack:set_name(self.name)
+	end
+	return false
+end
+
+function industrialtest.ActivatedElectricTool.afterUse(self,itemstack,user,node,digparams)
+	local meta=itemstack:get_meta()
+	industrialtest.api.addPowerToItem(itemstack,-self:getOpPower(itemstack))
+	return true
+end
+
+function industrialtest.ActivatedElectricTool.canActivate(self,itemstack,node)
+	local meta=itemstack:get_meta()
+	return meta:get_int("industrialtest.powerAmount")>=self:getOpPower(itemstack)
+end
+
+function industrialtest.ActivatedElectricTool.isActive(itemstack)
+	return string.sub(itemstack:get_name(),-string.len("_active"),-1)=="_active"
+end
+
+function industrialtest.ActivatedElectricTool.defineToolCapabilities(self,def,times,digSpeed)
+	if industrialtest.mtgAvailable then
+		if self.digs then
+			def.tool_capabilities.groupcaps={}
+			for _,digType in ipairs(self.digs) do
+				def.tool_capabilities.groupcaps[digType]={
+					times=times,
+					maxlevel=self.digLevel+1
+				}
+				if digType=="choppy" then
+					def.groups.axe=1
+				elseif digType=="cracky" then
+					def.groups.pickaxe=1
+				elseif digType=="crumbly" then
+					def.groups.shovel=1
+				elseif digType=="hoey" then
+					def.groups.hoe=1
+				end
+			end
+		end
+		if self.hits then
+			for _,hitType in ipairs(self.hits) do
+				if hitType=="fleshy" then
+					def.groups.sword=1
+				end
+			end
+		end
+	elseif industrialtest.mclAvailable then
+		if self.digs then
+			local digTypeMapping={
+				choppy={"axey"},
+				cracky={"pickaxey"},
+				crumbly={"shovely"},
+				hoey={"hoey"},
+				snappy={"swordy","swordy_cobweb"}
+			}
+			def.groups.dig_speed_class=self.digSpeedClass
+			def._mcl_diggroups={}
+			for _,digType in ipairs(self.digs) do
+				for _,mappedDigType in ipairs(digTypeMapping[digType]) do
+					def._mcl_diggroups[mappedDigType]={
+						speed=digSpeed,
+						level=5-self.digLevel,
+						uses=-1
+					}
+				end
+			end
+		end
+		if self.hits then
+			for _,hitType in ipairs(self.hits) do
+				if hitType=="fleshy" then
+					def.groups.weapon=1
+					def.groups.sword=1
+				end
+			end
+		end
+	end
+end
+
+minetest.register_on_punchnode(function(pos,node,user)
+	if not user then
+		return
+	end
+
+	local itemstack=user:get_wielded_item()
+	local def=itemstack:get_definition()
+	if def and def._industrialtest_self and def.groups and def.groups._industrialtest_activatedElectricTool and
+		def._industrialtest_self:beforeUse(itemstack,node) then
+		user:set_wielded_item(itemstack)
+	end
+end)

tools/batpack.lua

@@ -15,72 +15,44 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.BatPackBase=table.copy(industrialtest.ElectricGearTool)
+industrialtest.internal.unpackTableInto(industrialtest.BatPackBase,{
+	part="torso"
+})
 
 local updateDelta=0
-
+function industrialtest.BatPackBase.update(self,player,inv,itemstack,dtime)
-local function registerBatpack(config)
+	updateDelta=updateDelta+dtime
-	if industrialtest.mtgAvailable then
+	if updateDelta<industrialtest.config.updateDelay then
-		armor:register_armor("industrialtest:"..config.name,{
-			description=config.displayName,
-			inventory_image="industrialtest_"..config.name.."_inv.png",
-			groups={
-				armor_torso=1,
-				armor_heal=0,
-				_industrialtest_batpack=1
-			},
-			_industrialtest_powerStorage=true,
-			_industrialtest_powerCapacity=config.powerCapacity,
-			_industrialtest_powerFlow=config.powerFlow
-		})
-	elseif industrialtest.mclAvailable then
-		minetest.register_tool("industrialtest:"..config.name,{
-			description=config.displayName,
-			inventory_image="industrialtest_"..config.name.."_inv.png",
-			groups={
-				armor=1,
-				non_combat_armor=1,
-				armor_torso=1,
-				non_combat_torso=1,
-				_industrialtest_batpack=1
-			},
-			sounds={
-				_mcl_armor_equip="mcl_armor_equip_iron",
-				_mcl_armor_unequip="mcl_armor_unequip_iron"
-			},
-			on_place=mcl_armor.equip_on_use,
-			on_secondary_use=mcl_armor.equip_on_use,
-			_mcl_armor_element="torso",
-			_mcl_armor_texture="industrialtest_"..config.name..".png",
-			_industrialtest_powerStorage=true,
-			_industrialtest_powerCapacity=config.powerCapacity,
-			_industrialtest_powerFlow=config.powerFlow
-		})
-	end
-end
-
-local function onGlobalStep(player,inv,stack,index,def)
-	if not def.groups or not def.groups._industrialtest_batpack then
 		return false
 	end
+	updateDelta=0
+
 	local wielded=player:get_wielded_item()
 	local wieldedMeta=wielded:get_meta()
-	if not industrialtest.api.hasPowerStorage(wieldedMeta) or wieldedMeta:get_int("industrialtest.powerFlow")>def._industrialtest_powerFlow then
+	if not industrialtest.api.hasPowerStorage(wieldedMeta) or wieldedMeta:get_int("industrialtest.powerFlow")>self.flow then
-		return true
+		return false
 	end
-	if industrialtest.api.transferPowerFromItem(stack,wieldedMeta,def._industrialtest_powerFlow)>0 then
+	if industrialtest.api.transferPowerFromItem(itemstack,wieldedMeta,self.flow)>0 then
 		industrialtest.api.updateItemPowerText(wielded)
 		player:set_wielded_item(wielded)
-		inv:set_stack("armor",index,stack)
+		return true
 	end
-	return true
+	return false
 end
 
-registerBatpack({
+industrialtest.BatPack=table.copy(industrialtest.BatPackBase)
-	name="batpack_v",
+industrialtest.internal.unpackTableInto(industrialtest.BatPack,{
-	displayName=S("BatPack"),
+	name="industrialtest:batpack_v",
-	powerCapacity=60000,
+	description=S("BatPack"),
-	powerFlow=industrialtest.api.lvPowerFlow
+	inventoryImage="industrialtest_batpack_v_inv.png",
+	modelImage="industrialtest_batpack_v.png",
+	capacity=60000,
+	flow=industrialtest.api.lvPowerFlow
 })
+
+industrialtest.BatPack:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:batpack_v",
@@ -91,12 +63,18 @@ minetest.register_craft({
 	}
 })
 
-registerBatpack({
+industrialtest.LapPack=table.copy(industrialtest.BatPackBase)
-	name="lappack_v",
+industrialtest.internal.unpackTableInto(industrialtest.LapPack,{
-	displayName=S("LapPack"),
+	name="industrialtest:lappack_v",
-	powerCapacity=300000,
+	description=S("LapPack"),
-	powerFlow=industrialtest.api.hvPowerFlow
+	inventoryImage="industrialtest_lappack_v_inv.png",
+	modelImage="industrialtest_lappack_v.png",
+	capacity=60000,
+	flow=industrialtest.api.lvPowerFlow
 })
+
+industrialtest.LapPack:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:lappack_v",
@@ -106,33 +84,3 @@ minetest.register_craft({
 		{industrialtest.elementKeys.powerCarrier,"",industrialtest.elementKeys.powerCarrier}
 	}
 })
-
-minetest.register_globalstep(function(dtime)
-	updateDelta=updateDelta+dtime
-	if updateDelta<industrialtest.updateDelay then
-		return
-	end
-	updateDelta=0
-	local players=minetest.get_connected_players()
-	for _,player in ipairs(players) do
-		if industrialtest.mtgAvailable then
-			local _,inv=armor:get_valid_player(player,"")
-			if inv then
-				local armorList=inv:get_list("armor")
-				assert(armorList)
-				for i=1,#armorList do
-					local stack=armorList[i]
-					local def=stack:get_definition()
-					if onGlobalStep(player,inv,stack,i,def) then
-						break
-					end
-				end
-			end
-		elseif industrialtest.mclAvailable then
-			local inv=player:get_inventory()
-			local stack=inv:get_stack("armor",3)
-			local def=stack:get_definition()
-			onGlobalStep(player,inv,stack,3,def)
-		end
-	end
-end)

tools/common.lua

@@ -19,23 +19,6 @@ industrialtest.internal.registeredElectricDrills={}
 industrialtest.internal.registeredElectricHoes={}
 industrialtest.internal.registeredElectricSabers={}
 
-local function isActive(itemstack)
-	return string.sub(itemstack:get_name(),-string.len("_active"),-1)=="_active"
-end
-
-local function beforeUse(user,itemstack,canDig)
-	local meta=itemstack:get_meta()
-	local def=itemstack:get_definition()
-	if meta:get_int("industrialtest.powerAmount")>=20 and canDig then
-		if not isActive(itemstack) then
-			itemstack:set_name(itemstack:get_name().."_active")
-		end
-	else
-		itemstack:set_name(def._industrialtest_inactiveName)
-	end
-	user:set_wielded_item(itemstack)
-end
-
 minetest.register_on_punchnode(function(pos,node,user,pointed)
 	if not user then
 		return

tools/electric_armor.lua

@@ -0,0 +1,115 @@
+-- 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.ElectricArmor={
+	prepare=industrialtest.ElectricItem.prepare
+}
+
+function industrialtest.ElectricArmor.createDefinitionTableForElement(self,element)
+	local def={
+		description=element.description,
+		inventory_image=element.inventoryImage,
+		groups={
+			_industrialtest_electricArmor=1,
+			["armor_"..element.element]=1
+		},
+		_industrialtest_self=self
+	}
+
+	if industrialtest.mclAvailable then
+		def.groups.armor=1
+		def.groups.non_combat_armor=1
+		def.sounds={
+			_mcl_armor_equip="mcl_armor_equip_iron",
+			_mcl_armor_unequip="mcl_armor_unequip_iron"
+		}
+		def.on_place=mcl_armor.armor_on_use
+		def.on_secondary_use=mcl_armor.armor_on_use
+		def._mcl_armor_element=element.element
+		if type(element.texture)=="string" then
+			def._mcl_armor_texture=element.texture
+		else
+			def._mcl_armor_texture=element.texture[2] or element.texture[1]
+		end
+	end
+
+	return def
+end
+
+function industrialtest.ElectricArmor.register(self)
+	for _,element in ipairs(self.elements) do
+		local def=self:createDefinitionTableForElement(element)
+		local name=self.name.."_"..element.name
+		if industrialtest.mtgAvailable then
+			armor:register_armor(name,def)
+		elseif industrialtest.mclAvailable then
+			minetest.register_tool(name,def)
+		end
+	end
+end
+
+function industrialtest.ElectricArmor.tryReduceDamage(self,itemstack,hpChange)
+	local meta=itemstack:get_meta()
+	local targetReducedDamage=math.floor(math.abs(hpChange)*self:getReducedDamageForItem(itemstack))
+	local powerPerDamage=self:getPowerPerDamageForItem(itemstack)
+	local requiredPower=targetReducedDamage*powerPerDamage
+	local availablePower=math.min(meta:get_int("industrialtest.powerAmount"),requiredPower)
+	return math.floor(availablePower/powerPerDamage)
+end
+
+function industrialtest.ElectricArmor.getReducedDamageForItem(self,itemstack)
+	-- dummy function
+	return 0
+end
+
+function industrialtest.ElectricArmor.getPowerPerDamageForItem(self,itemstack)
+	-- dummy function
+	return 0
+end
+
+minetest.register_on_player_hpchange(function(player,hpChange)
+	if hpChange>0 or not player:is_player() then
+		return hpChange
+	end
+
+	local inv
+	if industrialtest.mtgAvailable then
+		_,inv=armor:get_valid_player(player,"")
+		if not inv then
+			return hpChange
+		end
+	elseif industrialtest.mclAvailable then
+		inv=player:get_inventory()
+	end
+
+	local armorList=inv:get_list("armor")
+	assert(armorList)
+	local result=hpChange
+	for i=1,#armorList do
+		local itemstack=armorList[i]
+		local def=itemstack:get_definition()
+		if def.groups and def.groups._industrialtest_electricArmor and def._industrialtest_self then
+			local reducedDamage=def._industrialtest_self:tryReduceDamage(itemstack,hpChange)
+			if reducedDamage>0 then
+				result=result+reducedDamage
+				industrialtest.api.addPowerToItem(itemstack,-reducedDamage*def._industrialtest_self:getPowerPerDamageForItem(itemstack))
+				inv:set_stack("armor",i,itemstack)
+			end
+		end
+	end
+
+	return result
+end,true)

tools/electric_chainsaw.lua

@@ -15,107 +15,42 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.ElectricChainsawBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricChainsawBase,{
+	digs={"choppy"}
+})
 
-local electricChainsaw={}
+function industrialtest.ElectricChainsawBase.use(self,itemstack,user,pointed)
-
+	if not industrialtest.mclAvailable then
-electricChainsaw.afterUse=function(itemstack,config)
+		return false
+	end
 	local meta=itemstack:get_meta()
-	industrialtest.api.addPowerToItem(itemstack,-20)
+	local itemstackCopy=itemstack
-	if meta:get_int("industrialtest.powerAmount")<20 then
+	return itemstack:get_wear()~=industrialtest.internal.mclMakeStrippedTrunk(itemstackCopy,user,pointed,true):get_wear()
-		itemstack:set_name("industrialtest:"..config.name)
-	end
-	return itemstack
 end
 
-local function registerElectricChainsaw(config)
+function industrialtest.ElectricChainsawBase.getOpPower(self,itemstack)
-	local definition={
+	return 50
-		description=config.displayName,
+end
-		inventory_image="industrialtest_"..config.name..".png",
+
-		after_use=function(itemstack)
+industrialtest.ElectricChainsaw=table.copy(industrialtest.ElectricChainsawBase)
-			-- Hack to make sure that chainsaw won't be destroyed when has 0 EU
+industrialtest.internal.unpackTableInto(industrialtest.ElectricChainsaw,{
-			return nil
+	name="industrialtest:electric_chainsaw",
-		end,
+	description=S("Electric Chainsaw"),
-		_industrialtest_powerStorage=true,
+	inventoryImage="industrialtest_electric_chainsaw.png",
-		_industrialtest_powerCapacity=10000,
+	capacity=10000,
-		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
+	flow=industrialtest.api.lvPowerFlow,
-		_industrialtest_inactiveName="industrialtest:"..config.name
+	digLevel=0,
+	digSpeedClass=4,
+	digSpeed=1,
+	active={
+		times={[1]=1.7,[2]=1.2,[3]=1.0,[4]=0.7},
+		digSpeed=7
 	}
-	if industrialtest.mtgAvailable then
+})
-		definition.tool_capabilities={
+
-			full_punch_interval=0.5,
+industrialtest.ElectricChainsaw:register()
-			max_drop_level=config.maxDropLevel,
+
-			groupcaps={
-				choppy={
-					times=config.inactiveTimes,
-					maxlevel=config.maxLevel
-				}
-			}
-		}
-		definition.groups={
-			axe=1
-		}
-	elseif industrialtest.mclAvailable then
-		definition.tool_capabilities={
-			full_punch_interval=0.5,
-			max_drop_level=config.maxDropLevel,
-		}
-		definition.groups={
-			tool=1,
-			dig_speed_class=config.digSpeedClass,
-		}
-		definition.on_place=function(itemstack,user,pointed)
-			local meta=itemstack:get_meta()
-			if meta:get_int("industrialtest.powerAmount")>=20 then
-				local itemstackCopy=itemstack
-				if itemstack:get_wear()~=industrialtest.internal.mclMakeStrippedTrunk(itemstackCopy,user,pointed,true):get_wear() then
-					industrialtest.api.addPowerToItem(itemstack,-20)
-					return itemstack
-				end
-			end
-			return nil
-		end
-		definition._mcl_diggroups={
-			axey={
-				speed=config.inactiveDigSpeed,
-				level=config.digLevel,
-				uses=-1
-			}
-		}
-		definition._mcl_toollike_wield=true
-	end
-	minetest.register_tool("industrialtest:"..config.name,definition)
-	definition=table.copy(definition)
-	if industrialtest.mtgAvailable then
-		definition.tool_capabilities.groupcaps.choppy.times=config.activeTimes
-	elseif industrialtest.mclAvailable then
-		definition._mcl_diggroups.axey.speed=config.activeDigSpeed
-	end
-	definition.groups.not_in_creative_inventory=1
-	definition.on_use=nil
-	definition.after_use=function(itemstack)
-		return electricChainsaw.afterUse(itemstack,config)
-	end
-	minetest.register_tool("industrialtest:"..config.name.."_active",definition)
-	industrialtest.internal.registeredElectricChainsaws["industrialtest:"..config.name]=true
-	industrialtest.internal.registeredElectricChainsaws["industrialtest:"..config.name.."_active"]=true
-end
-local definition={
-	name="electric_chainsaw",
-	displayName=S("Electric Chainsaw")
-}
-if industrialtest.mtgAvailable then
-	definition.maxDropLevel=1
-	definition.inactiveTimes={[1]=10,[2]=5.6,[3]=4}
-	definition.maxLevel=2
-	definition.activeTimes={[1]=2.2,[2]=1.1,[3]=0.7}
-elseif industrialtest.mclAvailable then
-	definition.digSpeedClass=4
-	definition.maxDropLevel=4
-	definition.inactiveDigSpeed=1
-	definition.digLevel=4
-	definition.activeDigSpeed=7
-end
-registerElectricChainsaw(definition)
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:electric_chainsaw",
@@ -125,26 +60,28 @@ minetest.register_craft({
 		{"industrialtest:re_battery","industrialtest:refined_iron_ingot",""}
 	}
 })
-definition={
+
-	name="diamond_electric_chainsaw",
+industrialtest.AdvancedElectricChainsaw=table.copy(industrialtest.ElectricChainsawBase)
-	displayName=S("Diamond Electric Chainsaw")
+industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricChainsaw,{
-}
+	name="industrialtest:advanced_electric_chainsaw",
-if industrialtest.mtgAvailable then
+	description=S("Advanced Electric Chainsaw"),
-	definition.maxDropLevel=1
+	inventoryImage="industrialtest_advanced_electric_chainsaw.png",
-	definition.inactiveTimes={[1]=10,[2]=5.6,[3]=4}
+	capacity=10000,
-	definition.maxLevel=3
+	flow=industrialtest.api.lvPowerFlow,
-	definition.activeTimes={[1]=2.0,[2]=0.8,[3]=0.4}
+	digLevel=0,
-elseif industrialtest.mclAvailable then
+	digSpeedClass=5,
-	definition.digSpeedClass=5
+	digSpeed=1,
-	definition.maxDropLevel=5
+	active={
-	definition.inactiveDigSpeed=1
+		times={[1]=1.0,[2]=0.7,[3]=0.5,[4]=0.2},
-	definition.digLevel=5
+		digSpeed=8
-	definition.activeDigSpeed=9
+	}
-end
+})
-registerElectricChainsaw(definition)
+
+industrialtest.AdvancedElectricChainsaw:register()
+
 minetest.register_craft({
 	type="shaped",
-	output="industrialtest:diamond_electric_chainsaw",
+	output="industrialtest:advanced_electric_chainsaw",
 	recipe={
 		{"",industrialtest.elementKeys.diamond,""},
 		{industrialtest.elementKeys.diamond,"industrialtest:electric_chainsaw",industrialtest.elementKeys.diamond}

tools/electric_drill.lua

@@ -15,107 +15,41 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
-
+industrialtest.ElectricDrillBase=table.copy(industrialtest.ActivatedElectricTool)
-local electricDrill={}
+industrialtest.internal.unpackTableInto(industrialtest.ElectricDrillBase,{
-
+	digs={
-electricDrill.afterUse=function(itemstack,config)
+		"cracky",
-	local meta=itemstack:get_meta()
+		"crumbly"
-	industrialtest.api.addPowerToItem(itemstack,-20)
-	if meta:get_int("industrialtest.powerAmount")<20 then
-		itemstack:set_name("industrialtest:"..config.name)
-	end
-	return itemstack
-end
-
-local function registerElectricDrill(config)
-	local definition={
-		description=config.displayName,
-		inventory_image="industrialtest_"..config.name..".png",
-		after_use=function()
-			-- Hack to make sure that drill won't be destroyed when has 0 EU
-			return nil
-		end,
-		_industrialtest_powerStorage=true,
-		_industrialtest_powerCapacity=10000,
-		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
-		_industrialtest_inactiveName="industrialtest:"..config.name
 	}
-	if industrialtest.mtgAvailable then
+})
-		definition.tool_capabilities={
+
-			full_punch_interval=0.5,
+function industrialtest.ElectricDrillBase.createDefinitionTable(self)
-			max_drop_level=config.maxDropLevel,
+	local def=industrialtest.ActivatedElectricTool.createDefinitionTable(self)
-			groupcaps={
+	def.groups._industrialtest_miningDrill=1
-				cracky={
+	return def
-					times=config.inactiveTimes,
-					maxlevel=config.maxLevel
-				},
-				crumbly={
-					times=config.inactiveTimes,
-					maxlevel=config.maxLevel
-				}
-			}
-		}
-		definition.groups={
-			pickaxe=1,
-			shovel=1
-		}
-	elseif industrialtest.mclAvailable then
-		definition.tool_capabilities={
-			full_punch_interval=0.5,
-			max_drop_level=config.maxDropLevel
-		}
-		definition.groups={
-			tool=1,
-			dig_speed_class=config.digSpeedClass
-		}
-		definition._mcl_diggroups={
-			pickaxey={
-				speed=config.inactiveDigSpeed,
-				level=config.digLevel,
-				uses=-1
-			},
-			shovely={
-				speed=config.inactiveDigSpeed,
-				level=config.digLevel,
-				uses=-1
-			}
-		}
-		definition._mcl_toollike_wield=true
-	end
-	minetest.register_tool("industrialtest:"..config.name,definition)
-	definition=table.copy(definition)
-	if industrialtest.mtgAvailable then
-		definition.tool_capabilities.groupcaps.cracky.times=config.activeTimes
-		definition.tool_capabilities.groupcaps.crumbly.times=config.activeTimes
-	elseif industrialtest.mclAvailable then
-		definition._mcl_diggroups.pickaxey.speed=config.activeDigSpeed
-		definition._mcl_diggroups.shovely.speed=config.activeDigSpeed
-	end
-	definition.groups.not_in_creative_inventory=1
-	definition.after_use=function(itemstack)
-		return electricDrill.afterUse(itemstack,config)
-	end
-	minetest.register_tool("industrialtest:"..config.name.."_active",definition)
-	industrialtest.internal.registeredElectricDrills["industrialtest:"..config.name]=true
-	industrialtest.internal.registeredElectricDrills["industrialtest:"..config.name.."_active"]=true
 end
-local definition={
+
-	name="electric_drill",
+function industrialtest.ElectricDrillBase.getOpPower(self,itemstack)
-	displayName=S("Electric Drill")
+	return 50
-}
-if industrialtest.mtgAvailable then
-	definition.maxDropLevel=1
-	definition.inactiveTimes={[1]=10,[2]=5.6,[3]=4}
-	definition.maxLevel=2
-	definition.activeTimes={[1]=2.0,[2]=0.8,[3]=0.4}
-elseif industrialtest.mclAvailable then
-	definition.digSpeedClass=4
-	definition.maxDropLevel=4
-	definition.inactiveDigSpeed=1
-	definition.digLevel=4
-	definition.activeDigSpeed=7
 end
-registerElectricDrill(definition)
+
+industrialtest.ElectricDrill=table.copy(industrialtest.ElectricDrillBase)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricDrill,{
+	name="industrialtest:electric_drill",
+	description=S("Electric Drill"),
+	inventoryImage="industrialtest_electric_drill.png",
+	capacity=30000,
+	flow=industrialtest.api.lvPowerFlow,
+	digLevel=1,
+	digSpeedClass=4,
+	active={
+		times={[1]=1.7,[2]=1.2,[3]=1.0,[4]=0.7},
+		digSpeed=4
+	}
+})
+
+industrialtest.ElectricDrill:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:electric_drill",
@@ -125,26 +59,27 @@ minetest.register_craft({
 		{"industrialtest:refined_iron_ingot","industrialtest:re_battery","industrialtest:refined_iron_ingot"}
 	}
 })
-definition={
+
-	name="diamond_electric_drill",
+industrialtest.AdvancedElectricDrill=table.copy(industrialtest.ElectricDrillBase)
-	displayName=S("Diamond Electric Drill")
+industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricDrill,{
-}
+	name="industrialtest:advanced_electric_drill",
-if industrialtest.mtgAvailable then
+	description=S("Advanced Electric Drill"),
-	definition.maxDropLevel=1
+	inventoryImage="industrialtest_advanced_electric_drill.png",
-	definition.inactiveTimes={[1]=10,[2]=5.6,[3]=4}
+	capacity=30000,
-	definition.maxLevel=3
+	flow=industrialtest.api.lvPowerFlow,
-	definition.activeTimes={[1]=2.0,[2]=0.8,[3]=0.4}
+	digLevel=0,
-elseif industrialtest.mclAvailable then
+	digSpeedClass=5,
-	definition.digSpeedClass=5
+	active={
-	definition.maxDropLevel=5
+		times={[1]=1.0,[2]=0.7,[3]=0.3,[4]=0.1},
-	definition.inactiveDigSpeed=1
+		digSpeed=7
-	definition.digLevel=5
+	}
-	definition.activeDigSpeed=9
+})
-end
+
-registerElectricDrill(definition)
+industrialtest.AdvancedElectricDrill:register()
+
 minetest.register_craft({
 	type="shaped",
-	output="industrialtest:diamond_electric_drill",
+	output="industrialtest:advanced_electric_drill",
 	recipe={
 		{"",industrialtest.elementKeys.diamond,""},
 		{industrialtest.elementKeys.diamond,"industrialtest:electric_drill",industrialtest.elementKeys.diamond}

tools/electric_gear_tool.lua

@@ -0,0 +1,20 @@
+-- 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.ElectricGearTool=table.copy(industrialtest.GearTool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricGearTool,{
+	prepare=industrialtest.ElectricItem.prepare
+})

tools/electric_hoe.lua

@@ -15,184 +15,135 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.ElectricHoeBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricHoeBase,{
+	digs={"hoey"},
+	capacity=10000,
+	flow=industrialtest.api.lvPowerFlow
+})
 
-local electricHoe={}
+function industrialtest.ElectricHoeBase.register(self)
-
+	if industrialtest.mtgAvailable then
-electricHoe.afterUse=function(itemstack,config)
+		self.define.onUse=true
-	local meta=itemstack:get_meta()
+	elseif industrialtest.mclAvailable then
-	industrialtest.api.addPowerToItem(itemstack,-20)
+		self.define.onPlace=true
-	if meta:get_int("industrialtest.powerAmount")<20 then
-		itemstack:set_name("industrialtest:"..config.name)
 	end
-	return itemstack
+
+	industrialtest.ActivatedElectricTool.register(self)
 end
 
-local function registerElectricHoe(config)
+function industrialtest.ElectricHoeBase.hitUse(self,itemstack,user,pointed)
-	local definition={
+	-- Taken and adapted from farming mod from Minetest Game
-		description=config.displayName,
+	local pt = pointed
-		inventory_image="industrialtest_"..config.name..".png",
+	-- check if pointing at a node
-		_industrialtest_powerStorage=true,
+	if not pt then
-		_industrialtest_powerCapacity=10000,
+		return false
-		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
+	end
-		_industrialtest_inactiveName="industrialtest:"..config.name
+	if pt.type ~= "node" then
-	}
+		return false
-	if industrialtest.mtgAvailable then
+	end
-		-- Taken and adapted from farming mod from Minetest Game
-		local function onUse(user,pointed)
-			local pt = pointed
-			-- check if pointing at a node
-			if not pt then
-				return false
-			end
-			if pt.type ~= "node" then
-				return false
-			end
 
-			local under = minetest.get_node(pt.under)
+	local under = minetest.get_node(pt.under)
-			local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z}
+	local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z}
-			local above = minetest.get_node(p)
+	local above = minetest.get_node(p)
 
-			-- return if any of the nodes is not registered
+	-- return if any of the nodes is not registered
-			if not minetest.registered_nodes[under.name] then
+	if not minetest.registered_nodes[under.name] then
-				return false
+		return false
-			end
+	end
-			if not minetest.registered_nodes[above.name] then
+	if not minetest.registered_nodes[above.name] then
-				return false
+		return false
-			end
+	end
 
-			-- check if the node above the pointed thing is air
+	-- check if the node above the pointed thing is air
-			if above.name ~= "air" then
+	if above.name ~= "air" then
-				return false
+		return false
-			end
+	end
 
-			-- check if pointing at soil
+	-- check if pointing at soil
-			if minetest.get_item_group(under.name, "soil") ~= 1 then
+	if minetest.get_item_group(under.name, "soil") ~= 1 then
-				return false
+		return false
-			end
+	end
 
-			-- check if (wet) soil defined
+	-- check if (wet) soil defined
-			local regN = minetest.registered_nodes
+	local regN = minetest.registered_nodes
-			if regN[under.name].soil == nil or regN[under.name].soil.wet == nil or regN[under.name].soil.dry == nil then
+	if regN[under.name].soil == nil or regN[under.name].soil.wet == nil or regN[under.name].soil.dry == nil then
-				return false
+		return false
-			end
+	end
 
-			local player_name = user and user:get_player_name() or ""
+	local player_name = user and user:get_player_name() or ""
 
-			if minetest.is_protected(pt.under, player_name) then
+	if minetest.is_protected(pt.under, player_name) then
-				minetest.record_protection_violation(pt.under, player_name)
+		minetest.record_protection_violation(pt.under, player_name)
-				return false
+		return false
-			end
+	end
-			if minetest.is_protected(pt.above, player_name) then
+	if minetest.is_protected(pt.above, player_name) then
-				minetest.record_protection_violation(pt.above, player_name)
+		minetest.record_protection_violation(pt.above, player_name)
-				return false
+		return false
-			end
+	end
 
-			-- turn the node into soil and play sound
+	-- turn the node into soil and play sound
-			minetest.set_node(pt.under, {name = regN[under.name].soil.dry})
+	minetest.set_node(pt.under, {name = regN[under.name].soil.dry})
-			minetest.sound_play("default_dig_crumbly", {
+	minetest.sound_play("default_dig_crumbly", {
-				pos = pt.under,
+		pos = pt.under,
-				gain = 0.3,
+		gain = 0.3,
-			}, true)
+	}, true)
 
-			return true
+	return true
-		end
+end
-		definition.groups={
+
-			hoe=1
+function industrialtest.ElectricHoeBase.use(self,itemstack,user,pointed)
-		}
+	local node=minetest.get_node(pointed.under)
-		definition.on_use=function(itemstack,user,pointed)
+	if user and not user:get_player_control().sneak then
-			local meta=itemstack:get_meta()
+		if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-			if meta:get_int("industrialtest.powerAmount")>=20 and onUse(user,pointed) then
+			minetest.registered_nodes[node.name].on_rightclick(pointed.under,node,user,itemstack)
-				industrialtest.api.addPowerToItem(itemstack,-20)
-				return itemstack
-			end
-			return nil
-		end
-	elseif industrialtest.mclAvailable then
-		-- Taken from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_farming/hoes.lua#L3
-		local function createSoil(pos)
-			if pos == nil then
-				return false
-			end
-			local node = minetest.get_node(pos)
-			local name = node.name
-			local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z})
-			if minetest.get_item_group(name, "cultivatable") == 2 then
-				if above.name == "air" then
-					node.name = "mcl_farming:soil"
-					minetest.set_node(pos, node)
-					minetest.sound_play("default_dig_crumbly", { pos = pos, gain = 0.5 }, true)
-					return true
-				end
-			elseif minetest.get_item_group(name, "cultivatable") == 1 then
-				if above.name == "air" then
-					node.name = "mcl_core:dirt"
-					minetest.set_node(pos, node)
-					minetest.sound_play("default_dig_crumbly", { pos = pos, gain = 0.6 }, true)
-					return true
-				end
-			end
 			return false
 		end
-		definition.tool_capabilities={
-			full_punch_interval=0.5
-		}
-		definition.groups={
-			tool=1
-		}
-		definition.on_place=function(itemstack,user,pointed)
-			local node=minetest.get_node(pointed.under)
-			if user and not user:get_player_control().sneak then
-				if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-					return minetest.registered_nodes[node.name].on_rightclick(pointed.under,node,user,itemstack) or itemstack
-				end
-			end
-			if minetest.is_protected(pointed.under, user:get_player_name()) then
-				minetest.record_protection_violation(pointed.under,user:get_player_name())
-				return nil
-			end
-			local meta=itemstack:get_meta()
-			if meta:get_int("industrialtest.powerAmount")>=20 and createSoil(pointed.under) then
-				industrialtest.api.addPowerToItem(itemstack,-20)
-				return itemstack
-			end
-			return nil
-		end
-		definition.after_use=function(itemstack)
-			-- Hack to make sure that chainsaw won't be destroyed when has 0 EU in MCL
-			return nil
-		end
-		definition._mcl_toollike_wield=true
-		definition._mcl_diggroups={
-			hoey={
-				speed=config.inactiveDigSpeed,
-				level=config.digLevel,
-				uses=-1
-			}
-		}
 	end
-	minetest.register_tool("industrialtest:"..config.name,definition)
+	if minetest.is_protected(pointed.under, user:get_player_name()) then
-	if industrialtest.mclAvailable then
+		minetest.record_protection_violation(pointed.under,user:get_player_name())
-		definition=table.copy(definition)
+		return false
-		definition._mcl_diggroups.hoey.speed=config.activeDigSpeed
-		definition.groups.not_in_creative_inventory=1
-		definition.after_use=function(itemstack)
-			return electricHoe.afterUse(itemstack,config)
-		end
-		minetest.register_tool("industrialtest:"..config.name.."_active",definition)
-		industrialtest.internal.registeredElectricHoes["industrialtest:"..config.name.."_active"]=true
 	end
-	industrialtest.internal.registeredElectricHoes["industrialtest:"..config.name]=true
+
+	-- Taken and adapted from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_farming/hoes.lua#L3
+	local name = node.name
+	local above = minetest.get_node({x=pointed.under.x, y=pointed.under.y+1, z=pointed.under.z})
+	if minetest.get_item_group(name, "cultivatable") == 2 then
+		if above.name == "air" then
+			node.name = "mcl_farming:soil"
+			minetest.set_node(pointed.under, node)
+			minetest.sound_play("default_dig_crumbly", { pos = pointed.under, gain = 0.5 }, true)
+			return true
+		end
+	elseif minetest.get_item_group(name, "cultivatable") == 1 then
+		if above.name == "air" then
+			node.name = "mcl_core:dirt"
+			minetest.set_node(pointed.under, node)
+			minetest.sound_play("default_dig_crumbly", { pos = pointed.under, gain = 0.6 }, true)
+			return true
+		end
+	end
+	return false
 end
-local definition={
+
-	name="electric_hoe",
+function industrialtest.ElectricHoeBase.getOpPower(self,itemstack)
-	displayName=S("Electric Hoe")
+	return 50
-}
-if industrialtest.mclAvailable then
-	definition.inactiveDigSpeed=1
-	definition.digLevel=2
-	definition.activeDigSpeed=7
 end
-registerElectricHoe(definition)
+
+industrialtest.ElectricHoe=table.copy(industrialtest.ElectricHoeBase)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricHoe,{
+	name="industrialtest:electric_hoe",
+	description=S("Electric Hoe"),
+	inventoryImage="industrialtest_electric_hoe.png",
+	digLevel=0,
+	digSpeedClass=4,
+	active={
+		digSpeed=3
+	}
+})
+
+industrialtest.ElectricHoe:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:electric_hoe",
@@ -211,17 +162,25 @@ minetest.register_craft({
 		{"industrialtest:re_battery",""}
 	}
 })
+
 if industrialtest.mclAvailable then
-	registerElectricHoe({
+	industrialtest.AdvancedElectricHoe=table.copy(industrialtest.ElectricHoeBase)
-		name="diamond_electric_hoe",
+	industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricHoe,{
-		displayName=S("Diamond Electric Hoe"),
+		name="industrialtest:advanced_electric_hoe",
-		inactiveDigSpeed=1,
+		description=S("Advanced Electric Hoe"),
-		digLevel=5,
+		inventoryImage="industrialtest_advanced_electric_hoe.png",
-		activeDigSpeed=9
+		digLevel=0,
+		digSpeedClass=5,
+		active={
+			digSpeed=7
+		}
 	})
+
+	industrialtest.AdvancedElectricHoe:register()
+
 	minetest.register_craft({
 		type="shapeless",
-		output="industrialtest:diamond_electric_hoe",
+		output="industrialtest:advanced_electric_hoe",
 		recipe={
 			"industrialtest:electric_hoe",
 			industrialtest.elementKeys.diamond,

tools/electric_item.lua

@@ -0,0 +1,26 @@
+-- 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.ElectricItem=table.copy(industrialtest.Item)
+
+function industrialtest.ElectricItem.prepare(self,itemstack)
+	local meta=itemstack:get_meta()
+	if industrialtest.api.hasPowerStorage(meta) then
+		return
+	end
+	industrialtest.api.addPowerStorage(meta,self.capacity,self.flow,"n/a")
+	industrialtest.api.updateItemPowerText(itemstack)
+end

tools/electric_saber.lua

@@ -14,162 +14,95 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+-- This entire code is super hacky, I'm aware.
+
 local S=minetest.get_translator("industrialtest")
+industrialtest.ElectricSaberBase=table.copy(industrialtest.ActivatedElectricTool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricSaberBase,{
+	fullPunchInterval=0.5,
+	digs={"snappy"},
+	hits={"fleshy"},
+	capacity=100000,
+	flow=industrialtest.api.hvPowerFlow
+})
 
-local electricSaber={}
+function industrialtest.ElectricSaberBase.createActiveDefinitionTable(self)
-
+	self.define.onUse=false
-electricSaber.afterUse=function(itemstack,config)
+	return industrialtest.ActivatedElectricTool.createActiveDefinitionTable(self)
-	local meta=itemstack:get_meta()
-	industrialtest.api.addPowerToItem(itemstack,-20)
-	if meta:get_int("industrialtest.powerAmount")<20 then
-		itemstack:set_name("industrialtest:"..config.name)
-	end
-	return itemstack
 end
 
-local function registerElectricSaber(config)
+function industrialtest.ElectricSaberBase.hitUse(self,itemstack,user,pointed)
-	local definition={
+	if self:canActivate(itemstack) and pointed.type=="object" then
-		description=config.displayName,
+		-- pointed is a ObjectRef
-		inventory_image="industrialtest_"..config.name..".png",
+		industrialtest.api.addPowerToItem(itemstack,-self:getOpPower(itemstack))
-		after_use=function()
+		local toolCapabilities={damage_groups={}}
-			-- Hack to make sure that saber won't be destroyed when has 0 EU
+		for _,hitType in ipairs(self.hits) do
-			return nil
+			toolCapabilities.damage_groups[hitType]=self.active.damage
-		end,
+		end
-		_industrialtest_powerStorage=true,
+		pointed.ref:punch(user,nil,toolCapabilities)
-		_industrialtest_powerCapacity=10000,
+		return true
-		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
+	end
-		_industrialtest_inactiveName="industrialtest:"..config.name
+	return false
+end
+
+function industrialtest.ElectricSaberBase.afterUse(self,itemstack,user,node,digparams)
+	industrialtest.ActivatedElectricTool.afterUse(self,itemstack,user,node,digparams)
+	itemstack:set_name(self.name)
+	return true
+end
+
+function industrialtest.ElectricSaberBase.getOpPower(self,itemstack)
+	return 500
+end
+
+industrialtest.ElectricSaber=table.copy(industrialtest.ElectricSaberBase)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricSaber,{
+	name="industrialtest:electric_saber",
+	description=S("Electric Saber"),
+	inventoryImage="industrialtest_electric_saber.png",
+	digLevel=0,
+	digSpeedClass=4,
+	active={
+		digSpeed=7,
+		times={[1]=0.7,[2]=0.5,[3]=0.2,[4]=0.15},
+		damage=3
 	}
-	if industrialtest.mtgAvailable then
+})
-		definition.groups={
+
-			sword=1
+industrialtest.ElectricSaber:register()
-		}
+
-		definition.tool_capabilities={
-			full_punch_interval=0.5,
-			max_drop_level=config.maxDropLevel,
-			groupcaps={
-				snappy={
-					times=config.inactiveTimes,
-					maxlevel=config.maxLevel
-				}
-			},
-			damage_groups={fleshy=config.inactiveDamage}
-		}
-	elseif industrialtest.mclAvailable then
-		definition.groups={
-			weapon=1,
-			sword=1,
-			dig_speed_class=config.digSpeedClass
-		}
-		definition.tool_capabilities={
-			full_punch_interval=0.5,
-			max_drop_level=config.maxDropLevel,
-			damage_groups={fleshy=config.inactiveDamage}
-		}
-		definition._mcl_toollike_wield=true
-		definition._mcl_diggroups={
-			swordy={
-				speed=config.inactiveDigSpeed,
-				level=config.digLevel,
-				uses=-1
-			},
-			swordy_cobweb={
-				speed=config.inactiveDigSpeed,
-				level=config.digLevel,
-				uses=-1
-			}
-		}
-	end
-	minetest.register_tool("industrialtest:"..config.name,definition)
-	definition=table.copy(definition)
-	if industrialtest.mtgAvailable then
-		definition.tool_capabilities.groupcaps.snappy.times=config.activeTimes
-		definition.tool_capabilities.damage_groups.fleshy=config.activeDamage
-	elseif industrialtest.mclAvailable then
-		definition.tool_capabilities.damage_groups.fleshy=config.activeDamage
-		definition._mcl_diggroups.swordy.speed=config.activeDigSpeed
-		definition._mcl_diggroups.swordy_cobweb.speed=config.activeDigSpeed
-	end
-	definition.groups.not_in_creative_inventory=1
-	definition.after_use=function(itemstack)
-		return electricSaber.afterUse(itemstack,config)
-	end
-	minetest.register_tool("industrialtest:"..config.name.."_active",definition)
-	industrialtest.internal.registeredElectricSabers["industrialtest:"..config.name]=true
-	industrialtest.internal.registeredElectricSabers["industrialtest:"..config.name.."_active"]=true
-end
-local definition={
-	name="electric_saber",
-	displayName=S("Electric Saber")
-}
-if industrialtest.mtgAvailable then
-	definition.maxDropLevel=1
-	definition.inactiveTimes={[1]=10,[2]=5.6,[3]=4}
-	definition.maxLevel=3
-	definition.inactiveDamage=1
-	definition.activeTimes={[1]=2.0,[2]=0.8,[3]=0.4}
-	definition.activeDamage=6
-elseif industrialtest.mclAvailable then
-	definition.digSpeedClass=4
-	definition.maxDropLevel=4
-	definition.inactiveDamage=1
-	definition.inactiveDigSpeed=1
-	definition.digLevel=4
-	definition.activeDamage=6
-	definition.activeDigSpeed=7
-end
-registerElectricSaber(definition)
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:electric_saber",
 	recipe={
-		{"industrialtest:refined_iron_ingot"},
+		{industrialtest.elementKeys.yellowDust,"industrialtest:advanced_alloy",""},
-		{"industrialtest:refined_iron_ingot"},
+		{industrialtest.elementKeys.yellowDust,"industrialtest:advanced_alloy",""},
-		{"industrialtest:re_battery"}
+		{"industrialtest:carbon_plate","industrialtest:energy_crystal","industrialtest:carbon_plate"}
 	}
 })
-definition={
+
-	name="diamond_electric_saber",
+industrialtest.AdvancedElectricSaber=table.copy(industrialtest.ElectricSaberBase)
-	displayName=S("Diamond Electric Saber")
+industrialtest.internal.unpackTableInto(industrialtest.AdvancedElectricSaber,{
-}
+	name="industrialtest:advanced_electric_saber",
-if industrialtest.mtgAvailable then
+	description=S("Advanced Electric Saber"),
-	definition.maxDropLevel=1
+	inventoryImage="industrialtest_advanced_electric_saber.png",
-	definition.inactiveTimes={[1]=10,[2]=5.6,[3]=4}
+	digLevel=0,
-	definition.maxLevel=3
+	digSpeedClass=5,
-	definition.inactiveDamage=1
+	active={
-	definition.activeTimes={[1]=2.0,[2]=0.8,[3]=0.4}
+		digSpeed=8,
-	definition.activeDamage=9
+		times={[1]=0.5,[2]=0.2,[3]=0.15,[4]=0.1},
-elseif industrialtest.mclAvailable then
+		damage=5
-	definition.digSpeedClass=5
+	}
-	definition.maxDropLevel=5
+})
-	definition.inactiveDamage=1
+
-	definition.inactiveDigSpeed=1
+industrialtest.AdvancedElectricSaber:register()
-	definition.digLevel=5
+
-	definition.activeDamage=9
-	definition.activeDigSpeed=9
-end
-registerElectricSaber(definition)
 minetest.register_craft({
 	type="shapeless",
-	output="industrialtest:diamond_electric_saber",
+	output="industrialtest:advanced_electric_saber",
 	recipe={
 		"industrialtest:electric_saber",
 		industrialtest.elementKeys.diamond,
 		industrialtest.elementKeys.diamond
 	}
 })
-
-minetest.register_on_punchplayer(function(player,hitter)
-	local itemstack=hitter:get_wielded_item()
-	if industrialtest.internal.registeredElectricSabers[itemstack:get_name()] then
-		local meta=itemstack:get_meta()
-		if meta:get_int("industrialtest.powerAmount")>=20 then
-			industrialtest.api.addPowerToItem(itemstack,-20)
-			hitter:set_wielded_item(itemstack)
-			local def=minetest.registered_tools[itemstack:get_name().."_active"]
-			player:set_hp(player:get_hp()-def.tool_capabilites.damage_groups.fleshy)
-			return true
-		end
-	end
-	return false
-end)

tools/electric_tool.lua

@@ -0,0 +1,76 @@
+-- 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.ElectricTool=table.copy(industrialtest.Tool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricTool,{
+	prepare=industrialtest.ElectricItem.prepare
+})
+
+function industrialtest.ElectricTool.createDefinitionTable(self)
+	local def=industrialtest.Tool.createDefinitionTable(self)
+	def.after_use=function()
+		-- Hack to make sure that chainsaw won't be destroyed when has 0 EU
+		return nil
+	end
+	return def
+end
+
+function industrialtest.ElectricTool.onPlace(self,itemstack,user,pointed)
+	self:prepare(itemstack)
+
+	local meta=itemstack:get_meta()
+	local opPower=self:getOpPower(itemstack)
+	if meta:get_int("industrialtest.powerAmount")<opPower then
+		return false
+	end
+
+	if self:use(itemstack,user,pointed) then
+		industrialtest.api.addPowerToItem(itemstack,-opPower)
+	end
+	return true
+end
+
+function industrialtest.ElectricTool.onUse(self,itemstack,user,pointed)
+	self:prepare(itemstack)
+
+	if user:is_player() then
+		local controls=user:get_player_control()
+		if controls.sneak and self:changeMode(itemstack) then
+			return true
+		end
+	end
+
+	local meta=itemstack:get_meta()
+	local opPower=self:getOpPower(itemstack)
+	if meta:get_int("industrialtest.powerAmount")<opPower then
+		return false
+	end
+
+	if self:hitUse(itemstack,user,pointed) then
+		industrialtest.api.addPowerToItem(itemstack,-opPower)
+	end
+	return true
+end
+
+function industrialtest.ElectricTool.changeMode(self,itemstack)
+	-- dummy function
+	return false
+end
+
+function industrialtest.ElectricTool.getOpPower(self,itemstack)
+	-- dummy function
+	return 0
+end

tools/fluid_container_item.lua

@@ -0,0 +1,27 @@
+-- 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.FluidContainerItem=table.copy(industrialtest.Item)
+
+function industrialtest.FluidContainerItem.prepare(self,itemstack)
+	if industrialtest.api.itemHasFluidStorage(itemstack) then
+		return
+	end
+	local meta=itemstack:get_meta()
+	meta:set_int("industrialtest.fluidAmount",0)
+	meta:set_int("industrialtest.fluidCapacity",self.capacity)
+	industrialtest.api.updateItemFluidText(itemstack)
+end

tools/fluid_storage.lua

@@ -0,0 +1,45 @@
+-- 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/>.
+
+local S=minetest.get_translator("industrialtest")
+
+industrialtest.FuelCan=table.copy(industrialtest.FluidContainerItem)
+industrialtest.internal.unpackTableInto(industrialtest.FuelCan,{
+	name="industrialtest:fuel_can",
+	description=S("Fuel Can"),
+	inventoryImage="industrialtest_fuel_can.png",
+	capacity=10000
+})
+
+function industrialtest.FuelCan.createDefinitionTable(self)
+	local def=industrialtest.FluidContainerItem.createDefinitionTable(self)
+	def.groups._industrialtest_fueled=1
+	def.groups._industrialtest_fuel=1
+	return def
+end
+
+industrialtest.FuelCan:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:fuel_can",
+	recipe={
+		{"","industrialtest:tin_plate","industrialtest:tin_plate"},
+		{"industrialtest:tin_plate","","industrialtest:tin_plate"},
+		{"industrialtest:tin_plate","industrialtest:tin_plate","industrialtest:tin_plate"}
+	}
+})
+

tools/gear_tool.lua

@@ -0,0 +1,72 @@
+-- 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.GearTool=table.copy(industrialtest.Item)
+
+function industrialtest.GearTool.createDefinitionTable(self)
+	local def=industrialtest.Item.createDefinitionTable(self)
+
+	def.groups._industrialtest_gearTool=1
+	def.groups["armor_"..self.part]=1
+	if industrialtest.mtgAvailable then
+		def.groups.armor_heal=1
+	elseif industrialtest.mclAvailable then
+		def.groups.armor=1
+		def.groups.non_combat_armor=1
+		def.sounds={
+			_mcl_armor_equip="mcl_armor_equip_iron",
+			_mcl_armor_unequip="mcl_armor_unequip_iron"
+		}
+		def.on_place=mcl_armor.equip_on_use
+		def.on_secondary_use=mcl_armor.equip_on_use
+		def._mcl_armor_element=self.part
+		def._mcl_armor_texture=self.modelImage
+	end
+
+	return def
+end
+
+function industrialtest.GearTool.register(self)
+	local def=self:createDefinitionTable()
+	if industrialtest.mtgAvailable then
+		armor:register_armor(self.name,def)
+	elseif industrialtest.mclAvailable then
+		minetest.register_tool(self.name,def)
+	end
+end
+
+minetest.register_globalstep(function(dtime)
+	local players=minetest.get_connected_players()
+	for _,player in ipairs(players) do
+		local inv
+		if industrialtest.mtgAvailable then
+			_,inv=armor:get_valid_player(player,"")
+		elseif industrialtest.mclAvailable then
+			inv=player:get_inventory()
+		end
+		if inv then
+			local armorList=inv:get_list("armor")
+			assert(armorList)
+			for i,itemstack in ipairs(armorList) do
+				local def=itemstack:get_definition()
+				if def and def.groups._industrialtest_gearTool and def._industrialtest_self and def._industrialtest_self.update and
+					def._industrialtest_self:update(player,inv,itemstack,dtime) then
+					inv:set_stack("armor",i,itemstack)
+				end
+			end
+		end
+	end
+end)

tools/item.lua

@@ -0,0 +1,54 @@
+-- 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.Item={}
+
+function industrialtest.Item.createDefinitionTable(self)
+	local def={
+		description=self.description,
+		inventory_image=self.inventoryImage,
+		groups={},
+		_industrialtest_self=self
+	}
+
+	if industrialtest.mtgAvailable then
+		def.groups.flammable=self.flammable
+	end
+
+	return def
+end
+
+function industrialtest.Item.register(self)
+	local def=self:createDefinitionTable()
+	minetest.register_tool(self.name,def)
+end
+
+-- Item callbacks
+minetest.register_on_player_inventory_action(function(player,action,inventory,info)
+	if action=="put" then
+		local def=info.stack:get_definition()
+		if def and def._industrialtest_self and def._industrialtest_self.prepare then
+			def._industrialtest_self:prepare(info.stack)
+			inventory:set_stack(info.listname,info.index,info.stack)
+		end
+	end
+end)
+minetest.register_on_craft(function(itemstack)
+	local def=itemstack:get_definition()
+	if def and def._industrialtest_self and def._industrialtest_self.prepare then
+		def._industrialtest_self:prepare(itemstack)
+	end
+end)

tools/jetpack.lua

@@ -15,71 +15,39 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.JetpackBase=table.copy(industrialtest.GearTool)
+industrialtest.internal.unpackTableInto(industrialtest.JetpackBase,{
+	part="torso"
+})
+local soundHandles = {}
 
-local jetpack={}
+function industrialtest.JetpackBase.update(self, player, inv, itemstack, dtime)
-local electricJetpack={}
+	local playerName = player:get_player_name()
-
+	local control = player:get_player_control()
-local function registerJetpack(config)
+	if control.jump and self:tryFly(itemstack) then
-	if industrialtest.mclAvailable then
+		self.addYVelocityClamped(player,1,10)
-		local groups={
+		if not soundHandles[playerName] then
-			armor=1,
+			local pos = player:get_pos()
-			non_combat_armor=1,
+			local handle = minetest.sound_play("industrialtest_jetpack_loop", {
-			armor_torso=1,
+				pos = pos,
-			non_combat_torso=1,
+				gain = 1.0, -- Volume of the sound
-			_industrialtest_jetpack=1
+				max_hear_distance = 16, -- Maximum distance to hear the sound
-		}
+				object = player, -- Attach the sound to the player
-		if config.groups then
+				loop = true, -- The sound is played in a loop
-			for key,value in pairs(config.groups) do
+			})
-				groups[key]=value
+			soundHandles[playerName] = handle
-			end
 		end
-		local definition={
+		return true
-			description=config.displayName,
+	else
-			inventory_image="industrialtest_"..config.name.."_inv.png",
+		if soundHandles[playerName] then
-			groups=groups,
+			minetest.sound_stop(soundHandles[playerName])
-			sounds={
+			soundHandles[playerName] = nil
-				_mcl_armor_equip="mcl_armor_equip_iron",
-				_mcl_armor_unequip="mcl_armor_unequip_iron"
-			},
-			on_place=mcl_armor.equip_on_use,
-			on_secondary_use=mcl_armor.equip_on_use,
-			_mcl_armor_element="torso",
-			_mcl_armor_texture="industrialtest_"..config.name..".png",
-			_industrialtest_tryFly=config.tryFly
-		}
-		if config.customKeys then
-			for key,value in pairs(config.customKeys) do
-				definition[key]=value
-			end
 		end
-		minetest.register_tool("industrialtest:"..config.name,definition)
-	elseif industrialtest.mtgAvailable then
-		local groups={
-			armor_torso=1,
-			armor_heal=0,
-			_industrialtest_jetpack=1
-		}
-		if config.groups then
-			for key,value in pairs(config.groups) do
-				groups[key]=value
-			end
-		end
-		local definition={
-			description=config.displayName,
-			inventory_image="industrialtest_"..config.name.."_inv.png",
-			groups=groups,
-			_industrialtest_tryFly=config.tryFly
-		}
-		if config.customKeys then
-			for key,value in pairs(config.customKeys) do
-				definition[key]=value
-			end
-		end
-		armor:register_armor("industrialtest:"..config.name,definition)
 	end
+	return false
 end
 
-local function addYVelocityClamped(player,vel,max)
+function industrialtest.JetpackBase.addYVelocityClamped(player,vel,max)
 	local playerVel=player:get_velocity()
 	if playerVel.y+vel>max then
 		player:add_velocity(vector.new(0,math.max(max-playerVel.y,0),0))
@@ -88,39 +56,33 @@ local function addYVelocityClamped(player,vel,max)
 	end
 end
 
-local function onGlobalStep(player,inv,itemstack,index,def)
+industrialtest.Jetpack=table.copy(industrialtest.JetpackBase)
-	if def.groups and def.groups._industrialtest_jetpack then
+industrialtest.internal.unpackTableInto(industrialtest.Jetpack,{
-		if def._industrialtest_tryFly(itemstack) then
+	-- _v is hack to suppress "Registered armor doesn't have material at the end of registration name" warning from 3D Armor.
-			addYVelocityClamped(player,1,10)
+	name="industrialtest:jetpack_v",
-			inv:set_stack("armor",index,itemstack)
+	description=S("Jetpack"),
-		end
+	inventoryImage="industrialtest_jetpack_v_inv.png",
-		return true
+	modelImage="industrialtest_jetpack_v.png",
-	end
+	capacity=5000,
-	return false
+	prepare=industrialtest.FluidContainerItem.prepare
+})
+
+function industrialtest.Jetpack.createDefinitionTable(self)
+	local def=industrialtest.JetpackBase.createDefinitionTable(self)
+	def.groups._industrialtest_fueled=1
+	return def
 end
 
-jetpack.tryFly=function(itemstack)
+function industrialtest.Jetpack.tryFly(self,itemstack)
-	local meta=itemstack:get_meta()
+	if industrialtest.api.isItemFluidStorageEmpty(itemstack) then
-	if meta:get_int("industrialtest.fluidAmount")==0 then
 		return false
 	end
 	industrialtest.api.addFluidToItem(itemstack,-1)
 	return true
 end
 
--- _v is hack to suppress "Registered armor doesn't have material at the end of registration name" warning from 3D Armor.
+industrialtest.Jetpack:register()
-registerJetpack({
+
-	name="jetpack_v",
-	displayName=S("Jetpack"),
-	groups={
-		_industrialtest_fueled=1,
-		_industrialtest_fluidStorage=1
-	},
-	tryFly=jetpack.tryFly,
-	customKeys={
-		_industrialtest_fluidCapacity=5000
-	}
-})
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:jetpack_v",
@@ -131,7 +93,18 @@ minetest.register_craft({
 	}
 })
 
-electricJetpack.tryFly=function(itemstack)
+industrialtest.ElectricJetpack=table.copy(industrialtest.JetpackBase)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricJetpack,{
+	name="industrialtest:electric_jetpack",
+	description=S("Electric Jetpack"),
+	inventoryImage="industrialtest_electric_jetpack_inv.png",
+	modelImage="industrialtest_electric_jetpack.png",
+	flow=industrialtest.api.lvPowerFlow,
+	capacity=30000,
+	prepare=industrialtest.ElectricItem.prepare
+})
+
+function industrialtest.ElectricJetpack.tryFly(self,itemstack)
 	local meta=itemstack:get_meta()
 	if meta:get_int("industrialtest.powerAmount")<10 then
 		return false
@@ -140,16 +113,8 @@ electricJetpack.tryFly=function(itemstack)
 	return true
 end
 
-registerJetpack({
+industrialtest.ElectricJetpack:register()
-	name="electric_jetpack",
+
-	displayName=S("Electric Jetpack"),
-	tryFly=electricJetpack.tryFly,
-	customKeys={
-		_industrialtest_powerStorage=true,
-		_industrialtest_powerCapacity=30000,
-		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow
-	}
-})
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:electric_jetpack",
@@ -159,32 +124,3 @@ minetest.register_craft({
 		{industrialtest.elementKeys.yellowDust,"",industrialtest.elementKeys.yellowDust}
 	}
 })
-
-minetest.register_globalstep(function(dtime)
-	-- FIXME: Maybe this can be optimized?
-	local players=minetest.get_connected_players()
-	for _,player in ipairs(players) do
-		local control=player:get_player_control()
-		if control.jump then
-			if industrialtest.mclAvailable then
-				local inv=player:get_inventory()
-				local stack=inv:get_stack("armor",3)
-				local def=stack:get_definition()
-				onGlobalStep(player,inv,stack,3,def)
-			elseif industrialtest.mtgAvailable then
-				local _,inv=armor:get_valid_player(player,"")
-				if inv then
-					local armorList=inv:get_list("armor")
-					assert(armorList)
-					for i=1,#armorList do
-						local stack=armorList[i]
-						local def=stack:get_definition()
-						if onGlobalStep(player,inv,stack,i,def) then
-							break
-						end
-					end
-				end
-			end
-		end
-	end
-end)

tools/mining_laser.lua

@@ -15,10 +15,9 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.MiningLaserBeam={}
 
-local beam={}
+function industrialtest.MiningLaserBeam.onActivate(self,staticdata)
-
-beam.onActivate=function(self,staticdata)
 	local data=minetest.deserialize(staticdata)
 	self.direction=data.direction
 	self.energy=data.energy
@@ -28,11 +27,11 @@ beam.onActivate=function(self,staticdata)
 	self.user=data.user
 end
 
-beam.onPunch=function()
+function industrialtest.MiningLaserBeam.onPunch()
 	return true
 end
 
-beam.onNodeBreak=function(pos,node,user)
+function industrialtest.MiningLaserBeam.onNodeBreak(pos,node,user)
 	if industrialtest.mclAvailable then
 		local drops=minetest.get_node_drops(node.name,"")
 		for _, val in ipairs(drops) do
@@ -45,7 +44,7 @@ beam.onNodeBreak=function(pos,node,user)
 	minetest.node_dig(pos,node,user)
 end
 
-beam.onStep=function(self,dtime,moveresult)
+function industrialtest.MiningLaserBeam.onStep(self,dtime,moveresult)
 	local pos=self.object:get_pos()
 	if vector.distance(self.startPos,pos)>=self.distance or self.energy<=0 then
 		self.object:remove()
@@ -67,7 +66,7 @@ beam.onStep=function(self,dtime,moveresult)
 						self.object:remove()
 						return
 					else
-						beam.onNodeBreak(val.node_pos,node,minetest.get_player_by_name(self.user))
+						industrialtest.MiningLaserBeam.onNodeBreak(val.node_pos,node,minetest.get_player_by_name(self.user))
 						self.energy=self.energy-1
 					end
 				elseif self.mode==4 then
@@ -80,6 +79,7 @@ beam.onStep=function(self,dtime,moveresult)
 	end
 end
 
+-- Note: If there are more entities registered then replace manual registration with proper pseudo-OOP
 minetest.register_entity("industrialtest:mining_laser_beam",{
 	initial_properties={
 		physical=true,
@@ -103,18 +103,77 @@ minetest.register_entity("industrialtest:mining_laser_beam",{
 		static_save=false,
 		shaded=false,
 	},
-	on_activate=beam.onActivate,
+	on_activate=industrialtest.MiningLaserBeam.onActivate,
-	on_punch=beam.onPunch,
+	on_punch=industrialtest.MiningLaserBeam.onPunch,
-	on_step=beam.onStep
+	on_step=industrialtest.MiningLaserBeam.onStep
 })
 
-local miningLaser={}
+industrialtest.MiningLaser=table.copy(industrialtest.ElectricTool)
-miningLaser.mode1OpPower=1250
+industrialtest.internal.unpackTableInto(industrialtest.MiningLaser,{
-miningLaser.mode2OpPower=100
+	name="industrialtest:mining_laser",
-miningLaser.mode4OpPower=5000
+	description=S("Mining Laser (Mode 1)"),
-miningLaser.modeCount=4
+	inventoryImage="industrialtest_mining_laser.png",
+	capacity=300000,
+	flow=industrialtest.api.hvPowerFlow,
+	define={onUse=true},
+	_modeCount=4
+})
 
-miningLaser.getMode=function(itemstack)
+function industrialtest.MiningLaser.hitUse(self,itemstack,user,pointed)
+	if not user:is_player() then
+		return false
+	end
+	local control=user:get_player_control()
+	if control.sneak then
+	end
+	local mode=self.getMode(itemstack)
+	local meta=itemstack:get_meta()
+	if mode==1 then
+		if not self:spawnBeam(itemstack,user,user:get_pos(),user:get_look_dir(),10,64) then
+			return false
+		end
+	elseif mode==2 then
+		if not self:spawnBeam(itemstack,user,user:get_pos(),user:get_look_dir(),3,2) then
+			return false
+		end
+	elseif mode==3 then
+		local yaw=user:get_look_horizontal()
+		local dir=vector.new(-math.sin(yaw),0,math.cos(yaw))
+		if not self:spawnBeam(itemstack,user,user:get_pos(),dir,10,64) then
+			return false
+		end
+	elseif mode==4 then
+		if not self:spawnBeam(itemstack,user,user:get_pos(),user:get_look_dir(),1,64) then
+			return false
+		end
+	end
+	return true
+end
+
+function industrialtest.MiningLaser.changeMode(self,itemstack)
+	local mode=self.getMode(itemstack)
+	mode=mode+1
+	if mode>=self._modeCount+1 then
+		mode=1
+	end
+	self.setMode(itemstack,mode)
+	return true
+end
+
+function industrialtest.MiningLaser.getOpPower(self,itemstack)
+	local mode=self.getMode(itemstack)
+	if mode==1 then
+		return 1250
+	elseif mode==2 or mode==3 then
+		return 100
+	elseif mode==4 then
+		return 5000
+	end
+	-- assert not reached
+	assert(false)
+end
+
+function industrialtest.MiningLaser.getMode(itemstack)
 	local meta=itemstack:get_meta()
 	if not meta:contains("mode") then
 		meta:set_int("mode",1)
@@ -123,74 +182,26 @@ miningLaser.getMode=function(itemstack)
 	return meta:get_int("mode")
 end
 
-miningLaser.setMode=function(itemstack,mode)
+function industrialtest.MiningLaser.setMode(itemstack,mode)
 	local meta=itemstack:get_meta()
 	meta:set_int("mode",mode)
 	meta:set_string("industrialtest.descriptionOverride",S("Mining Laser (Mode @1)",mode))
 	industrialtest.api.updateItemPowerText(itemstack)
 end
 
-miningLaser.spawnBeam=function(itemstack,user,pos,dir,opPower,energy,distance)
+function industrialtest.MiningLaser.spawnBeam(self,itemstack,user,pos,dir,energy,distance)
-	local meta=itemstack:get_meta()
-	if meta:get_int("industrialtest.powerAmount")<opPower then
-		return false
-	end
 	minetest.add_entity(pos+vector.new(0,1.5,0),"industrialtest:mining_laser_beam",minetest.serialize({
 		direction=dir,
 		energy=energy,
 		distance=distance,
-		mode=miningLaser.getMode(itemstack),
+		mode=self.getMode(itemstack),
 		user=user:get_player_name()
 	}))
-	industrialtest.api.addPowerToItem(itemstack,-opPower)
 	return true
 end
 
-miningLaser.onUse=function(itemstack,user)
+industrialtest.MiningLaser:register()
-	if not user:is_player() then
-		return nil
-	end
-	local mode=miningLaser.getMode(itemstack)
-	local control=user:get_player_control()
-	if control.sneak then
-		mode=mode+1
-		if mode>=miningLaser.modeCount+1 then
-			mode=1
-		end
-		miningLaser.setMode(itemstack,mode)
-		return itemstack
-	end
-	local meta=itemstack:get_meta()
-	if mode==1 then
-		if not miningLaser.spawnBeam(itemstack,user,user:get_pos(),user:get_look_dir(),miningLaser.mode1OpPower,10,64) then
-			return nil
-		end
-	elseif mode==2 then
-		if not miningLaser.spawnBeam(itemstack,user,user:get_pos(),user:get_look_dir(),miningLaser.mode2OpPower,3,2) then
-			return nil
-		end
-	elseif mode==3 then
-		local yaw=user:get_look_horizontal()
-		local dir=vector.new(-math.sin(yaw),0,math.cos(yaw))
-		if not miningLaser.spawnBeam(itemstack,user,user:get_pos(),dir,miningLaser.mode1OpPower,10,64) then
-			return nil
-		end
-	elseif mode==4 then
-		if not miningLaser.spawnBeam(itemstack,user,user:get_pos(),user:get_look_dir(),miningLaser.mode4OpPower,1,64) then
-			return nil
-		end
-	end
-	return itemstack
-end
 
-minetest.register_tool("industrialtest:mining_laser",{
-	description=S("Mining Laser (Mode 1)"),
-	inventory_image="industrialtest_mining_laser.png",
-	on_use=miningLaser.onUse,
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=300000,
-	_industrialtest_powerFlow=industrialtest.api.hvPowerFlow
-})
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:mining_laser",

tools/nano_suit.lua

@@ -15,62 +15,66 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.NanoSuit=table.copy(industrialtest.ElectricArmor)
+industrialtest.internal.unpackTableInto(industrialtest.NanoSuit,{
+	name="industrialtest:nano",
+	elements={
+		{
+			name="helmet",
+			description=S("Nano Helmet"),
+			element="head",
+			inventoryImage="industrialtest_nano_helmet_inv.png",
+			texture="industrialtest_nano_helmet.png"
+		},
+		{
+			name="bodyarmor",
+			description=S("Nano Bodyarmor"),
+			element="torso",
+			inventoryImage="industrialtest_nano_bodyarmor_inv.png",
+			texture="industrialtest_nano_bodyarmor.png"
+		},
+		{
+			name="leggings",
+			description=S("Nano Leggings"),
+			element="legs",
+			inventoryImage="industrialtest_nano_leggings_inv.png",
+			texture="industrialtest_nano_leggings.png"
+		},
+		{
+			name="boots",
+			description=S("Nano Boots"),
+			element="feet",
+			inventoryImage="industrialtest_nano_boots_inv.png",
+			texture={
+				"industrialtest_nano_boots.png",
+				"industrialtest_mcl_nano_boots.png"
+			}
+		}
+	},
+	capacity=1000000,
+	flow=industrialtest.api.evPowerFlow
+})
 
-local function registerNanoSuitPart(config)
+function industrialtest.NanoSuit.getReducedDamageForItem(self,itemstack)
-	local groups={
+	local def=itemstack:get_definition()
-		_industrialtest_nanoSuit=1
+	if def.groups.armor_head then
-	}
+		return 0.12
-	if config.element=="head" then
+	elseif def.groups.armor_torso then
-		groups.armor_head=1
+		return 0.32
-	elseif config.element=="torso" then
+	elseif def.groups.armor_legs then
-		groups.armor_torso=1
+		return 0.3
-	elseif config.element=="legs" then
+	elseif def.groups.armor_feet then
-		groups.armor_legs=1
+		return 0.24
-	elseif config.element=="feet" then
-		groups.armor_feet=1
-	end
-	if industrialtest.mtgAvailable then
-		groups.armor_heal=0
-		armor:register_armor("industrialtest:"..config.name,{
-			description=config.displayName,
-			inventory_image="industrialtest_"..config.name.."_inv.png",
-			groups=groups,
-			_industrialtest_powerStorage=true,
-			_industrialtest_powerCapacity=1000000,
-			_industrialtest_powerFlow=industrialtest.api.evPowerFlow,
-			_industrialtest_damageReduction=config.damageReduction,
-			industrialtest_powerPerDamage=5000
-		})
-	elseif industrialtest.mclAvailable then
-		groups.armor=1
-		groups.non_combat_armor=1
-		minetest.register_tool("industrialtest:"..config.name,{
-			description=config.displayName,
-			inventory_image="industrialtest_"..config.name.."_inv.png",
-			groups=groups,
-			sounds={
-				_mcl_armor_equip="mcl_armor_equip_iron",
-				_mcl_armor_unequip="mcl_armor_unequip_iron"
-			},
-			on_place=mcl_armor.equip_on_use,
-			on_secondary_use=mcl_armor.equip_on_use,
-			_mcl_armor_element=config.element,
-			_mcl_armor_texture=(config.element=="feet" and "industrialtest_mcl_" or "industrialtest_")..config.name..".png",
-			_industrialtest_powerStorage=true,
-			_industrialtest_powerCapacity=1000000,
-			_industrialtest_powerFlow=industrialtest.api.evPowerFlow,
-			_industrialtest_damageReduction=config.damageReduction,
-			_industrialtest_powerPerDamage=5000
-		})
 	end
+	return 0
 end
 
-registerNanoSuitPart({
+function industrialtest.NanoSuit.getPowerPerDamageForItem(self,itemstack)
-	name="nano_helmet",
+	return 5000
-	displayName=S("Nano Helmet"),
+end
-	element="head",
+
-	damageReduction=0.12
+industrialtest.NanoSuit:register()
-})
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:nano_helmet",
@@ -80,12 +84,6 @@ minetest.register_craft({
 	}
 })
 
-registerNanoSuitPart({
-	name="nano_bodyarmor",
-	displayName=S("Nano Bodyarmor"),
-	element="torso",
-	damageReduction=0.32
-})
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:nano_bodyarmor",
@@ -96,12 +94,6 @@ minetest.register_craft({
 	}
 })
 
-registerNanoSuitPart({
-	name="nano_leggings",
-	displayName=S("Nano Leggings"),
-	element="legs",
-	damageReduction=0.3
-})
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:nano_leggings",
@@ -112,12 +104,6 @@ minetest.register_craft({
 	}
 })
 
-registerNanoSuitPart({
-	name="nano_boots",
-	displayName=S("Nano Boots"),
-	element="feet",
-	damageReduction=0.24
-})
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:nano_boots",
@@ -126,41 +112,3 @@ minetest.register_craft({
 		{"industrialtest:carbon_plate","industrialtest:energy_crystal","industrialtest:carbon_plate"}
 	}
 })
-
-minetest.register_on_player_hpchange(function(player,hpChange)
-	if hpChange>0 or not player:is_player() then
-		return hpChange
-	end
-
-	local inv
-	if industrialtest.mtgAvailable then
-		_,inv=armor:get_valid_player(player,"")
-		if not inv then
-			return hpChange
-		end
-	elseif industrialtest.mclAvailable then
-		inv=player:get_inventory()
-	end
-
-	local armorList=inv:get_list("armor")
-	assert(armorList)
-	local result=hpChange
-	for i=1,#armorList do
-		local stack=armorList[i]
-		local def=stack:get_definition()
-		if def.groups and def.groups._industrialtest_nanoSuit then
-			local meta=stack:get_meta()
-			local targetReducedDamage=math.floor(math.abs(hpChange)*def._industrialtest_damageReduction)
-			local requiredPower=targetReducedDamage*def._industrialtest_powerPerDamage
-			local availablePower=math.min(meta:get_int("industrialtest.powerAmount"),requiredPower)
-			local reducedDamage=math.floor(availablePower/def._industrialtest_powerPerDamage)
-			if reducedDamage>0 then
-				result=result+reducedDamage
-				industrialtest.api.addPowerToItem(stack,-reducedDamage*def._industrialtest_powerPerDamage)
-				inv:set_stack("armor",i,stack)
-			end
-		end
-	end
-
-	return result
-end,true)

tools/power_storage.lua

@@ -0,0 +1,101 @@
+-- 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/>.
+
+local S=minetest.get_translator("industrialtest")
+
+industrialtest.REBattery=table.copy(industrialtest.ElectricItem)
+industrialtest.internal.unpackTableInto(industrialtest.REBattery,{
+	name="industrialtest:re_battery",
+	description=S("RE-Battery"),
+	inventoryImage="industrialtest_re_battery.png",
+	capacity=7000,
+	flow=industrialtest.api.lvPowerFlow
+})
+
+industrialtest.REBattery:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:re_battery",
+	recipe={
+		{"","industrialtest:insulated_tin_cable",""},
+		{industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.tinIngot},
+		{industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.tinIngot}
+	}
+})
+
+industrialtest.AdvancedREBattery=table.copy(industrialtest.ElectricItem)
+industrialtest.internal.unpackTableInto(industrialtest.AdvancedREBattery,{
+	name="industrialtest:advanced_re_battery",
+	description=S("Advanced RE-Battery"),
+	inventoryImage="industrialtest_advanced_re_battery.png",
+	capacity=100000,
+	flow=industrialtest.api.mvPowerFlow
+})
+
+industrialtest.AdvancedREBattery:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:advanced_re_battery",
+	recipe={
+		{"industrialtest:insulated_copper_cable",industrialtest.elementKeys.bronzeIngot,"industrialtest:insulated_copper_cable"},
+		{industrialtest.elementKeys.bronzeIngot,"industrialtest:sulfur_dust",industrialtest.elementKeys.bronzeIngot},
+		{industrialtest.elementKeys.bronzeIngot,"industrialtest:lead_dust",industrialtest.elementKeys.bronzeIngot}
+	}
+})
+
+industrialtest.EnergyCrystal=table.copy(industrialtest.ElectricItem)
+industrialtest.internal.unpackTableInto(industrialtest.EnergyCrystal,{
+	name="industrialtest:energy_crystal",
+	description=S("Energy Crystal"),
+	inventoryImage="industrialtest_energy_crystal.png",
+	capacity=1000000,
+	flow=industrialtest.api.hvPowerFlow
+})
+
+industrialtest.EnergyCrystal:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:energy_crystal",
+	recipe={
+		{industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier},
+		{industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.diamond,industrialtest.elementKeys.powerCarrier},
+		{industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier,industrialtest.elementKeys.powerCarrier}
+	}
+})
+
+industrialtest.LapotronCrystal=table.copy(industrialtest.ElectricItem)
+industrialtest.internal.unpackTableInto(industrialtest.LapotronCrystal,{
+	name="industrialtest:lapotron_crystal",
+	description=S("Lapotron Crystal"),
+	inventoryImage="industrialtest_lapotron_crystal.png",
+	capacity=10000000,
+	flow=industrialtest.api.evPowerFlow
+})
+
+industrialtest.LapotronCrystal:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:lapotron_crystal",
+	recipe={
+		{industrialtest.elementKeys.blueDye,"industrialtest:electronic_circuit",industrialtest.elementKeys.blueDye},
+		{industrialtest.elementKeys.blueDye,"industrialtest:energy_crystal",industrialtest.elementKeys.blueDye},
+		{industrialtest.elementKeys.blueDye,"industrialtest:electronic_circuit",industrialtest.elementKeys.blueDye}
+	}
+})

tools/quantum_suit.lua

@@ -16,62 +16,213 @@
 
 local S=minetest.get_translator("industrialtest")
 
-local quantumSuit={}
+industrialtest.QuantumArmorBase=table.copy(industrialtest.ElectricGearTool)
-quantumSuit.helmetBreathRefillOpPower=1000
+industrialtest.internal.unpackTableInto(industrialtest.QuantumArmorBase,{
-quantumSuit.leggingsSpeedOpPower=125
+	flow=industrialtest.api.ivPowerFlow,
-quantumSuit.leggingsSpeedMaxVel=4
+	capacity=10000000
-quantumSuit.bootsJumpOpPower=50
+})
-quantumSuit.bootsFallDamageReductionOpPower=900
 
-local playerPositions={}
+function industrialtest.QuantumArmorBase.createDefintionTable(self)
-local playerLeggingsSpeedEnabled={}
+	local def=industrialtest.ElectricGearTool.createDefintionTable(self)
-local playerBootsJumpEnabled={}
+	def.groups._industrialtest_electricArmor=1
+	return def
+end
 
-local function registerQuantumSuitPart(config)
+function industrialtest.QuantumArmorBase.getPowerPerDamageForItem(self,itemstack)
-	config.groups=config.groups or {}
+	return 30
-	config.groups._industrialtest_nanoSuit=1
+end
-	if config.element=="head" then
+
-		config.groups.armor_head=1
+industrialtest.QuantumHelmet=table.copy(industrialtest.QuantumArmorBase)
-	elseif config.element=="torso" then
+industrialtest.internal.unpackTableInto(industrialtest.QuantumHelmet,{
-		config.groups.armor_torso=1
+	name="industrialtest:quantum_helmet",
-	elseif config.element=="legs" then
+	description=S("Quantum Helmet"),
-		config.groups.armor_legs=1
+	inventoryImage="industrialtest_quantum_helmet_inv.png",
-	elseif config.element=="feet" then
+	part="head",
-		config.groups.armor_feet=1
+	modelImage="industrialtest_quantum_helmet.png",
+	_breathRefillOpPower=1000
+})
+
+local quantumHelmetUpdateDelta=0
+function industrialtest.QuantumHelmet.update(self,player,inv,itemstack,dtime)
+	quantumHelmetUpdateDelta=quantumHelmetUpdateDelta+dtime
+	if quantumHelmetUpdateDelta<industrialtest.config.updateDelay then
+		return false
 	end
-	local definition={
+	quantumHelmetUpdateDelta=0
-		description=config.displayName,
+
-		inventory_image="industrialtest_"..config.name.."_inv.png",
+	if player:get_breath()<10 then
-		groups=config.groups,
+		local meta=itemstack:get_meta()
-		_industrialtest_powerStorage=true,
+		local refilled=math.min(9-player:get_breath(),math.floor(meta:get_int("industrialtest.powerAmount")/self._breathRefillOpPower))
-		_industrialtest_powerCapacity=10000000,
+		if refilled>0 then
-		_industrialtest_powerFlow=industrialtest.api.ivPowerFlow,
+			player:set_breath(player:get_breath()+refilled)
-		_industrialtest_damageReduction=config.damageReduction,
+			industrialtest.api.addPowerToItem(itemstack,-refilled*self._breathRefillOpPower)
-		_industrialtest_powerPerDamage=30
+			return true
-	}
-	if config.customKeys then
-		for k,v in pairs(config.customKeys) do
-			definition[k]=v
 		end
 	end
-	if industrialtest.mtgAvailable then
+
-		definition.groups.armor_heal=0
+	return false
-		armor:register_armor("industrialtest:"..config.name,definition)
-	elseif industrialtest.mclAvailable then
-		definition.groups.armor=1
-		definition.groups.non_combat_armor=1
-		definition.sounds={
-			_mcl_armor_equip="mcl_armor_equip_iron",
-			_mcl_armor_unequip="mcl_armor_unequip_iron"
-		}
-		definition.on_place=mcl_armor.equip_on_use
-		definition.on_secondary_use=mcl_armor.equip_on_use
-		definition._mcl_armor_element=config.element
-		definition._mcl_armor_texture=(config.element=="feet" and "industrialtest_mcl_" or "industrialtest_")..config.name..".png"
-		minetest.register_tool("industrialtest:"..config.name,definition)
-	end
 end
 
+function industrialtest.QuantumHelmet.getReducedDamageForItem(self,itemstack)
+	return 0.15
+end
+
+industrialtest.QuantumHelmet:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:quantum_helmet",
+	recipe={
+		{"industrialtest:reinforced_glass","industrialtest:nano_helmet","industrialtest:reinforced_glass"},
+		{"industrialtest:iridium_plate","industrialtest:lapotron_crystal","industrialtest:iridium_plate"},
+		{"industrialtest:advanced_electronic_circuit","industrialtest:empty_cell","industrialtest:advanced_electronic_circuit"}
+	}
+})
+
+industrialtest.QuantumBodyarmor=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.internal.unpackTableInto(industrialtest.QuantumBodyarmor,{
+	name="industrialtest:quantum_bodyarmor",
+	description=S("Quantum Bodyarmor"),
+	inventoryImage="industrialtest_quantum_bodyarmor_inv.png",
+	part="torso",
+	modelImage="industrialtest_quantum_bodyarmor.png",
+	update=industrialtest.JetpackBase.update,
+	addYVelocityClamped=industrialtest.JetpackBase.addYVelocityClamped,
+	tryFly=industrialtest.ElectricJetpack.tryFly
+})
+
+function industrialtest.QuantumBodyarmor.getReducedDamageForItem(self,itemstack)
+	return 0.4
+end
+
+industrialtest.QuantumBodyarmor:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:quantum_bodyarmor",
+	recipe={
+		{"industrialtest:advanced_alloy","industrialtest:nano_bodyarmor","industrialtest:advanced_alloy"},
+		{"industrialtest:iridium_plate","industrialtest:lapotron_crystal","industrialtest:iridium_plate"},
+		{"industrialtest:iridium_plate","industrialtest:electric_jetpack","industrialtest:iridium_plate"}
+	}
+})
+
+industrialtest.QuantumLeggings=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.internal.unpackTableInto(industrialtest.QuantumLeggings,{
+	name="industrialtest:quantum_leggings",
+	description=S("Quantum Leggings"),
+	inventoryImage="industrialtest_quantum_leggings_inv.png",
+	part="legs",
+	modelImage="industrialtest_quantum_leggings.png",
+	_speedOpPower=125,
+	_speedMaxVel=4
+})
+
+local leggingsSpeedEnabled={}
+local playerPositions={}
+function industrialtest.QuantumLeggings.update(self,player,inv,itemstack,dtime)
+	local control=player:get_player_control()
+	local playerName=player:get_player_name()
+	if leggingsSpeedEnabled[playerName] then
+		if control.up and control.aux1 then
+			local meta=itemstack:get_meta()
+			local requiredPower=vector.distance(player:get_pos(),playerPositions[playerName])*self._speedOpPower
+			if meta:get_int("industrialtest.powerAmount")>=requiredPower then
+				industrialtest.api.addPowerToItem(itemstack,-requiredPower)
+				playerPositions[playerName]=player:get_pos()
+				return true
+			end
+		end
+		player:set_physics_override({
+			speed=1
+		})
+		leggingsSpeedEnabled[playerName]=false
+	elseif control.up and control.aux1 then
+		local meta=itemstack:get_meta()
+		local requiredPower=vector.distance(player:get_pos(),playerPositions[playerName])*self._speedOpPower
+		if meta:get_int("industrialtest.powerAmount")>=requiredPower then
+			player:set_physics_override({
+				speed=self._speedMaxVel
+			})
+			leggingsSpeedEnabled[playerName]=true
+		end
+	end
+	playerPositions[playerName]=player:get_pos()
+	return false
+end
+
+function industrialtest.QuantumLeggings.getReducedDamageForItem(self,itemstack)
+	return 0.3
+end
+
+industrialtest.QuantumLeggings:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:quantum_leggings",
+	recipe={
+		{"industrialtest:machine_block","industrialtest:lapotron_crystal","industrialtest:machine_block"},
+		{"industrialtest:iridium_plate","industrialtest:nano_leggings","industrialtest:iridium_plate"},
+		{industrialtest.elementKeys.yellowDust,"",industrialtest.elementKeys.yellowDust}
+	}
+})
+
+industrialtest.QuantumBoots=table.copy(industrialtest.QuantumArmorBase)
+industrialtest.internal.unpackTableInto(industrialtest.QuantumBoots,{
+	name="industrialtest:quantum_boots",
+	description=S("Quantum Boots"),
+	inventoryImage="industrialtest_quantum_boots_inv.png",
+	part="feet",
+	modelImage=(industrialtest.mclAvailable and "industrialtest_mcl_quantum_leggings.png" or "industrialtest_quantum_leggings.png"),
+	_jumpOpPower=50,
+	_jumpPower=2,
+	_fallDamageReductionOpPower=900,
+})
+
+local bootsJumpEnabled={}
+function industrialtest.QuantumBoots.update(self,player,inv,itemstack,dtime)
+	local control=player:get_player_control()
+	local playerName=player:get_player_name()
+	if bootsJumpEnabled[playerName] then
+		local shouldStopJump=not control.aux1
+		if control.jump and control.aux1 then
+			local meta=itemstack:get_meta()
+			if meta:get_int("industrialtest.powerAmount")>=self._jumpOpPower then
+				industrialtest.api.addPowerToItem(itemstack,-self._jumpOpPower)
+				return true
+			end
+		end
+		player:set_physics_override({
+			jump=1
+		})
+		bootsJumpEnabled[playerName]=false
+	elseif control.aux1 then
+		local meta=itemstack:get_meta()
+		if meta:get_int("industrialtest.powerAmount")>=self._jumpOpPower then
+			player:set_physics_override({
+				jump=self._jumpPower
+			})
+			bootsJumpEnabled[playerName]=true
+		end
+	end
+	return false
+end
+
+function industrialtest.QuantumBoots.getReducedDamageForItem(self,itemstack)
+	return 0.15
+end
+
+industrialtest.QuantumBoots:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:quantum_boots",
+	recipe={
+		{"industrialtest:iridium_plate","industrialtest:nano_boots","industrialtest:iridium_plate"},
+		{industrialtest.elementKeys.ironBoots,"industrialtest:lapotron_crystal",industrialtest.elementKeys.ironBoots}
+	}
+})
+
 local function findInPlayerArmorList(player,itemname)
 	local inv
 	if industrialtest.mclAvailable then
@@ -87,174 +238,6 @@ local function findInPlayerArmorList(player,itemname)
 	end
 end
 
-quantumSuit.tryFly=function(itemstack)
-	local meta=itemstack:get_meta()
-	if meta:get_int("industrialtest.powerAmount")<10 then
-		return false
-	end
-	industrialtest.api.addPowerToItem(itemstack,-10)
-	return true
-end
-
-
-registerQuantumSuitPart({
-	name="quantum_helmet",
-	displayName=S("Quantum Helmet"),
-	element="head",
-	damageReduction=0.15
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:quantum_helmet",
-	recipe={
-		{"industrialtest:reinforced_glass","industrialtest:nano_helmet","industrialtest:reinforced_glass"},
-		{"industrialtest:iridium_plate","industrialtest:lapotron_crystal","industrialtest:iridium_plate"},
-		{"industrialtest:advanced_electronic_circuit","industrialtest:empty_cell","industrialtest:advanced_electronic_circuit"}
-	}
-})
-
-registerQuantumSuitPart({
-	name="quantum_bodyarmor",
-	displayName=S("Quantum Bodyarmor"),
-	element="torso",
-	damageReduction=0.4,
-	groups={
-		_industrialtest_jetpack=1
-	},
-	customKeys={
-		_industrialtest_tryFly=quantumSuit.tryFly
-	}
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:quantum_bodyarmor",
-	recipe={
-		{"industrialtest:advanced_alloy","industrialtest:nano_bodyarmor","industrialtest:advanced_alloy"},
-		{"industrialtest:iridium_plate","industrialtest:lapotron_crystal","industrialtest:iridium_plate"},
-		{"industrialtest:iridium_plate","industrialtest:electric_jetpack","industrialtest:iridium_plate"}
-	}
-})
-
-registerQuantumSuitPart({
-	name="quantum_leggings",
-	displayName=S("Quantum Leggings"),
-	element="legs",
-	damageReduction=0.30
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:quantum_leggings",
-	recipe={
-		{"industrialtest:machine_block","industrialtest:lapotron_crystal","industrialtest:machine_block"},
-		{"industrialtest:iridium_plate","industrialtest:nano_leggings","industrialtest:iridium_plate"},
-		{industrialtest.elementKeys.yellowDust,"",industrialtest.elementKeys.yellowDust}
-	}
-})
-
-registerQuantumSuitPart({
-	name="quantum_boots",
-	displayName=S("Quantum Boots"),
-	element="feet",
-	damageReduction=0.15
-})
-minetest.register_craft({
-	type="shaped",
-	output="industrialtest:quantum_boots",
-	recipe={
-		{"industrialtest:iridium_plate","industrialtest:nano_boots","industrialtest:iridium_plate"},
-		{industrialtest.elementKeys.ironBoots,"industrialtest:lapotron_crystal",industrialtest.elementKeys.ironBoots}
-	}
-})
-
-minetest.register_globalstep(function(dtime)
-	local players=minetest.get_connected_players()
-	for _,player in ipairs(players) do
-		local control=player:get_player_control()
-		local playerName=player:get_player_name()
-		if playerLeggingsSpeedEnabled[playerName] then
-			local shouldStopSpeed=true
-			if control.up and control.aux1 then
-				local index,stack,inv=findInPlayerArmorList(player,"industrialtest:quantum_leggings")
-				if index and stack and inv then
-					local meta=stack:get_meta()
-					local requiredPower=vector.distance(player:get_pos(),playerPositions[playerName])*quantumSuit.leggingsSpeedOpPower
-					if meta:get_int("industrialtest.powerAmount")>=requiredPower then
-						industrialtest.api.addPowerToItem(stack,-requiredPower)
-						inv:set_stack("armor",index,stack)
-						shouldStopSpeed=false
-					end
-				end
-			end
-			if shouldStopSpeed then
-				player:set_physics_override({
-					speed=1
-				})
-				playerLeggingsSpeedEnabled[playerName]=false
-			end
-		elseif control.up and control.aux1 then
-			local index,stack,inv=findInPlayerArmorList(player,"industrialtest:quantum_leggings")
-			if index and stack and inv then
-				local meta=stack:get_meta()
-				local requiredPower=vector.distance(player:get_pos(),playerPositions[playerName])*quantumSuit.leggingsSpeedOpPower
-				if meta:get_int("industrialtest.powerAmount")>=requiredPower then
-					player:set_physics_override({
-						speed=quantumSuit.leggingsSpeedMaxVel
-					})
-					playerLeggingsSpeedEnabled[playerName]=true
-				end
-			end
-		end
-
-		if playerBootsJumpEnabled[playerName] then
-			local shouldStopJump=not control.aux1
-			if control.jump and control.aux1 then
-				local index,stack,inv=findInPlayerArmorList(player,"industrialtest:quantum_boots")
-				if index and stack and inv then
-					local meta=stack:get_meta()
-					if meta:get_int("industrialtest.powerAmount")>=quantumSuit.bootsJumpOpPower then
-						industrialtest.api.addPowerToItem(stack,-quantumSuit.bootsJumpOpPower)
-						inv:set_stack("armor",index,stack)
-						shouldStopJump=false
-					end
-				end
-			end
-			if shouldStopJump then
-				player:set_physics_override({
-					jump=1
-				})
-				playerBootsJumpEnabled[playerName]=false
-			end
-		elseif control.aux1 then
-			local index,stack,inv=findInPlayerArmorList(player,"industrialtest:quantum_boots")
-			if index and stack and inv then
-				local meta=stack:get_meta()
-				local requiredPower=vector.distance(player:get_pos(),playerPositions[playerName])*quantumSuit.leggingsSpeedOpPower
-				if meta:get_int("industrialtest.powerAmount")>=quantumSuit.bootsJumpOpPower then
-					player:set_physics_override({
-						jump=2
-					})
-					playerBootsJumpEnabled[playerName]=true
-				end
-			end
-		end
-
-		if player:get_breath()<10 then
-			local index,stack,inv=findInPlayerArmorList(player,"industrialtest:quantum_helmet")
-			if index and stack and inv then
-				local meta=stack:get_meta()
-				local refilled=math.min(9-player:get_breath(),math.floor(meta:get_int("industrialtest.powerAmount")/quantumSuit.helmetBreathRefillOpPower))
-				if refilled>0 then
-					player:set_breath(player:get_breath()+refilled)
-					industrialtest.api.addPowerToItem(stack,-refilled*quantumSuit.helmetBreathRefillOpPower)
-					inv:set_stack("armor",index,stack)
-				end
-			end
-		end
-		
-		playerPositions[playerName]=player:get_pos()
-	end
-end)
-
 minetest.register_on_player_hpchange(function(player,hpChange,reason)
 	if reason.type~="fall" then
 		return hpChange
@@ -267,8 +250,8 @@ minetest.register_on_player_hpchange(function(player,hpChange,reason)
 
 	local damage=math.abs(hpChange)
 	local meta=stack:get_meta()
-	local reducedDamage=math.min(damage,math.floor(meta:get_int("industrialtest.powerAmount")/(damage*quantumSuit.bootsFallDamageReductionOpPower)))
+	local reducedDamage=math.min(damage,math.floor(meta:get_int("industrialtest.powerAmount")/(damage*industrialtest.QuantumBoots._fallDamageReductionOpPower)))
-	industrialtest.api.addPowerToItem(stack,-reducedDamage*quantumSuit.bootsFallDamageReductionOpPower)
+	industrialtest.api.addPowerToItem(stack,-reducedDamage*industrialtest.QuantumBoots._fallDamageReductionOpPower)
 	inv:set_stack("armor",index,stack)
 
 	return hpChange+reducedDamage

tools/scanner.lua

@@ -0,0 +1,152 @@
+-- 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/>.
+
+local S=minetest.get_translator("industrialtest")
+
+industrialtest.Scanner=table.copy(industrialtest.ElectricTool)
+industrialtest.internal.unpackTableInto(industrialtest.Scanner,{
+	define={onUse=true}
+})
+
+function industrialtest.Scanner.createDefinitionTable(self)
+	local def=industrialtest.ElectricTool.createDefinitionTable(self)
+	def.groups._industrialtest_scanner=1
+	return def
+end
+
+-- Used by Miner to provide Scanner functionality there
+function industrialtest.Scanner.filter(self,pos)
+	-- dummy function
+	return {}
+end
+
+industrialtest.OreScanner=table.copy(industrialtest.Scanner)
+
+function industrialtest.OreScanner.hitUse(self,itemstack,user,pointed)
+	if not user:is_player() then
+		return false
+	end
+
+	local positions=""
+	local pos=user:get_pos()
+	for x=pos.x-self.distance,pos.x+self.distance do
+		for y=pos.y-self.distance,pos.y+self.distance do
+			for z=pos.z-self.distance,pos.z+self.distance do
+				local targetPos=vector.new(x,y,z)
+				local node=minetest.get_node(targetPos)
+				if self.isOre(node) then
+					positions=positions..string.format("%d %d %d",x,y,z)
+					positions=positions..","
+				end
+			end
+		end
+	end
+
+	local formspec={
+		"formspec_version[4]",
+		"size[10.5,11]",
+		"label[0.5,0.5;"..self.description.."]",
+		"label[0.5,1.7;"..S("Found ores").."]",
+		"textlist[0.5,1.9;9.5,8.6;pos;"..positions.."]"
+	}
+	local content=table.concat(formspec,"")
+	minetest.show_formspec(user:get_player_name(),"industrialtest:scanner",content)
+
+	return true
+end
+
+function industrialtest.OreScanner.filter(self,pos)
+	local result={}
+	for x=pos.x-self.minerDistance,pos.x+self.minerDistance do
+		for z=pos.z-self.minerDistance,pos.z+self.minerDistance do
+			local nodePos=vector.new(x,pos.y,z)
+			local node=minetest.get_node(nodePos)
+			-- This is very hacky, but currently there is no other way of determining if node is ore
+			if (x~=pos.x or z~=pos.z) and self.isOre(node) then
+				table.insert(result,nodePos)
+			end
+		end
+	end
+	return result
+end
+
+function industrialtest.OreScanner.isOre(node)
+	return string.find(node.name,":stone_with_")
+end
+
+industrialtest.ODScanner=table.copy(industrialtest.OreScanner)
+industrialtest.internal.unpackTableInto(industrialtest.ODScanner,{
+	name="industrialtest:od_scanner",
+	description=S("OD Scanner"),
+	inventoryImage="industrialtest_od_scanner.png",
+	capacity=100000,
+	flow=industrialtest.api.lvPowerFlow,
+	distance=7,
+	minerDistance=3
+})
+
+function industrialtest.ODScanner.getOpPower(self,itemstack)
+	return 700
+end
+
+industrialtest.ODScanner:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:od_scanner",
+	recipe={
+		{"",industrialtest.elementKeys.yellowDust,""},
+		{"industrialtest:electronic_circuit","industrialtest:re_battery","industrialtest:electronic_circuit"},
+		{"industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable"}
+	}
+})
+
+industrialtest.OVScanner=table.copy(industrialtest.OreScanner)
+industrialtest.internal.unpackTableInto(industrialtest.OVScanner,{
+	name="industrialtest:ov_scanner",
+	description=S("OV Scanner"),
+	inventoryImage="industrialtest_ov_scanner.png",
+	capacity=1000000,
+	flow=industrialtest.api.mvPowerFlow,
+	distance=11,
+	minerDistance=5
+})
+
+function industrialtest.OVScanner.getOpPower(self,itemstack)
+	return 7000
+end
+
+industrialtest.OVScanner:register()
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:ov_scanner",
+	recipe={
+		{"",industrialtest.elementKeys.yellowDust,""},
+		{industrialtest.elementKeys.yellowDust,"industrialtest:electronic_circuit",industrialtest.elementKeys.yellowDust},
+		{"industrialtest:insulated_gold_cable","industrialtest:od_scanner","industrialtest:insulated_gold_cable"}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:ov_scanner",
+	recipe={
+		{"",industrialtest.elementKeys.yellowDust,""},
+		{industrialtest.elementKeys.yellowDust,"industrialtest:electronic_circuit",industrialtest.elementKeys.yellowDust},
+		{"industrialtest:insulated_gold_cable","industrialtest:re_battery","industrialtest:insulated_gold_cable"}
+	}
+})

tools/solar_helmet.lua

@@ -15,58 +15,41 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.SolarHelmet=table.copy(industrialtest.GearTool)
+industrialtest.internal.unpackTableInto(industrialtest.SolarHelmet,{
+	name="industrialtest:solar_helmet",
+	description=S("Solar Helmet"),
+	inventoryImage="industrialtest_solar_helmet_inv.png",
+	part="head",
+	modelImage="industrialtest_solar_helmet.png"
+})
 
 local updateDelta=0
-
+function industrialtest.SolarHelmet.update(self,player,inv,itemstack,dtime)
-local function onGlobalStep(player,inv,stack)
+	updateDelta=updateDelta+dtime
-	if stack:get_name()~="industrialtest:solar_helmet" then
+	if updateDelta<industrialtest.config.updateDelay then
 		return false
 	end
+	updateDelta=0
+
 	local amount=math.floor((minetest.get_node_light(player:get_pos()) or 0)/2)
 	if amount==0 then
-		return true
+		return false
 	end
 	local armorList=inv:get_list("armor")
-	for i=1,#armorList do
+	for i,armorItemstack in ipairs(armorList) do
-		local meta=armorList[i]:get_meta()
+		local meta=armorItemstack:get_meta()
 		if industrialtest.api.hasPowerStorage(meta) and not industrialtest.api.isFullyCharged(meta) then
-			industrialtest.api.addPowerToItem(armorList[i],amount)
+			industrialtest.api.addPowerToItem(armorItemstack,amount)
-			inv:set_stack("armor",i,armorList[i])
+			inv:set_stack("armor",i,armorItemstack)
 			break
 		end
 	end
-	return true
+	return false
 end
 
-if industrialtest.mtgAvailable then
+industrialtest.SolarHelmet:register()
-	armor:register_armor("industrialtest:solar_helmet",{
+
-		description=S("Solar Helmet"),
-		inventory_image="industrialtest_solar_helmet_inv.png",
-		groups={
-			armor_head=1,
-			armor_heal=0
-		}
-	})
-elseif industrialtest.mclAvailable then
-	minetest.register_tool("industrialtest:solar_helmet",{
-		description=S("Solar Helmet"),
-		inventory_image="industrialtest_solar_helmet_inv.png",
-		groups={
-			armor=1,
-			non_combat_armor=1,
-			armor_head=1,
-			non_combat_feet=1
-		},
-		sounds={
-			_mcl_armor_equip="mcl_armor_equip_iron",
-			_mcl_armor_unequip="mcl_armor_unequip_iron"
-		},
-		on_place=mcl_armor.equip_on_use,
-		on_secondary_use=mcl_armor.equip_on_use,
-		_mcl_armor_element="head",
-		_mcl_armor_texture="industrialtest_solar_helmet.png"
-	})
-end
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:solar_helmet",
@@ -76,6 +59,7 @@ minetest.register_craft({
 		{"industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable"}
 	}
 })
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:solar_helmet",
@@ -85,31 +69,3 @@ minetest.register_craft({
 		{"industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable"}
 	}
 })
-
-minetest.register_globalstep(function(dtime)
-	updateDelta=updateDelta+dtime
-	if updateDelta<industrialtest.updateDelay then
-		return
-	end
-	updateDelta=0
-	local players=minetest.get_connected_players()
-	for _,player in ipairs(players) do
-		if industrialtest.mtgAvailable then
-			local _,inv=armor:get_valid_player(player,"")
-			if inv then
-				local armorList=inv:get_list("armor")
-				assert(armorList)
-				for i=1,#armorList do
-					local stack=armorList[i]
-					if onGlobalStep(player,inv,stack) then
-						break
-					end
-				end
-			end
-		elseif industrialtest.mclAvailable then
-			local inv=player:get_inventory()
-			local stack=inv:get_stack("armor",1)
-			onGlobalStep(player,inv,stack)
-		end
-	end
-end)

tools/static_boots.lua

@@ -15,65 +15,45 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+industrialtest.StaticBoots=table.copy(industrialtest.GearTool)
+
+local image=(industrialtest.mtgAvailable and "industrialtest_static_boots.png" or "industrialtest_mcl_static_boots.png")
+
+industrialtest.internal.unpackTableInto(industrialtest.StaticBoots,{
+	name="industrialtest:static_boots",
+	description=S("Static Boots"),
+	inventoryImage="industrialtest_static_boots_inv.png",
+	part="feet",
+	modelImage=image
+})
 
 local updateDelta=0
 local playerPositions={}
-
+function industrialtest.StaticBoots.update(self,player,inv,itemstack,dtime)
-local function onGlobalStep(player,inv,stack)
-	if stack:get_name()~="industrialtest:static_boots" then
-		return false
-	end
 	local playerPos=player:get_pos()
 	playerPos.y=0
 	if not playerPositions[player:get_player_name()] then
 		playerPositions[player:get_player_name()]=playerPos
-		return true
+		return false
 	end
 	if vector.distance(playerPos,playerPositions[player:get_player_name()])<5 then
-		return true
+		return false
 	end
 	playerPositions[player:get_player_name()]=playerPos
 	local armorList=inv:get_list("armor")
-	for i=1,#armorList do
+	for i,armorItemstack in ipairs(armorList) do
-		local meta=armorList[i]:get_meta()
+		local meta=armorItemstack:get_meta()
 		if industrialtest.api.hasPowerStorage(meta) and not industrialtest.api.isFullyCharged(meta) then
-			industrialtest.api.addPowerToItem(armorList[i],1)
+			industrialtest.api.addPowerToItem(armorItemstack,1)
-			inv:set_stack("armor",i,armorList[i])
+			inv:set_stack("armor",i,armorItemstack)
 			break
 		end
 	end
-	return true
+	return false
 end
 
-if industrialtest.mtgAvailable then
+industrialtest.StaticBoots:register()
-	armor:register_armor("industrialtest:static_boots",{
+
-		description=S("Static Boots"),
-		inventory_image="industrialtest_static_boots_inv.png",
-		groups={
-			armor_feet=1,
-			armor_heal=0
-		}
-	})
-elseif industrialtest.mclAvailable then
-	minetest.register_tool("industrialtest:static_boots",{
-		description=S("Static Boots"),
-		inventory_image="industrialtest_static_boots_inv.png",
-		groups={
-			armor=1,
-			non_combat_armor=1,
-			armor_feet=1,
-			non_combat_feet=1
-		},
-		sounds={
-			_mcl_armor_equip="mcl_armor_equip_iron",
-			_mcl_armor_unequip="mcl_armor_unequip_iron"
-		},
-		on_place=mcl_armor.equip_on_use,
-		on_secondary_use=mcl_armor.equip_on_use,
-		_mcl_armor_element="feet",
-		_mcl_armor_texture="industrialtest_mcl_static_boots.png"
-	})
-end
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:static_boots",
@@ -83,6 +63,7 @@ minetest.register_craft({
 		{"industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable","industrialtest:insulated_copper_cable"}
 	}
 })
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:static_boots",
@@ -96,31 +77,3 @@ minetest.register_craft({
 minetest.register_on_leaveplayer(function(player)
 	playerPositions[player:get_player_name()]=nil
 end)
-
-minetest.register_globalstep(function(dtime)
-	updateDelta=updateDelta+dtime
-	if updateDelta<industrialtest.updateDelay then
-		return
-	end
-	updateDelta=0
-	local players=minetest.get_connected_players()
-	for _,player in ipairs(players) do
-		if industrialtest.mtgAvailable then
-			local _,inv=armor:get_valid_player(player,"")
-			if inv then
-				local armorList=inv:get_list("armor")
-				assert(armorList)
-				for i=1,#armorList do
-					local stack=armorList[i]
-					if onGlobalStep(player,inv,stack) then
-						break
-					end
-				end
-			end
-		elseif industrialtest.mclAvailable then
-			local inv=player:get_inventory()
-			local stack=inv:get_stack("armor",5)
-			onGlobalStep(player,inv,stack)
-		end
-	end
-end)

tools/tool.lua

@@ -0,0 +1,115 @@
+-- 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.Tool=table.copy(industrialtest.Item)
+industrialtest.internal.unpackTableInto(industrialtest.Tool,{
+	define={}
+})
+
+function industrialtest.Tool.use(self,itemstack,user,pointed)
+	-- dummy function
+	return false
+end
+
+function industrialtest.Tool.hitUse(self,itemstack,user,pointed)
+	-- Note: this method, when used, onUse must be set in define table
+	-- dummy function
+	return false
+end
+
+function industrialtest.Tool.onPlace(self,itemstack,user,pointed)
+	if self:use(itemstack,user,pointed) then
+		local meta=itemstack:get_meta()
+		if not meta:contains("industrialtest.uses") then
+			self:prepare(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 true
+		end
+		meta:set_int("industrialtest.uses",uses)
+		itemstack:set_wear(65535-uses/self.uses*65535)
+		return true
+	end
+	return false
+end
+
+function industrialtest.Tool.onUse(self,itemstack,user,pointed)
+	if self:hitUse(itemstack,user,pointed) then
+		local meta=itemstack:get_meta()
+		if not meta:contains("industrialtest.uses") then
+			self:prepare(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 true
+		end
+		meta:set_int("industrialtest.uses",uses)
+		itemstack:set_wear(65535-uses/self.uses*65535)
+		return true
+	end
+	return false
+end
+
+function industrialtest.Tool.prepare(self,itemstack)
+	local meta=itemstack:get_meta()
+	meta:set_int("industrialtest.uses",self.uses)
+end
+
+function industrialtest.Tool.createDefinitionTable(self)
+	local def=industrialtest.Item.createDefinitionTable(self)
+	def.tool_capabilities={
+		uses=self.uses
+	}
+	if self.define.onPlace then
+		def.on_place=function(itemstack,user,pointed)
+			if self:onPlace(itemstack,user,pointed) then
+				return itemstack
+			end
+			return nil
+		end
+	end
+	if self.define.onUse then
+		def.on_use=function(itemstack,user,pointed)
+			if self:onUse(itemstack,user,pointed) then
+				return itemstack
+			end
+			return nil
+		end
+	end
+
+	if industrialtest.mclAvailable then
+		def.groups={
+			tool=1
+		}
+		def._repair_material=self.repairMaterial
+		def._mcl_toollike_wield=true
+	end
+
+	return def
+end

tools/treetap.lua

@@ -18,9 +18,10 @@ if industrialtest.mods.mclRubber then
 	return
 end
 
-local S=minetest.get_translator("industrialtest")
-
 local function onTreetapUse(user,pointed)
+	if pointed.type~="node" or not user or not user:is_player() then
+		return false
+	end
 	local node=minetest.get_node_or_nil(pointed.under)
 	if not node then
 		return false
@@ -36,34 +37,24 @@ local function onTreetapUse(user,pointed)
 	return false
 end
 
-local definition={	
+local S=minetest.get_translator("industrialtest")
+industrialtest.Treetap=table.copy(industrialtest.Tool)
+industrialtest.internal.unpackTableInto(industrialtest.Treetap,{
+	name="industrialtest:treetap",
+	define={onPlace=true},
 	description=S("Treetap"),
-	inventory_image="industrialtest_treetap.png",
+	inventoryImage="industrialtest_treetap.png",
-	tool_capabilities={
+	uses=50,
-		full_punch_interval=1,
+	flammable=2,
-		uses=50
+	repairMaterial="group:wood"
-	},
+})
-	on_place=function(itemstack,user,pointed)
+
-		if pointed.type=="node" and user and user:is_player() and onTreetapUse(user,pointed) then
+function industrialtest.Treetap.use(self,itemstack,user,pointed)
-			industrialtest.api.afterToolUse(itemstack)
+	return onTreetapUse(user,pointed)
-			return itemstack
-		end
-		return nil
-	end,
-	_industrialtest_tool=true
-}
-if industrialtest.mtgAvailable then
-	definition.groups={
-		flammable=2
-	}
-elseif industrialtest.mclAvailable then
-	definition.groups={
-		tool=1
-	}
-	definition._repair_material="group:wood"
-	definition._mcl_toollike_wield=true
 end
-minetest.register_tool("industrialtest:treetap",definition)
+
+industrialtest.Treetap:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:treetap",
@@ -74,28 +65,26 @@ minetest.register_craft({
 	}
 })
 
-definition={
+industrialtest.ElectricTreetap=table.copy(industrialtest.ElectricTool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricTreetap,{
+	name="industrialtest:electric_treetap",
+	define={onPlace=true},
 	description=S("Electric Treetap"),
-	inventory_image="industrialtest_electric_treetap.png",
+	inventoryImage="industrialtest_electric_treetap.png",
-	on_place=function(itemstack,user,pointed)
+	capacity=10000,
-		local meta=itemstack:get_meta()
+	flow=industrialtest.api.lvPowerFlow
-		if meta:get_int("industrialtest.powerAmount")>=50 and user and user:is_player() and onTreetapUse(user,pointed) then
+})
-			industrialtest.api.addPowerToItem(itemstack,-50)
+
-			return itemstack
+function industrialtest.ElectricTreetap.use(self,itemstack,user,pointed)
-		end
+	return onTreetapUse(user,pointed)
-		return nil
-	end,
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=10000,
-	_industrialtest_powerFlow=industrialtest.api.lvPowerFlow
-}
-if industrialtest.mclAvailable then
-	definition.groups={
-		tool=1
-	}
-	definition._mcl_toollike_wield=true
 end
-minetest.register_tool("industrialtest:electric_treetap",definition)
+
+function industrialtest.ElectricTreetap.getOpPower(self,itemstack)
+	return 50
+end
+
+industrialtest.ElectricTreetap:register()
+
 minetest.register_craft({
 	type="shapeless",
 	output="industrialtest:electric_treetap",

tools/wrench.lua

@@ -16,6 +16,9 @@
 local S=minetest.get_translator("industrialtest")
 
 local function onWrenchUse(user,pointed)
+	if pointed.type~="node" or not user or not user:is_player() then
+		return false
+	end
 	local node=minetest.get_node_or_nil(pointed.under)
 	if not node then
 		return false
@@ -37,29 +40,22 @@ local function onWrenchUse(user,pointed)
 	return true
 end
 
-local definition={
+industrialtest.Wrench=table.copy(industrialtest.Tool)
+industrialtest.internal.unpackTableInto(industrialtest.Wrench,{
+	name="industrialtest:wrench",
+	define={onUse=true},
 	description=S("Wrench"),
-	inventory_image="industrialtest_wrench.png",
+	inventoryImage="industrialtest_wrench.png",
-	tool_capabilities={
+	uses=200,
-		full_punch_interval=1,
+	repairMaterial=industrialtest.elementKeys.bronzeIngot
-		uses=200
+})
-	},
+
-	on_use=function(itemstack,user,pointed)
+function industrialtest.Wrench.hitUse(self,itemstack,user,pointed)
-		if pointed.type=="node" and user and user:is_player() and onWrenchUse(user,pointed) then
+	return onWrenchUse(user,pointed)
-			industrialtest.api.afterToolUse(itemstack)
-			return itemstack
-		end
-		return nil
-	end,
-	_industrialtest_tool=true
-}
-if industrialtest.mclAvailable then
-	definition.groups={
-		tool=1
-	}
-	definition._mcl_toollike_wield=true
 end
-minetest.register_tool("industrialtest:wrench",definition)
+
+industrialtest.Wrench:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:wrench",
@@ -70,28 +66,26 @@ minetest.register_craft({
 	}
 })
 
-definition={
+industrialtest.ElectricWrench=table.copy(industrialtest.ElectricTool)
+industrialtest.internal.unpackTableInto(industrialtest.ElectricWrench,{
+	name="industrialtest:electric_wrench",
+	define={onUse=true},
 	description=S("Electric Wrench"),
-	inventory_image="industrialtest_electric_wrench.png",
+	inventoryImage="industrialtest_electric_wrench.png",
-	on_use=function(itemstack,user,pointed)
+	capacity=10000,
-		local meta=itemstack:get_meta()
+	flow=industrialtest.api.lvPowerFlow
-		if meta:get_int("industrialtest.powerAmount")>=20 and user and user:is_player() and onWrenchUse(user,pointed) then
+})
-			industrialtest.api.addPowerToItem(itemstack,-20)
+
-			return itemstack
+function industrialtest.ElectricWrench.getOpPower(self,itemstack)
-		end
+	return 50
-		return nil
-	end,
-	_industrialtest_powerStorage=true,
-	_industrialtest_powerCapacity=10000,
-	_industrialtest_powerFlow=industrialtest.api.lvPowerFlow
-}
-if industrialtest.mclAvailable then
-	definition.groups={
-		tool=1
-	}
-	definition._mcl_toollike_wield=true
 end
-minetest.register_tool("industrialtest:electric_wrench",definition)
+
+function industrialtest.ElectricWrench.hitUse(self,itemstack,user,pointed)
+	return onWrenchUse(user,pointed)
+end
+
+industrialtest.ElectricWrench:register()
+
 minetest.register_craft({
 	type="shapeless",
 	output="industrialtest:electric_wrench",

upgrades.lua

@@ -16,106 +16,56 @@
 
 local S=minetest.get_translator("industrialtest")
 
-industrialtest.internal.applyUpgrade=function(pos,meta,stack)
+industrialtest.Upgrade={}
-	local def=minetest.registered_items[stack:get_name()]
-	if def.groups._industrialtest_upgradeSpeed then
-		local speed=industrialtest.api.getMachineSpeed(meta)
-		meta:set_int("industrialtest.speed",math.min(4,speed+def.groups._industrialtest_upgradeSpeed))
-	elseif def.groups._industrialtest_upgradeTransformer then
-		local flows={
-			industrialtest.api.lvPowerFlow,
-			industrialtest.api.mvPowerFlow,
-			industrialtest.api.hvPowerFlow,
-			industrialtest.api.evPowerFlow,
-			industrialtest.api.ivPowerFlow
-		}
-		local machineFlow=meta:get_int("industrialtest.powerFlow")
-		local upgradedFlow=machineFlow
-		for _,flow in ipairs(flows) do
-			if flow>machineFlow then
-				upgradedFlow=flow
-				break
-			end
-		end
-		meta:set_int("industrialtest.powerFlow",upgradedFlow)
-		local networks=industrialtest.api.isAttachedToNetwork(meta)
-		if networks then
-			for _,network in ipairs(networks) do
-				industrialtest.api.createNetworkMapForNode(network)
-			end
-		end
-	elseif def.groups._industrialtest_upgradePowerStorage then
-		meta:set_int("industrialtest.powerCapacity",meta:get_int("industrialtest.powerCapacity")+10000)
-		local nodeDef=minetest.registered_nodes[minetest.get_node(pos).name]
-		if nodeDef._industrialtest_updateFormspec then
-			nodeDef._industrialtest_updateFormspec(pos)
-		end
-		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
-end
 
-industrialtest.internal.removeUpgrade=function(pos,meta,stack)
+function industrialtest.Upgrade.createDefinitionTable(self)
-	local def=minetest.registered_items[stack:get_name()]
+	local def={
-	if def.groups._industrialtest_upgradeSpeed and meta:contains("industrialtest.speed") then
+		description=self.description,
-		local speed=meta:get_int("industrialtest.speed")
+		inventory_image=self.inventoryImage,
-		meta:set_int("industrialtest.speed",math.max(1,speed-def.groups._industrialtest_upgradeSpeed))
-	elseif def.groups._industrialtest_upgradeTransformer then
-		local flows={
-			industrialtest.api.lvPowerFlow,
-			industrialtest.api.mvPowerFlow,
-			industrialtest.api.hvPowerFlow,
-			industrialtest.api.evPowerFlow,
-			industrialtest.api.ivPowerFlow
-		}
-		local machineFlow=meta:get_int("industrialtest.powerFlow")
-		local downgradedFlow=machineFlow
-		for i=#flows,1,-1 do
-			local flow=flows[i]
-			if flow<machineFlow then
-				downgradedFlow=flow
-				break
-			end
-		end
-		meta:set_int("industrialtest.powerFlow",downgradedFlow)
-		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
-	elseif def.groups._industrialtest_upgradePowerStorage then
-		meta:set_int("industrialtest.powerCapacity",meta:get_int("industrialtest.powerCapacity")-10000)
-		meta:set_int("industrialtest.powerAmount",math.min(meta:get_int("industrialtest.powerAmount"),meta:get_int("industrialtest.powerCapacity")))
-		local nodeDef=minetest.registered_nodes[minetest.get_node(pos).name]
-		if nodeDef._industrialtest_updateFormspec then
-			nodeDef._industrialtest_updateFormspec(pos)
-		end
-	end
-end
-
-local function registerMachineUpgrade(config)
-	minetest.register_craftitem("industrialtest:"..config.name,{
-		description=config.displayName,
-		inventory_image="industrialtest_"..config.name..".png",
 		groups={
-			_industrialtest_machineUpgrade=1,
+			_industrialtest_machineUpgrade=1
-			_industrialtest_upgradeSpeed=config.speed or nil,
+		},
-			_industrialtest_upgradeTransformer=config.transformer or nil,
+		_industrialtest_self=self
-			_industrialtest_upgradePowerStorage=config.powerStorage or nil,
+	}
-		}
+
-	})
+	return def
 end
 
-registerMachineUpgrade({
+function industrialtest.Upgrade.register(self)
-	name="overclocker_upgrade",
+	local def=self:createDefinitionTable()
-	displayName=S("Overclocker Upgrade"),
+	minetest.register_craftitem(self.name,def)
-	speed=1
+end
+
+function industrialtest.Upgrade.apply(self,pos)
+	-- dummy function
+end
+
+function industrialtest.Upgrade.remove(self,pos)
+	-- dummy function
+end
+
+industrialtest.OverclockerUpgrade=table.copy(industrialtest.Upgrade)
+industrialtest.internal.unpackTableInto(industrialtest.OverclockerUpgrade,{
+	name="industrialtest:overclocker_upgrade",
+	description=S("Overclocker Upgrade"),
+	inventoryImage="industrialtest_overclocker_upgrade.png",
+	_speed=1
 })
+
+function industrialtest.OverclockerUpgrade.apply(self,pos)
+	local meta=minetest.get_meta(pos)
+	local speed=industrialtest.api.getMachineSpeed(meta)
+	meta:set_int("industrialtest.speed",math.min(4,speed+self._speed))
+end
+
+function industrialtest.OverclockerUpgrade.remove(self,pos)
+	local meta=minetest.get_meta(pos)
+	local speed=industrialtest.api.getMachineSpeed(meta)
+	meta:set_int("industrialtest.speed",math.max(1,speed-self._speed))
+end
+
+industrialtest.OverclockerUpgrade:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:overclocker_upgrade",
@@ -125,11 +75,68 @@ minetest.register_craft({
 	}
 })
 
-registerMachineUpgrade({
+industrialtest.TransformerUpgrade=table.copy(industrialtest.Upgrade)
-	name="transformer_upgrade",
+industrialtest.internal.unpackTableInto(industrialtest.TransformerUpgrade,{
-	displayName=S("Transformer Upgrade"),
+	name="industrialtest:transformer_upgrade",
-	transformer=1
+	description=S("Transformer Upgrade"),
+	inventoryImage="industrialtest_transformer_upgrade.png"
 })
+
+function industrialtest.TransformerUpgrade.apply(self,pos)
+	local meta=minetest.get_meta(pos)
+	local flows={
+		industrialtest.api.lvPowerFlow,
+		industrialtest.api.mvPowerFlow,
+		industrialtest.api.hvPowerFlow,
+		industrialtest.api.evPowerFlow,
+		industrialtest.api.ivPowerFlow
+	}
+	local machineFlow=meta:get_int("industrialtest.powerFlow")
+	local upgradedFlow=machineFlow
+	for _,flow in ipairs(flows) do
+		if flow>machineFlow then
+			upgradedFlow=flow
+			break
+		end
+	end
+	meta:set_int("industrialtest.powerFlow",upgradedFlow)
+	local networks=industrialtest.api.isAttachedToNetwork(meta)
+	if networks then
+		for _,network in ipairs(networks) do
+			industrialtest.api.createNetworkMapForNode(network)
+		end
+	end
+end
+
+function industrialtest.TransformerUpgrade.remove(self,pos)
+	local meta=minetest.get_meta(pos)
+	local flows={
+		industrialtest.api.lvPowerFlow,
+		industrialtest.api.mvPowerFlow,
+		industrialtest.api.hvPowerFlow,
+		industrialtest.api.evPowerFlow,
+		industrialtest.api.ivPowerFlow
+	}
+	local machineFlow=meta:get_int("industrialtest.powerFlow")
+	local downgradedFlow=machineFlow
+	for i=#flows,1,-1 do
+		local flow=flows[i]
+		if flow<machineFlow then
+			downgradedFlow=flow
+			break
+		end
+	end
+	meta:set_int("industrialtest.powerFlow",downgradedFlow)
+	local networks=industrialtest.api.isAttachedToNetwork(meta)
+	if networks then
+		for _,network in ipairs(networks) do
+			industrialtest.api.createNetworkMapForNode(network)
+		end
+	end
+end
+
+industrialtest.TransformerUpgrade:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:transformer_upgrade",
@@ -140,11 +147,40 @@ minetest.register_craft({
 	}
 })
 
-registerMachineUpgrade({
+industrialtest.PowerStorageUpgrade=table.copy(industrialtest.Upgrade)
-	name="power_storage_upgrade",
+industrialtest.internal.unpackTableInto(industrialtest.PowerStorageUpgrade,{
-	displayName=S("Power Storage Upgrade"),
+	name="industrialtest:power_storage_upgrade",
-	powerStorage=1
+	description=S("Power Storage Upgrade"),
+	inventoryImage="industrialtest_power_storage_upgrade.png",
+	_storage=10000
 })
+
+function industrialtest.PowerStorageUpgrade.apply(self,pos)
+	local meta=minetest.get_meta(pos)
+	meta:set_int("industrialtest.powerCapacity",meta:get_int("industrialtest.powerCapacity")+self._storage)
+	local node=minetest.get_node(pos)
+	local def=minetest.registered_nodes[node.name]
+	if def._industrialtest_self then
+		def._industrialtest_self:updateFormspec(pos)
+		if def._industrialtest_self.requestPower then
+			def._industrialtest_self:requestPower(pos)
+		end
+	end
+end
+
+function industrialtest.PowerStorageUpgrade.remove(self,pos)
+	local meta=minetest.get_meta(pos)
+	meta:set_int("industrialtest.powerCapacity",meta:get_int("industrialtest.powerCapacity")-self._storage)
+	meta:set_int("industrialtest.powerAmount",math.min(meta:get_int("industrialtest.powerAmount"),meta:get_int("industrialtest.powerCapacity")))
+	local node=minetest.get_node(pos)
+	local def=minetest.registered_nodes[node.name]
+	if def._industrialtest_self then
+		def._industrialtest_self:updateFormspec(pos)
+	end
+end
+
+industrialtest.PowerStorageUpgrade:register()
+
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:power_storage_upgrade",

utils.lua

@@ -19,30 +19,39 @@ local S=minetest.get_translator("industrialtest")
 local powerStorageInspectorContext={}
 local function inspectNode(pos,playerName)
 	local meta=minetest.get_meta(pos)
+	local sides={"X-","X+","Y-","Y+","Z-","Z+"}
 	local powerCapacity=meta:get_int("industrialtest.powerCapacity")
 	local powerFlow=meta:get_int("industrialtest.powerFlow")
 	local powerAmount=meta:get_int("industrialtest.powerAmount")
-	local powerIOConfig=meta:get_string("industrialtest.ioConfig")
+	local powerIOConfig
+	if industrialtest.api.isExtendedIoConfig(meta) then
+		powerIOConfig="\n"
+		local ioConfig=minetest.deserialize(meta:get_string("industrialtest.ioConfig"))
+		for i,config in ipairs(ioConfig) do
+			powerIOConfig=powerIOConfig..sides[i].." "..config.mode.." "..config.flow.."\n"
+		end
+	else
+		powerIOConfig=meta:get_string("industrialtest.ioConfig")
+	end
 	local formspec={
 		"formspec_version[4]",
-		"size[8,8]",
+		"size[15,15]",
 		"label[0.5,0.5;"..S("Power Storage Inspector").."]",
 		"label[0.5,1.5;"..S("Power Capacity: @1",powerCapacity).."]",
 		"label[0.5,1.9;"..S("Power Flow: @1",powerFlow).."]",
 		"label[0.5,2.3;"..S("Power Amount: @1",powerAmount).."]",
 		"label[0.5,2.7;"..S("Power IO Config: @1",powerIOConfig).."]",
-		"field[0.5,3.7;2,0.5;powerCapacity;"..S("Power Capacity")..";"..powerCapacity.."]",
+		"field[0.5,7.0;2,0.5;powerCapacity;"..S("Power Capacity")..";"..powerCapacity.."]",
-		"field[0.5,4.5;2,0.5;powerFlow;"..S("Power Flow")..";"..powerFlow.."]",
+		"field[0.5,8.0;2,0.5;powerFlow;"..S("Power Flow")..";"..powerFlow.."]",
-		"field[0.5,5.4;2,0.5;powerAmount;"..S("Power Amount")..";"..powerAmount.."]",
+		"field[0.5,9.0;2,0.5;powerAmount;"..S("Power Amount")..";"..powerAmount.."]",
-		"field[0.5,6.2;2,0.5;powerIOConfig;"..S("Power IO Config")..";"..powerIOConfig.."]",
+		"field[0.5,10.0;2,0.5;powerIOConfig;"..S("Power IO Config")..";"..meta:get_string("industrialtest.ioConfig").."]",
-		"button[0.5,6.8;2,0.5;update;"..S("Update").."]",
+		"button[0.5,11.0;2,0.5;update;"..S("Update").."]",
 		"label[4.2,2.25;"..S("Connections:").."]"
 	}
 	local connections=industrialtest.api.getConnections(pos)
-	local sides={"X-","X+","Y-","Y+","Z-","Z+"}
 	local sideString=""
-	for _,value in ipairs(connections) do
+	for i,value in ipairs(connections) do
-		sideString=sideString.."("..value.x..", "..value.y..", "..value.z..")\n"
+		sideString=sideString..sides[i].." ("..value.x..", "..value.y..", "..value.z..")\n"
 	end
 	table.insert(formspec,"label[4.2,2.65;"..sideString.."]")
 	powerStorageInspectorContext[playerName]=pos
@@ -71,7 +80,11 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
 		meta:set_int("industrialtest.powerCapacity",tonumber(fields.powerCapacity))
 		meta:set_int("industrialtest.powerFlow",tonumber(fields.powerFlow))
 		meta:set_int("industrialtest.powerAmount",tonumber(fields.powerAmount))
-		meta:set_string("industrialtest.powerIOConfig",fields.powerIOConfig)
+		if industrialtest.api.isExtendedIoConfig(meta) then
+			meta:set_string("industrialtest.powerIOConfig",minetest.serialize(fields.powerIOConfig))
+		else
+			meta:set_string("industrialtest.powerIOConfig",fields.powerIOConfig)
+		end
 		local def=minetest.registered_nodes[minetest.get_node(context).name]
 		if def and def._industrialtest_updateFormspec then
 			def._industrialtest_updateFormspec(context)

uu_matter_crafts.lua

@@ -15,14 +15,38 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 minetest.register_craft({
-	type="shapeless",
+	type="shaped",
-	output=industrialtest.elementKeys.stone.." 16",
+	output=industrialtest.elementKeys.wood.." 48",
-	recipe={"industrialtest:uu_matter"}
+	recipe={
+		{"","industrialtest:uu_matter",""},
+		{"","",""},
+		{"","",""}
+	}
 })
 
 minetest.register_craft({
 	type="shaped",
-	output=industrialtest.elementKeys.grassBlock.." 16",
+	output=industrialtest.elementKeys.stone.." 48",
+	recipe={
+		{"","",""},
+		{"","industrialtest:uu_matter",""},
+		{"","",""}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.snowBlock.." 48",
+	recipe={
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"","",""},
+		{"","",""}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.grassBlock.." 48",
 	recipe={
 		{"industrialtest:uu_matter"},
 		{"industrialtest:uu_matter"}
@@ -31,11 +55,10 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type="shaped",
-	output=industrialtest.elementKeys.wood.." 16",
+	output=industrialtest.elementKeys.obsidian.." 16",
 	recipe={
-		{"","industrialtest:uu_matter",""},
+		{"industrialtest:uu_matter"},
-		{"","",""},
+		{"industrialtest:uu_matter"}
-		{"industrialtest:uu_matter","",""}
 	}
 })
 
@@ -58,7 +81,57 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.cactus.." 48",
+	recipe={
+		{"","industrialtest:uu_matter",""},
+		{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.flint.." 32",
+	recipe={
+		{"","industrialtest:uu_matter",""},
+		{"industrialtest:uu_matter","industrialtest:uu_matter",""},
+		{"industrialtest:uu_matter","industrialtest:uu_matter",""}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.whiteWool.." 12",
+	recipe={
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"","",""},
+		{"","industrialtest:uu_matter",""}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.sugarCane.." 48",
+	recipe={
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"}
+	}
+})
+
 if industrialtest.mclAvailable then
+	minetest.register_craft({
+		type="shaped",
+		output="mcl_core:vine 24",
+		recipe={
+			{"industrialtest:uu_matter","",""},
+			{"industrialtest:uu_matter","",""},
+			{"industrialtest:uu_matter","",""}
+		}
+	})
+
 	minetest.register_craft({
 		type="shaped",
 		output="mcl_core:stonebrickcarved 48",