Merge branch 'master' of https://git.cubesoftware.xyz/mrkubax10/industrialtest into craftguide

Fixes #12

README.md

@@ -19,5 +19,6 @@ Currently IndustrialTest supports following games:
 
 ## Contributors
 - mrkubax10 <mrkubax10@onet.pl or mrkubax10 at irc.libera.chat> [programming, some graphics]
+- HandfulOfFrogs <<handfuloffrogs@gmail.com>> [some programming, graphics]
 - LuanHawk <Discord: LuanHawk#8733> [lead graphics]
 - Migdyn <<temp1@cubesoftware.xyz>> [graphics]

api.lua

@@ -32,6 +32,15 @@ industrialtest.api.hvPowerFlow=10200
 industrialtest.api.evPowerFlow=40800
 industrialtest.api.ivPowerFlow=163800
 
+industrialtest.api.craftingMethods={
+	macerating="industrialtest.macerating",
+	compressing="industrialtest.compressing",
+	extracting="industrialtest.extracting",
+	recycling="industrialtest.recycling",
+	cableForming="industrialtest.cable_forming",
+	massFabricating="industrialtest.mass_fabricating",
+}
+
 industrialtest.internal.clamp=function(num,min,max)
 	return math.max(math.min(num,max),min)
 end
@@ -750,6 +759,16 @@ industrialtest.api.registerMaceratorRecipe=function(config)
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
+
+	if mcl_craftguide ~= nil then
+		mcl_craftguide.register_craft({
+			type = industrialtest.api.craftingMethods.macerating,
+			width = 1,
+			output = definition.output,
+			items = {definition.recipe}
+		})
+	end
+
 	industrialtest.api.maceratorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
@@ -768,6 +787,16 @@ industrialtest.api.registerCompressorRecipe=function(config)
 		time=config.time or 2,
 		count=config.count or 1
 	}
+
+	if mcl_craftguide ~= nil then
+		mcl_craftguide.register_craft({
+			type = industrialtest.api.craftingMethods.compressing,
+			width = 1,
+			output = definition.output,
+			items = {definition.recipe}
+		})
+	end
+
 	industrialtest.api.compressorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
@@ -782,6 +811,16 @@ industrialtest.api.registerExtractorRecipe=function(config)
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
+
+	if mcl_craftguide ~= nil then
+		mcl_craftguide.register_craft({
+			type = industrialtest.api.craftingMethods.extracting,
+			width = 1,
+			output = definition.output,
+			items = {definition.recipe}
+		})
+	end
+
 	industrialtest.api.extractorRecipes[definition.recipe]=definition
 end
 industrialtest.api.getExtractorRecipeResult=function(recipe)
@@ -794,6 +833,16 @@ industrialtest.api.registerCableFormerRecipe=function(config)
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
+
+	if mcl_craftguide ~= nil then
+		mcl_craftguide.register_craft({
+			type = industrialtest.api.craftingMethods.cableForming,
+			width = 1,
+			output = definition.output,
+			items = {definition.recipe}
+		})
+	end
+
 	industrialtest.api.cableFormerRecipes[definition.recipe]=definition
 end
 

compatibility.lua

@@ -33,12 +33,6 @@ for _,mod in ipairs(requiredMclModules) do
 	end
 end
 
-if industrialtest.mtgAvailable then
-	industrialtest.stackMax=99
-elseif industrialtest.mclAvailable then
-	industrialtest.stackMax=64
-end
-
 industrialtest.mods={}
 if industrialtest.mtgAvailable then
 	industrialtest.mods._3dArmor=minetest.get_modpath("3d_armor")
@@ -53,10 +47,11 @@ if industrialtest.mtgAvailable and not industrialtest.mods._3dArmor then
 end
 
 industrialtest.elementKeys={}
-
 industrialtest.internal={}
 
 if industrialtest.mclAvailable then
+	industrialtest.stackMax=64
+
 	industrialtest.internal.mclMakeStrippedTrunk=function(itemstack,placer,pointedThing,electricTool)
 		-- Taken from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/init.lua#L360
 		if pointedThing.type ~= "node" then return end
@@ -85,9 +80,22 @@ if industrialtest.mclAvailable then
 		end
 		return itemstack
 	end
+
 	industrialtest.internal.explode=function(pos,radius,dropChance)
 		mcl_explosions.explode(pos,radius,{drop_chance=dropChance})
 	end
