feat: enchantability for bronze armor and weapons

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

@@ -672,6 +672,7 @@ industrialtest.api.registerPlate=function(name,displayName,resources,color,regis
 	minetest.register_craftitem("industrialtest:"..name,{
 		description=displayName,
 		inventory_image="industrialtest_plate.png",
+		inventory_overlay="industrialtest_plate_overlay.png",
 		color=color
 	})
 	if registerCompressorRecipe then
@@ -688,13 +689,16 @@ end
 -- \param displayName Display name of cell
 -- \param node Node which can be picked up with this cell
 -- \returns nil
-industrialtest.api.registerStorageCell=function(name,displayName,node,modname)
+industrialtest.api.registerStorageCell=function(name,displayName,node,modname,color)
+	color = color or "#ffffffff"
 	if not modname then
 		modname="industrialtest"
 	end
 	minetest.register_craftitem("industrialtest:"..name.."_cell",{
 		description=S(displayName.." Cell"),
-		inventory_image=modname.."_"..name.."_cell.png",
+		inventory_image="industrialtest_cell_fluid.png",
+		inventory_overlay="industrialtest_cell_casing.png",
+		color=color,
 		on_place=function(itemstack,user,pointed)
 			if pointed.type~="node" or not user or not user:is_player() then
 				return nil

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
@@ -194,7 +202,7 @@ if industrialtest.mclAvailable then
 		minetest.register_tool("industrialtest:"..material.."_pickaxe",{
 			description=S(materialDisplayName.." Pickaxe"),
 			inventory_image="industrialtest_mcl_"..material.."_pickaxe.png",
-			groups={tool=1,pickaxe=1,dig_speed_class=config.digSpeedClass},
+			groups={tool=1,pickaxe=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
 			tool_capabilities={
 				full_punch_interval=1,
 				max_drop_level=config.dropLevel,
@@ -210,7 +218,7 @@ if industrialtest.mclAvailable then
 		minetest.register_tool("industrialtest:"..material.."_shovel",{
 			description=S(materialDisplayName.." Shovel"),
 			inventory_image="industrialtest_mcl_"..material.."_shovel.png",
-			groups={tool=1,shovel=1,dig_speed_class=config.digSpeedClass},
+			groups={tool=1,shovel=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
 			tool_capabilities={
 				full_punch_interval=1,
 				max_drop_level=config.dropLevel,
@@ -262,7 +270,7 @@ if industrialtest.mclAvailable then
 		minetest.register_tool("industrialtest:"..material.."_axe",{
 			description=S(materialDisplayName.." Axe"),
 			inventory_image="industrialtest_mcl_"..material.."_axe.png",
-			groups={tool=1,axe=1,dig_speed_class=config.digSpeedClass},
+			groups={tool=1,axe=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
 			tool_capabilities={
 				full_punch_interval=1,
 				max_level_drop=config.levelDrop,
@@ -279,7 +287,7 @@ if industrialtest.mclAvailable then
 		minetest.register_tool("industrialtest:"..material.."_sword",{
 			description=S(materialDisplayName.." Sword"),
 			inventory_image="industrialtest_mcl_"..material.."_sword.png",
-			groups={weapon=1,sword=1,dig_speed_class=config.digSpeedClass},
+			groups={weapon=1,sword=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
 			tool_capabilities={
 				full_punch_interval=0.625,
 				max_drop_level=config.maxDropLevel,
@@ -296,7 +304,7 @@ if industrialtest.mclAvailable then
 		minetest.register_tool("industrialtest:"..material.."_hoe",{
 			description=S(materialDisplayName.." Hoe"),
 			inventory_image="industrialtest_mcl_"..material.."_hoe.png",
-			groups={tool=1,hoe=1},
+			groups={tool=1,hoe=1,enchantability=config.enchantability},
 			tool_capabilities={
 				full_punch_interval=1,
 				damage_groups={fleshy=1}
@@ -364,6 +372,7 @@ if industrialtest.mclAvailable then
 			cook_material=config.armorCookMaterial,
 			sound_equip=config.armorEquipSound,
 			sound_unequip=config.armorUnequipSound,
+			enchantability=config.enchantability,
 			textures={
 				head="industrialtest_mcl_"..material.."_helmet.png",
 				torso="industrialtest_mcl_"..material.."_chestplate.png",
@@ -567,7 +576,8 @@ if industrialtest.mclAvailable then
 		},
 		armorCookMaterial="industrialtest:bronze_nugget",
 		armorEquipSound="mcl_armor_equip_iron",
-		armorUnequipSound="mcl_armor_unequip_iron"
+		armorUnequipSound="mcl_armor_unequip_iron",
+		enchantability=15,
 	})
 
 	--register other blocks that are not availabe in MCL
@@ -611,10 +621,6 @@ if industrialtest.mclAvailable then
 		y_min=mcl_vars.mg_overworld_min
 	})
 elseif industrialtest.mtgAvailable then
-	industrialtest.internal.explode=function(pos,radius)
-		tnt.boom(pos,{radius=radius})
-	end
-
 	industrialtest.internal.registerMetal=function(name,displayName,hardness)
 		minetest.register_craftitem("industrialtest:"..name.."_lump",{
 			description=S(displayName.." Lump"),

craftitems.lua

@@ -15,6 +15,31 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local S=minetest.get_translator("industrialtest")
+local colors={
+	bronze="#be4325ff",
+	clay="#707070ff",
+	coal="#262523ff",
+	copper="#bf644aff",
+	diamond="#77cefbff",
+	gold="#eac162ff",
+	iron="#afaca5ff",
+	lapis_lazuli="#3a4cceff",
+	lead="#6d6393ff",
+	mese="#909000ff",
+	obsidian="#292843ff",
+	refined_iron="#94bab9ff",
+	sulfur="#b88805ff",
+	tin="#ebd182ff",
+	uranium="#3b8c09ff",
+	-- fluid colors
+	lava="#ff5712ff",
+	water="#277bbcff",
+	river_water="#0ebfc2ff",
+	biomass="#2a8626ff",
+	biofuel="#4eba49ff",
+	coalfuel="#462228ff",
+	coolant="#188676ff"
+}
 
 -- Power storage items
 minetest.register_tool("industrialtest:re_battery",{
@@ -197,13 +222,13 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("coal","Coal",resources,"#262523ff",true)
+industrialtest.api.registerResourceDust("coal","Coal",resources,colors.coal,true)
 industrialtest.api.registerResourceDust("clay","Clay",{
 	{
 		resource=industrialtest.elementKeys.clayBlock,
 		count=2
 	}
-},"#707070ff",true)
+},colors.clay,true)
 resources={
 	{
 		resource=industrialtest.elementKeys.diamondBlock,
@@ -221,7 +246,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("diamond","Diamond",resources,"#77cefbff",true)
+industrialtest.api.registerResourceDust("diamond","Diamond",resources,colors.diamond,true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.diamond,
@@ -248,7 +273,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("iron","Iron",resources,"#afaca5ff",true)
+industrialtest.api.registerResourceDust("iron","Iron",resources,colors.iron,true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.ironIngot,
@@ -269,9 +294,9 @@ if industrialtest.mclAvailable then
 			count=9
 		},
 		{resource="mcl_core:lapis_lazuli"}
-	},"#3a4cceff",true)
+	},colors.lapis_lazuli,true)
 end
-industrialtest.api.registerResourceDust("obsidian","Obsidian",{{resource=industrialtest.elementKeys.obsidian}},"#292843ff",true)
+industrialtest.api.registerResourceDust("obsidian","Obsidian",{{resource=industrialtest.elementKeys.obsidian}},colors.obsidian,true)
 resources={
 	{
 		resource=industrialtest.elementKeys.goldBlock,
@@ -293,7 +318,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("gold","Gold",resources,"#eac162ff",true)
+industrialtest.api.registerResourceDust("gold","Gold",resources,colors.gold,true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.goldIngot,
@@ -320,7 +345,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("copper","Copper",resources,"#bf644aff",true)
+industrialtest.api.registerResourceDust("copper","Copper",resources,colors.copper,true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.copperIngot,
@@ -347,7 +372,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("tin","Tin",resources,"#ebd182ff",true)
+industrialtest.api.registerResourceDust("tin","Tin",resources,colors.tin,true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.tinIngot,
@@ -374,7 +399,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("uranium","Uranium",resources,"#3b8c09ff",true)
+industrialtest.api.registerResourceDust("uranium","Uranium",resources,colors.uranium,true)
 minetest.register_craft({
 	type="cooking",
 	output="industrialtest:uranium_ingot",
@@ -391,7 +416,7 @@ if industrialtest.mtgAvailable then
 			count=2
 		},
 		{resource="default:mese_crystal"}
-	},"#909000ff",true)
+	},colors.mese,true)
 	minetest.register_craft({
 		type="cooking",
 		output="default:mese_crystal",
@@ -404,7 +429,7 @@ industrialtest.api.registerResourceDust("bronze","Bronze",{
 		count=9
 	},
 	{resource=industrialtest.elementKeys.bronzeIngot}
-},"#be4325ff",true)
+},colors.bronze,true)
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:bronze_dust 9",
@@ -431,7 +456,7 @@ industrialtest.api.registerRotaryMaceratorModifier({
 	output="industrialtest:bronze_dust",
 	uses=4
 })
-industrialtest.api.registerResourceDust("sulfur","Sulfur",{},"#b88805ff",false)
+industrialtest.api.registerResourceDust("sulfur","Sulfur",{},colors.sulfur,false)
 industrialtest.api.registerExtractorRecipe({
 	output="industrialtest:sulfur_dust",
 	recipe=industrialtest.elementKeys.gunpowder
@@ -450,7 +475,7 @@ industrialtest.api.registerResourceDust("lead","Lead",{
 		count=2
 	},
 	{resource="industrialtest:lead_ingot"}
-},"#6d6393ff",true)
+},colors.lead,true)
 minetest.register_craft({
 	type="cooking",
 	output="industrialtest:lead_ingot",
@@ -461,7 +486,7 @@ industrialtest.api.registerResourceDust("refined_iron","Refined Iron",{
 		resource="industrialtest:refined_iron_ingot",
 		count=1
 	}
-},"#94bab9ff",true)
+},colors.refined_iron,true)
 industrialtest.api.registerRotaryMaceratorModifier({
 	name=industrialtest.elementKeys.ironLump,
 	modifier=industrialtest.elementKeys.coal,
@@ -524,14 +549,14 @@ industrialtest.api.registerPlate("bronze_plate",S("Bronze Plate"),{
 		resource=industrialtest.elementKeys.bronzeIngot,
 		count=1
 	}
-},"#e48e88ff",true)
+},colors.bronze,true)
 
 industrialtest.api.registerPlate("copper_plate",S("Copper Plate"),{
 	{
 		resource=industrialtest.elementKeys.copperIngot,
 		count=1
 	}
-},"#f48e44ff",true)
+},colors.copper,true)
 
 industrialtest.api.registerPlate("advanced_alloy",S("Advanced Alloy"),{
 	{
@@ -552,14 +577,14 @@ industrialtest.api.registerPlate("tin_plate",S("Tin Plate"),{
 		resource=industrialtest.elementKeys.tinIngot,
 		count=1
 	}
-},"#e0e0e0ff",true)
+},colors.tin,true)
 
 industrialtest.api.registerPlate("lead_plate",S("Lead Plate"),{
 	{
 		resource="industrialtest:lead_ingot",
 		count=1
 	}
-},"#eafef8ff",true)
+},colors.lead,true)
 
 industrialtest.api.registerPlate("iridium_plate",S("Iridium Plate"),{},false,"#ffffffff")
 minetest.register_craft({
@@ -609,12 +634,12 @@ minetest.register_craft({
 		{"",industrialtest.elementKeys.tinIngot,""}
 	}
 })
-industrialtest.api.registerStorageCell("water","Water",industrialtest.elementKeys.waterSource)
+industrialtest.api.registerStorageCell("water","Water",industrialtest.elementKeys.waterSource,nil,colors.water)
 if industrialtest.mtgAvailable then
-	industrialtest.api.registerStorageCell("river_water","River Water","default:river_water_source")
+	industrialtest.api.registerStorageCell("river_water","River Water","default:river_water_source",nil,colors.river_water)
 end
 
-industrialtest.api.registerStorageCell("lava","Lava",industrialtest.elementKeys.lavaSource)
+industrialtest.api.registerStorageCell("lava","Lava",industrialtest.elementKeys.lavaSource,nil,colors.lava)
 
 minetest.register_tool("industrialtest:uranium_cell",{
 	description=S("Uranium Cell"),
@@ -622,7 +647,9 @@ minetest.register_tool("industrialtest:uranium_cell",{
 		_industrialtest_placedInNuclearReactor=1,
 		_industrialtest_nuclearReactorFuel=1
 	},
-	inventory_image="industrialtest_uranium_cell.png",
+	inventory_image="industrialtest_cell_fluid.png",
+	inventory_overlay="industrialtest_cell_casing.png",
+	color=colors.uranium,
 })
 minetest.register_craft({
 	type="shapeless",
@@ -639,7 +666,9 @@ minetest.register_tool("industrialtest:coolant_cell",{
 		_industrialtest_placedInNuclearReactor=1,
 		_industrialtest_nuclearReactorCoolant=1
 	},
-	inventory_image="industrialtest_coolant_cell.png",
+	inventory_image="industrialtest_cell_fluid.png",
+	inventory_overlay="industrialtest_cell_casing.png",
+	color=colors.coolant,
 })
 minetest.register_craft({
 	type="shaped",
@@ -664,7 +693,9 @@ end
 
 minetest.register_craftitem("industrialtest:bio_cell",{
 	description=S("Bio Cell"),
-	inventory_image="industrialtest_bio_cell.png"
+	inventory_image="industrialtest_cell_fluid.png",
+	inventory_overlay="industrialtest_cell_casing.png",
+	color=colors.biomass,
 })
 minetest.register_craft({
 	type="shapeless",
@@ -677,7 +708,9 @@ minetest.register_craft({
 
 minetest.register_craftitem("industrialtest:biofuel_cell",{
 	description=S("Biofuel Cell"),
-	inventory_image="industrialtest_bio_cell.png",
+	inventory_image="industrialtest_cell_fluid.png",
+	inventory_overlay="industrialtest_cell_casing.png",
+	color=colors.biofuel,
 	groups={
 		_industrialtest_fuel=1
 	},
@@ -692,7 +725,9 @@ industrialtest.api.registerExtractorRecipe({
 
 minetest.register_craftitem("industrialtest:hydrated_coal_cell",{
 	description=S("Hydrated Coal Cell"),
-	inventory_image="industrialtest_hydrated_coal_cell.png"
+	inventory_image="industrialtest_cell_fluid.png",
+	inventory_overlay="industrialtest_cell_casing.png",
+	color=colors.coal,
 })
 minetest.register_craft({
 	type="shapeless",
@@ -705,7 +740,9 @@ minetest.register_craft({
 
 minetest.register_craftitem("industrialtest:coalfuel_cell",{
 	description=S("Coalfuel Cell"),
-	inventory_image="industrialtest_coalfuel_cell.png",
+	inventory_image="industrialtest_cell_fluid.png",
+	inventory_overlay="industrialtest_cell_casing.png",
+	color=colors.coalfuel,
 	groups={
 		_industrialtest_fuel=1
 	},

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,"")
@@ -548,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/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,"")

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