+
+	industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg
+elseif industrialtest.mtgAvailable then
+	industrialtest.stackMax=99
+
+	industrialtest.internal.explode=function(pos,radius)
+		tnt.boom(pos,{radius=radius})
+	end
+
+	industrialtest.internal.getItemSlotBg=function()
+		return ""
+	end
 end
 
 -- compatibilty that adds not existing elements
@@ -610,11 +618,33 @@ if industrialtest.mclAvailable then
 		y_max=mcl_worlds.layer_to_y(16),
 		y_min=mcl_vars.mg_overworld_min
 	})
-elseif industrialtest.mtgAvailable then
-	industrialtest.internal.explode=function(pos,radius)
-		tnt.boom(pos,{radius=radius})
-	end
 
+	mcl_craftguide.register_craft_type("industrialtest.macerating", {
+		description = S("Macerating"),
+		icon = "industrialtest_machine_block.png^industrialtest_macerator_front_active.png"
+	})
+	mcl_craftguide.register_craft_type("industrialtest.compressing", {
+		description = S("Compressing"),
+		icon = "industrialtest_machine_block.png^industrialtest_compressor_front_active.png"
+	})
+	mcl_craftguide.register_craft_type("industrialtest.extracting", {
+		description = S("Extracting"),
+		icon = "industrialtest_machine_block.png^industrialtest_extractor_front_active.png"
+	})
+	mcl_craftguide.register_craft_type("industrialtest.recycling", {
+		description = S("Recycling"),
+		icon = "industrialtest_machine_block.png^industrialtest_recycler_top_active.png"
+	})
+	mcl_craftguide.register_craft_type("industrialtest.cable_forming", {
+		description = S("Cable Forming"),
+		icon = "industrialtest_machine_block.png^industrialtest_cable_former_front_active.png"
+	})
+	mcl_craftguide.register_craft_type("industrialtest.mass_fabricating", {
+		description = S("Mass Fabricating"),
+		icon = "industrialtest_machine_block.png^industrialtest_mass_fabricator_front_active.png"
+	})
+
+elseif industrialtest.mtgAvailable then
 	industrialtest.internal.registerMetal=function(name,displayName,hardness)
 		minetest.register_craftitem("industrialtest:"..name.."_lump",{
 			description=S(displayName.." Lump"),

machines/cable_former.lua

@@ -24,7 +24,7 @@ industrialtest.internal.registerSimpleElectricItemProcessor({
 	capacity=1400,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=80,
-	method="industrialtest.cable_forming",
+	method=industrialtest.api.craftingMethods.cableForming,
 	efficiency=1
 })
 minetest.register_craft({

machines/canning_machine.lua

@@ -24,46 +24,24 @@ canningMachine.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local srcPercent=meta:get_float("srcTime")/canningMachine.canningTime*100
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;src;3.4,1.8;1,1]",
+		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
 		(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;powerStorage;3.4,3.9;1,1]",
+		industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
 		(srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 		"list[context;dst;6.4,1.8;1,1]",
+		industrialtest.internal.getItemSlotBg(6.4,1.8,1,1),
 		"list[context;leftover;6.4,2.8;1,1]",
+		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
 		"list[context;upgrades;9,0.9;1,4]",
+		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
 		"listring[context;src]",
-			"listring[context;powerStorage]",
+		"listring[context;dst]"
-			"listring[context;dst]",
-			"listring[context;leftover]",
-			"listring[context;upgrades]"
 	}
-	elseif industrialtest.mclAvailable then
-		formspec={
-		"list[context;src;3.4,1.8;1,1]",
-		mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
-		(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
-		 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
-		"list[context;powerStorage;3.4,3.9;1,1]",
-		mcl_formspec.get_itemslot_bg(3.4,3.9,1,1),
-		(srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
-		 or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
-		"list[context;dst;6.4,1.8;1,1]",
-		mcl_formspec.get_itemslot_bg(6.4,1.8,1,1),
-		"list[context;leftover;6.4,2.8;1,1]",
-		mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
-		"list[context;upgrades;9,0.9;1,4]",
-		mcl_formspec.get_itemslot_bg(9,0.9,1,4),
-		"listring[context;src]",
-		"listring[context;powerStorage]",
-		"listring[context;dst]",
-		"listring[context;upgrades]"
-		}
-	end
 	return table.concat(formspec,"")
 end
 

machines/chargepad.lua

@@ -71,32 +71,18 @@ end
 chargepad.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;charged;1,2.5;1,1]",
-			"listring[context;charged]",
+		industrialtest.internal.getItemSlotBg(1,2.5,1,1),
 		"label[0.9,3.9;"..S("Charge").."]",
 		"list[context;discharged;3,2.5;1,1]",
-			"listring[context;discharged]",
+		industrialtest.internal.getItemSlotBg(3,2.5,1,1),
 		"label[2.7,3.9;"..S("Discharge").."]",
 		"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
+		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;charged;1,2.5;1,1]",
 		"listring[context;charged]",
-			mcl_formspec.get_itemslot_bg(1,2.5,1,1),
+		"listring[context;discharged]"
-			"label[0.9,3.9;"..S("Charge").."]",
-			"list[context;discharged;3,2.5;1,1]",
-			"listring[context;discharged]",
-			mcl_formspec.get_itemslot_bg(3,2.5,1,1),
-			"label[2.7,3.9;"..S("Discharge").."]",
-			"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
 	}
-	end
 	return table.concat(formspec,"")
 end
 

machines/common.lua

@@ -72,19 +72,21 @@ machine.getFormspec=function(pos,config)
 			"formspec_version[4]",
 			"size[10.8,12]",
 			"label[0.5,0.5;"..config.displayName.."]",
-			(config.getFormspec and config.getFormspec(pos) or ""),
 			"list[current_player;main;0.5,6.25;8,1]",
-			"list[current_player;main;0.5,7.5;8,3;8]"
+			"list[current_player;main;0.5,7.5;8,3;8]",
+			"listring[current_player;main]",
+			(config.getFormspec and config.getFormspec(pos) or "")
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
 			"size[10.04,12]",
 			"label[0.25,0.25;"..config.displayName.."]",
-			(config.getFormspec and config.getFormspec(pos) or ""),
 			"list[current_player;main;0.5,7;9,3;9]",
 			mcl_formspec.get_itemslot_bg(0.5,7,9,3),
 			"list[current_player;main;0.5,10.24;9,1]",
-			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1)
+			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
+			"listring[current_player;main]",
+			(config.getFormspec and config.getFormspec(pos) or "")
 		}
 	end
 	return table.concat(formspec,"")
@@ -357,9 +359,29 @@ function industrialtest.internal.registerMachine(config)
 		if config.sounds=="metal" then
 			definition.sounds=mcl_sounds.node_sound_metal_defaults()
 		end
-		definition.groups={pickaxey=1}
+		definition.groups={
+			pickaxey=1,
+			container=2
+		}
 		definition._mcl_blast_resistance=3.5
 		definition._mcl_hardness=3.9
+		definition._mcl_hoppers_on_try_pull=function(pos, hop_pos, hop_inv, hop_list)
+			local meta = minetest.get_meta(pos)
+			local inv = meta:get_inventory()
+			local stack = inv:get_stack("dst", 1)
+			if not stack:is_empty() and hop_inv:room_for_item(hop_list, stack) then
+				return inv, "dst", 1
+			end
+			return nil, nil, nil
+		end
+		definition._mcl_hoppers_on_try_push=function(pos, hop_pos, hop_inv, hop_list)
+			local meta = minetest.get_meta(pos)
+			local inv = meta:get_inventory()
+			return inv, "src", mcl_util.select_stack(hop_inv, hop_list, inv, "src")
+		end
+		definition._mcl_hoppers_on_after_push=function(pos)
+			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		end
 	end
 	definition.groups._industrialtest_wrenchUnmountable=1
 	if config.requiresWrench then
@@ -433,7 +455,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=after.items[1]
 		}
-	elseif method=="industrialtest.macerating" then
+	elseif method==industrialtest.api.craftingMethods.macerating then
 		local output=industrialtest.api.getMaceratorRecipeResult(item:get_name())
 		if not output then
 			return {
@@ -449,7 +471,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method=="industrialtest.compressing" then
+	elseif method==industrialtest.api.craftingMethods.compressing then
 		local output=industrialtest.api.getCompressorRecipeResult(item:get_name())
 		if not output or item:get_count()<output.count then
 			return {
@@ -465,7 +487,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method=="industrialtest.extracting" then
+	elseif method==industrialtest.api.craftingMethods.extracting then
 		local output=industrialtest.api.getExtractorRecipeResult(item:get_name())
 		if not output then
 			return {
@@ -481,7 +503,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method=="industrialtest.recycling" then
+	elseif method==industrialtest.api.craftingMethods.recycling then
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-1)
 		return {
@@ -489,7 +511,7 @@ local function craftResultProxy(method,item)
 			time=2,
 			src=srcAfter
 		}
-	elseif method=="industrialtest.cable_forming" then
+	elseif method==industrialtest.api.craftingMethods.cableForming then
 		local output=industrialtest.api.getCableFormerRecipeResult(item:get_name())
 		if not output then
 			return {
@@ -505,7 +527,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method=="industrialtest.mass_fabricating" then
+	elseif method==industrialtest.api.craftingMethods.massFabricating then
 		if item:get_count()<34 then
 			return {
 				item=ItemStack(),
@@ -528,42 +550,22 @@ simpleElectricItemProcessor.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local srcPercent=meta:get_float("srcTime")/meta:get_float("maxSrcTime")*100
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;src;3.4,1.8;1,1]",
-			"listring[context;src]",
+		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
 		(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;powerStorage;3.4,3.9;1,1]",
-			"listring[context;powerStorage]",
+		industrialtest.internal.getItemSlotBg(3.4,3.9,1,1),
 		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 		"list[context;dst;6.4,2.8;1,1]",
-			"listring[context;dst]",
+		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
 		"list[context;upgrades;9,0.9;1,4]",
-			"listring[context;upgrades]"
+		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;src;3.4,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
 		"listring[context;src]",
-			(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
+		"listring[context;dst]"
-			 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
-			"list[context;powerStorage;3.4,3.9;1,1]",
-			mcl_formspec.get_itemslot_bg(3.4,3.9,1,1),
-			"listring[context;powerStorage]",
-			(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
-			 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
-			"list[context;dst;6.4,2.8;1,1]",
-			mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
-			"listring[context;dst]",
-			"list[context;upgrades;9,0.9;1,4]",
-			mcl_formspec.get_itemslot_bg(9,0.9,1,4),
-			"listring[context;upgrades]"
 	}
-	end
 	return table.concat(formspec,"")
 end
 

machines/compressor.lua

@@ -24,7 +24,7 @@ industrialtest.internal.registerSimpleElectricItemProcessor({
 	capacity=1400,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=120,
-	method="industrialtest.compressing",
+	method=industrialtest.api.craftingMethods.compressing,
 	efficiency=1
 })
 minetest.register_craft({

machines/fluid_generator.lua

@@ -22,37 +22,21 @@ fluidGenerator.getFormspec=function(pos,config)
 	local fluidPercent=meta:get_float("fluidAmount")/100
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local fluid=meta:get_string("fluid")
-	local formspec
 	local fuel=config.getFuel(fluid)
 	local tile=(fuel and fuel.texture or "industrialtest_gui_fluid_bg.png")
-	if industrialtest.mtgAvailable then
+	local formspec={
-		formspec={
 		"list[context;src;2,1.8;1,1]",
-			"listring[context;src]",
+		industrialtest.internal.getItemSlotBg(2,1.8,1,1),
 		(fluidPercent>0 and "image[2,3;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[2,3;1,1;industrialtest_gui_fluid_bg.png]"),
 		"list[context;dst;2,4.2;1,1]",
-			"listring[context;dst]",
+		industrialtest.internal.getItemSlotBg(2,4.2,1,1),
 		"list[context;charged;6,3;1,1]",
-			"listring[context;charged]",
+		industrialtest.internal.getItemSlotBg(6,3,1,1),
 		"box[9,1;0.3,4.8;#202020]",
-			(powerPercent>0 and "box[9,"..(1+4.8-(powerPercent*4.8))..";0.3,"..(powerPercent*4.8)..";#FF1010]" or "")
+		(powerPercent>0 and "box[9,"..(1+4.8-(powerPercent*4.8))..";0.3,"..(powerPercent*4.8)..";#FF1010]" or ""),
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;src;2,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(2,1.8,1,1),
 		"listring[context;src]",
-			(fluidPercent>0 and "image[2,3;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[2,3;1,1;industrialtest_gui_fluid_bg.png]"),
+		"listring[context;dst]"
-			"list[context;dst;2,4.2;1,1]",
-			mcl_formspec.get_itemslot_bg(2,4.2,1,1),
-			"listring[context;dst]",
-			"list[context;charged;6,3;1,1]",
-			mcl_formspec.get_itemslot_bg(6,3,1,1),
-			"listring[context;charged]",
-			"box[9,1;0.3,4.8;#202020]",
-			(powerPercent>0 and "box[9,"..(1+4.8-(powerPercent*4.8))..";0.3,"..(powerPercent*4.8)..";#FF1010]" or "")
 	}
-	end
 	return table.concat(formspec,"")
 end
 

machines/generator.lua

@@ -21,32 +21,17 @@ generator.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local fuelPercent=meta:get_int("fuelTime")/meta:get_int("maxFuelTime")*100
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
-			"list[context;charged;4.9,1.8;1,1]",
-			"listring[context;charged]",
-			(fuelPercent>0 and "image[4.9,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
-			 or "image[4.9,2.8;1,1;default_furnace_fire_bg.png]"),
-			"list[context;src;4.9,3.9;1,1]",
-			"listring[context;src]",
-			"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
 		"list[context;charged;4.7,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(4.7,1.8,1,1),
+		industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
-			"listring[context;charged]",
 		(fuelPercent>0 and "image[4.7,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
 		 or "image[4.7,2.8;1,1;default_furnace_fire_bg.png]"),
 		"list[context;src;4.7,3.9;1,1]",
-			mcl_formspec.get_itemslot_bg(4.7,3.9,1,1),
+		industrialtest.internal.getItemSlotBg(4.7,3.9,1,1),
-			"listring[context;src]",
 		"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
+		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
+		"listring[context;src]"
 	}
-	end
 	return table.concat(formspec,"")
 end
 

machines/induction_furnace.lua

@@ -43,44 +43,23 @@ inductionFurnace.getFormspec=function(pos)
 	local maxSrcTime=meta:get_float("maxSrcTime")
 	local srcPercent=maxSrcTime>0 and meta:get_float("srcTime")/maxSrcTime*100 or 0
 	local heat=meta:get_int("heat")
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-    formspec={
 		"list[context;src;3.7,1.8;2,1]",
+		industrialtest.internal.getItemSlotBg(3.7,1.8,2,1),
 		(powerPercent>0 and "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;powerStorage;3.7,3.9;1,1]",
+		industrialtest.internal.getItemSlotBg(3.7,3.9,1,1),
 		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 		"list[context;dst;6,2.8;2,1;]",
+		industrialtest.internal.getItemSlotBg(6,2.8,2,1),
 		"list[context;upgrades;9,0.9;1,4]",
+		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
 		"label[0.5,2.8;"..minetest.formspec_escape(S("Heat: @1 %",heat)).."]",
 		"listring[context;src]",
-		"listring[context;powerStorage]",
+		"listring[context;dst]"
-		"listring[context;dst]",
-		"listring[context;upgrades]"
     }
-	elseif industrialtest.mclAvailable then
-    formspec={
-		"list[context;src;3.7,1.8;2,1]",
-		mcl_formspec.get_itemslot_bg(3.7,1.8,2,1),
-		(powerPercent>0 and "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
-		 or "image[3.7,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
-		"list[context;powerStorage;3.7,3.9;1,1]",
-		mcl_formspec.get_itemslot_bg(3.7,3.9,1,1),
-		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
-		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
-		"list[context;dst;6,2.8;2,1;]",
-		mcl_formspec.get_itemslot_bg(6,2.8,2,1),
-		"list[context;upgrades;9,0.9;1,4]",
-		mcl_formspec.get_itemslot_bg(9,0.9,1,4),
-		"label[0.5,2.8;"..minetest.formspec_escape(S("Heat: @1 %",heat)).."]",
-		"listring[context;src]",
-		"listring[context;powerStorage]",
-		"listring[context;dst]",
-		"listring[context;upgrades]"
-    }
-	end
 	return table.concat(formspec,"")
 end
 

machines/iron_furnace.lua

@@ -25,17 +25,17 @@ ironFurnace.getFormspec=function(fuelPercent,srcPercent)
 			"size[10.8,12]",
 			"label[0.5,0.5;"..S("Iron Furnace").."]",
 			"list[context;src;3.4,1.8;1,1]",
-			"listring[context;src]",
 			(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
 			 or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"),
 			"list[context;fuel;3.4,3.9;1,1]",
-			"listring[context;fuel]",
 			(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 			 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 			"list[context;dst;6.4,2.8;1,1]",
-			"listring[context;dst]",
 			"list[current_player;main;0.5,6.25;8,1]",
-			"list[current_player;main;0.5,7.5;8,3;8]"
+			"list[current_player;main;0.5,7.5;8,3;8]",
+			"listring[current_player;main]",
+			"listring[context;src]",
+			"listring[context;dst]"
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
@@ -43,21 +43,21 @@ ironFurnace.getFormspec=function(fuelPercent,srcPercent)
 			"label[0.25,0.25;"..S("Iron Furnace").."]",
 			"list[context;src;3.4,1.8;1,1]",
 			mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
-			"listring[context;src]",
 			(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
 			 or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"),
 			"list[context;fuel;3.4,3.9;1,1]",
 			mcl_formspec.get_itemslot_bg(3.4,3.9,1,1),
-			"listring[context;fuel]",
 			(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 			 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 			"list[context;dst;6.4,2.8;1,1]",
 			mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
-			"listring[context;dst]",
 			"list[current_player;main;0.5,7;9,3;9]",
 			mcl_formspec.get_itemslot_bg(0.5,7,9,3),
 			"list[current_player;main;0.5,10.24;9,1]",
-			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1)
+			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
+			"listring[current_player;main]",
+			"listring[context;src]",
+			"listring[context;dst]"
 		}
 	end
 	return table.concat(formspec,"")
@@ -293,12 +293,21 @@ if industrialtest.mtgAvailable then
 		return not (inv:get_list("src")[1]:get_count()>0 or inv:get_list("fuel")[1]:get_count()>0 or inv:get_list("dst")[1]:get_count()>0)
 	end
 elseif industrialtest.mclAvailable then
+	definition.groups={
+		pickaxey=1,
+		container=2
+	}
 	definition.after_dig_node=function(pos,oldnode,oldmeta)
 		industrialtest.internal.mclAfterDigNode(pos,oldmeta,{"src","fuel","dst"})
 	end
 	definition.sounds=mcl_sounds.node_sound_metal_defaults()
 	definition._mcl_blast_resistance=3
 	definition._mcl_hardness=3.5
+	definition._mcl_hoppers_on_try_pull = mcl_furnaces.hoppers_on_try_pull
+	definition._mcl_hoppers_on_try_push = mcl_furnaces.hoppers_on_try_push
+	definition._mcl_hoppers_on_after_push = function(pos)
+		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	end
 end
 minetest.register_node("industrialtest:iron_furnace",definition)
 definition=table.copy(definition)
@@ -317,7 +326,9 @@ definition.drop="industrialtest:iron_furnace"
 definition.on_timer=ironFurnace.activeOnTimer
 if industrialtest.mclAvailable then
 	definition.groups={
-		not_in_creative_inventory=1
+		not_in_creative_inventory=1,
+		pickaxey=1,
+		container=2
 	}
 	definition._doc_items_create_entry=false
 end

machines/macerator.lua

@@ -24,7 +24,7 @@ industrialtest.internal.registerSimpleElectricItemProcessor({
 	capacity=1200,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=100,
-	method="industrialtest.macerating",
+	method=industrialtest.api.craftingMethods.macerating,
 	efficiency=1
 })
 minetest.register_craft({

machines/nuclear_reactor.lua

@@ -23,30 +23,16 @@ reactor.getFormspec=function(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local size=math.floor(meta:get_int("size")/3)
 	local switchText=(meta:get_int("enabled")==0 and S("Start") or S("Stop"))
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;fuel;1,1;"..size..","..size.."]",
-			"listring[context;fuel]",
+		industrialtest.internal.getItemSlotBg(1,1,size,size),
-			"list[context;charged;7.7,2.8;1,1]",
+		"list[context;charged;7,2.8;1,1]",
-			"listring[context;charged]",
+		industrialtest.internal.getItemSlotBg(7.7,2.8,1,1),
 		"button[7.7,1;1,0.8;toggle;"..minetest.formspec_escape(switchText).."]",
 		"box[9,1;0.3,4.8;#202020]",
 		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
+		"listring[context;fuel]"
 	}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;fuel;1,1;"..size..","..size.."]",
-			mcl_formspec.get_itemslot_bg(1,1,size,size),
-			"listring[context;fuel]",
-			"list[context;charged;7,2.8;1,1]",
-			mcl_formspec.get_itemslot_bg(7.7,2.8,1,1),
-			"listring[context;charged]",
-			"button[7.7,1;1,0.8;toggle;"..minetest.formspec_escape(switchText).."]",
-			"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
-		}
-	end
 	return table.concat(formspec,"")
 end
 

machines/power_storage.lua

@@ -20,32 +20,18 @@ local powerStorage={}
 powerStorage.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;charged;1,2.5;1,1]",
-			"listring[context;charged]",
+		industrialtest.internal.getItemSlotBg(1,2.5,1,1),
 		"label[0.9,3.9;"..S("Charge").."]",
 		"list[context;discharged;3,2.5;1,1]",
-			"listring[context;discharged]",
+		industrialtest.internal.getItemSlotBg(3,2.5,1,1),
 		"label[2.7,3.9;"..S("Discharge").."]",
 		"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
+		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;charged;1,2.5;1,1]",
 		"listring[context;charged]",
-			mcl_formspec.get_itemslot_bg(1,2.5,1,1),
+		"listring[context;discharged]"
-			"label[0.9,3.9;"..S("Charge").."]",
-			"list[context;discharged;3,2.5;1,1]",
-			"listring[context;discharged]",
-			mcl_formspec.get_itemslot_bg(3,2.5,1,1),
-			"label[2.7,3.9;"..S("Discharge").."]",
-			"box[9,1;0.3,4.8;#202020]",
-			(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or "")
 	}
-	end
 	return table.concat(formspec,"")
 end
 

machines/rotary_macerator.lua

@@ -27,51 +27,26 @@ rotaryMacerator.getFormspec=function(pos)
 	local srcPercent=maxSrcTime>0 and meta:get_float("srcTime")/maxSrcTime*100 or 0
 	local rpm=meta:get_int("rpm")
 	local buttonMaintainSpeedText=meta:get_int("maintainSpeed")==1 and S("Don't maintain speed") or S("Maintain speed")
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;src;3.8,1.8;1,1]",
+		industrialtest.internal.getItemSlotBg(3.8,1.8,1,1),
 		"list[context;modifier;4.9,1.8;1,1]",
+		industrialtest.internal.getItemSlotBg(4.9,1.8,1,1),
 		(powerPercent>0 and "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;powerStorage;3.8,3.9;1,1]",
+		industrialtest.internal.getItemSlotBg(3.8,3.9,1,1),
 		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
 		"list[context;dst;6,2.8;1,1;]",
+		industrialtest.internal.getItemSlotBg(6,2.8,1,1),
 		"list[context;upgrades;9,0.9;1,4]",
+		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
 		"label[0.5,2.8;"..minetest.formspec_escape(S("Speed: @1",rpm)).."]",
 		"button[0.5,3.4;3,0.8;maintainSpeed;"..minetest.formspec_escape(buttonMaintainSpeedText).."]",
 		"listring[context;src]",
-			"listring[context;modifier]",
+		"listring[context;dst]"
-			"listring[context;powerStorage]",
-			"listring[context;dst]",
-			"listring[context;upgrades]"
 	}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;src;3.8,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(3.8,1.8,1,1),
-			"list[context;modifier;4.9,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(4.9,1.8,1,1),
-			(powerPercent>0 and "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
-			 or "image[3.8,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
-			"list[context;powerStorage;3.8,3.9;1,1]",
-			mcl_formspec.get_itemslot_bg(3.8,3.9,1,1),
-			(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
-			 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
-			"list[context;dst;6,2.8;1,1;]",
-			mcl_formspec.get_itemslot_bg(6,2.8,1,1),
-			"list[context;upgrades;9,0.9;1,4]",
-			mcl_formspec.get_itemslot_bg(9,0.9,1,4),
-			"label[0.5,2.8;"..minetest.formspec_escape(S("Speed: @1",rpm)).."]",
-			"button[0.5,3.4;3,0.8;maintainSpeed;"..minetest.formspec_escape(buttonMaintainSpeedText).."]",
-			"listring[context;src]",
-			"listring[context;modifier]",
-			"listring[context;powerStorage]",
-			"listring[context;dst]",
-			"listring[context;upgrades]"
-		}
-	end
 	return table.concat(formspec,"")
 end
 

machines/solar_panel_generator.lua

@@ -20,23 +20,13 @@ local solarPanel={}
 solarPanel.getFormspec=function(pos)
 	local amount=minetest.get_natural_light(vector.offset(pos,0,1,0))/15.0
 	local charging=amount>0.5
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
-			"list[context;charged;4.9,1.8;1,1]",
-			"listring[context;charged]",
-			(charging and "image[4.9,2.8;1,1;industrialtest_gui_sun_fg.png]"
-			 or "image[4.9,2.8;1,1;industrialtest_gui_sun_bg.png]")
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
 		"list[context;charged;4.7,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(4.7,1.8,1,1),
+		industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
-			"listring[context;charged]",
 		(charging and "image[4.7,2.8;1,1;industrialtest_gui_sun_fg.png]"
-			 or "image[4.7,2.8;1,1;industrialtest_gui_sun_bg.png]")
+		 or "image[4.7,2.8;1,1;industrialtest_gui_sun_bg.png]"),
+		"listring[context;charged]"
 	}
-	end
 	return table.concat(formspec,"")
 end
 

machines/tool_workshop.lua

@@ -20,33 +20,17 @@ local toolWorkshop={}
 toolWorkshop.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
 		"list[context;powerStorage;3.7,3.7;1,1;0]",
-			"listring[context;powerStorage]",
+		industrialtest.internal.getItemSlotBg(3.7,3.7,1,1),
 		(powerPercent>0 and "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png]"),
 		"list[context;src;5.9,3.2;1,1;0]",
-			"listring[context;src]",
+		industrialtest.internal.getItemSlotBg(5.9,3.2,1,1),
 		"list[context;upgrades;9,0.9;1,4]",
-			"listring[context;upgrades]"
+		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
+		"listring[context;src]"
 	}
-	elseif industrialtest.mclAvailable then
-		formspec={
-			"list[context;powerStorage;3.7,3.7;1,1;0]",
-			mcl_formspec.get_itemslot_bg(3.7,3.7,1,1),
-			"listring[context;powerStorage]",
-			(powerPercent>0 and "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
-			 or "image[3.7,2.5;1,1;industrialtest_gui_electricity_bg.png]"),
-			"list[context;src;5.9,3.2;1,1;0]",
-			mcl_formspec.get_itemslot_bg(5.9,3.2,1,1),
-			"listring[context;src]",
-			"list[context;upgrades;9,0.9;1,4]",
-			mcl_formspec.get_itemslot_bg(9,0.9,1,4),
-			"listring[context;upgrades]"
-		}
-	end
 	return table.concat(formspec,"")
 end
 

machines/wind_mill.lua

@@ -20,23 +20,13 @@ local windMill={}
 windMill.getFormspec=function(pos)
 	local meta=minetest.get_meta(pos)
 	local charging=meta:get_int("charging")
-	local formspec
+	local formspec={
-	if industrialtest.mtgAvailable then
-		formspec={
-			"list[context;charged;4.9,1.8;1,1]",
-			"listring[context;charged]",
-			(charging>0 and "image[4.9,3;1,1;industrialtest_gui_wind_bg.png^[lowpart:"..charging..":industrialtest_gui_wind_fg.png]"
-			 or "image[4.9,3;1,1;industrialtest_gui_wind_bg.png]")
-		}
-	elseif industrialtest.mclAvailable then
-		formspec={
 		"list[context;charged;4.7,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(4.7,1.8,1,1),
+		industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
-			"listring[context;charged]",
 		(charging>0 and "image[4.7,3;1,1;industrialtest_gui_wind_bg.png^[lowpart:"..charging..":industrialtest_gui_wind_fg.png]"
-			 or "image[4.7,3;1,1;industrialtest_gui_wind_bg.png]")
+		 or "image[4.7,3;1,1;industrialtest_gui_wind_bg.png]"),
+		"listring[context;charged]"
 	}
-	end
 	return table.concat(formspec,"")
 end