Use mcl_formspec.get_itemslot_bg_v4 instead of mcl_formspec.get_itemslot_bg

compatibility.lua

@@ -101,7 +101,7 @@ if industrialtest.mclAvailable then
 		mcl_explosions.explode(pos,radius,{drop_chance=dropChance})
 	end
 
-	industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg
+	industrialtest.internal.getItemSlotBg=mcl_formspec.get_itemslot_bg_v4
 elseif industrialtest.mtgAvailable then
 	industrialtest.stackMax=99
 

guide.lua

@@ -69,6 +69,7 @@ local function createMachineInformationTable(fields,machineName,num)
 		voltage="Voltage",
 		lowVoltage="Low voltage",
 		highVoltage="High voltage",
+		damageRed="Damage reduction",
 		recipe="Recipe type",
 		powerCapacity="Power capacity",
 		opPower="Power per operation",
@@ -1335,6 +1336,271 @@ local pages={
 				}
 			},S("Electric Treetap"),5)
 		}
+	},
+
+	{
+		name="itemPowerStorage",
+		title=S("Item power storage"),
+		icon="industrialtest:re_battery",
+		content={
+			[[
+				<big>||Item power storage||</big>
+				<left>
+					||There are items which purpose is solely to store power in them. Those are following:||
+				</left>
+				<left>
+					||<item name="industrialtest:re_battery" height="{{ITEM_HEIGHT}}"> <b>RE-Battery</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.REBattery.capacity)
+				}
+			},S("RE-Battery")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:advanced_re_battery" height="{{ITEM_HEIGHT}}"> <b>Advanced RE-Battery</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="MV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.AdvancedREBattery.capacity)
+				}
+			},S("Advanced RE-Battery"),2),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:energy_crystal" height="{{ITEM_HEIGHT}}"> <b>Energy Crystal</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="HV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.EnergyCrystal.capacity)
+				}
+			},S("Energy Crystal"),3),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:lapotron_crystal" height="{{ITEM_HEIGHT}}"> <b>Lapotron Crystal</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.LapotronCrystal.capacity)
+				}
+			},S("Lapotron Crystal"),4)
+		}
+	},
+
+	{
+		name="jetpacks",
+		title=S("Jetpacks"),
+		icon="industrialtest:jetpack_v",
+		content={
+			[[
+				<big>||Jetpacks||</big>
+				<left>
+					||Jetpacks allow to combat against the gravity after pressing the jump key. They are equipped as chest part of armor. There are two jetpack types:||
+				</left>
+				<left>
+					||<item name="industrialtest:jetpack_v" height="{{ITEM_HEIGHT}}"> <b>Jetpack</b> - regular jetpack which is powered by fuel, can be refilled in <item name="industrialtest:canning_machine" height="{{ITEM_HEIGHT}}"> <b>Canning Machine</b>.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="Fuel capacity",
+					value=string.format("%d mB",industrialtest.Jetpack.capacity)
+				}
+			},S("Jetpack")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:electric_jetpack" height="{{ITEM_HEIGHT}}"> <b>Electric Jetpack</b> - jetpack powered by electricity.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="LV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.ElectricJetpack.capacity)
+				}
+			},S("Electric Jetpack"),2)
+		}
+	},
+
+	{
+		name="miningLaser",
+		title=S("Mining Laser"),
+		icon="industrialtest:mining_laser",
+		content={
+			[[
+				<big>||Mining Laser||</big>
+				<left>
+					||Mining Laser is a tool that emits beam when used. Depending on the mode beam will cause different a result:||
+					||Mode 1 - breaks nodes at full power, direction where player looks.||
+					||Mode 2 - breaks nodes at low power, direction where player looks.||
+					||Mode 3 - breaks nodes at full power, direction only horizontal.||
+					||Mode 4 - explodes after touching node, direction where player looks.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="HV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.MiningLaser.capacity)
+				},
+				{
+					name="Power per operation (Mode 1)",
+					value="1250 EU"
+				},
+				{
+					name="Power per operation (Mode 2)",
+					value="100 EU"
+				},
+				{
+					name="Power per operation (Mode 3)",
+					value="100 EU"
+				},
+				{
+					name="Power per operation (Mode 4)",
+					value="5000 EU"
+				}
+			},S("Mining Laser"))
+		}
+	},
+
+	{
+		name="nanoSuit",
+		title=S("Nano Suit"),
+		icon="industrialtest:nano_bodyarmor",
+		content={
+			[[
+				<big>||Nano Suit||</big>
+				<left>
+					||Nano Suit is an armor which with power of electricity can reduce damage which player takes. It consists of following parts:||
+				</left>
+				<left>
+					||<item name="industrialtest:nano_helmet" height="{{ITEM_HEIGHT}}"> <b>Nano Helmet</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.12"
+				}
+			},S("Nano Helmet")),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:nano_bodyarmor" height="{{ITEM_HEIGHT}}"> <b>Nano Bodyarmor</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.32"
+				}
+			},S("Nano Bodyarmor"),2),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:nano_leggings" height="{{ITEM_HEIGHT}}"> <b>Nano Leggings</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.3"
+				}
+			},S("Nano Leggings"),3),
+			[[
+				<mono></mono>
+				<left>
+					||<item name="industrialtest:nano_boots" height="{{ITEM_HEIGHT}}"> <b>Nano Boots</b>||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="voltage",
+					value="EV"
+				},
+				{
+					name="powerCapacity",
+					value=string.format("%d EU",industrialtest.NanoSuit.capacity)
+				},
+				{
+					name="opPower",
+					value=string.format("%d EU",industrialtest.NanoSuit:getPowerPerDamageForItem())
+				},
+				{
+					name="damageRed",
+					value="0.24"
+				}
+			},S("Nano Boots"),4)
+		}
 	}
 }
 
@@ -1353,17 +1619,18 @@ local function preprocessHypertext(content,vars)
 end
 
 local function getGuideFormspec(playerName,pageName)
+	local PAGE_BUTTON_HEIGHT=0.7
+
 	local formspec={
 		"formspec_version[4]",
 		"size[15,10.8]",
 		"label[0.1,0.2;"..S("IndustrialTest Guide").."]",
-		--"scrollbaroptions[]",
+		string.format("scrollbaroptions[max=%f]",(#pages-10.3/PAGE_BUTTON_HEIGHT)*PAGE_BUTTON_HEIGHT*10),
 		"scrollbar[3.6,0.4;0.5,10.3;vertical;scrollbarList;0]",
-		"scroll_container[0.1,0.4;4,10.3;scrollbarList;vertical]"
+		"scroll_container[0.1,0.4;4,10.3;scrollbarList;vertical;0.1]"
 	}
 
 	-- Contents sidebar
-	local PAGE_BUTTON_HEIGHT=0.7
 	for i,page in ipairs(pages) do
 		table.insert(formspec,string.format("container[0,%f]",(i-1)*PAGE_BUTTON_HEIGHT))
 		table.insert(formspec,string.format("item_image[0,0;%f,%f;%s]",PAGE_BUTTON_HEIGHT,PAGE_BUTTON_HEIGHT,page.icon))

machines/canning_machine.lua

@@ -79,20 +79,20 @@ function industrialtest.CanningMachine.getFormspec(self,pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local srcPercent=meta:get_float("srcTime")/self._canningTime*100
 	local formspec={
-		"list[context;src;3.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
+		"list[context;src;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),
+		"list[context;powerStorage;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]",
+		"list[context;dst;6.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
-		"list[context;upgrades;9,0.9;1,4]",
+		"list[context;leftover;6.4,2.8;1,1]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
+		"list[context;upgrades;9,0.9;1,4]",
 		"listring[context;src]",
 		"listring[context;dst]"
 	}

machines/chargepad.lua

@@ -52,11 +52,11 @@ function industrialtest.Chargepad.getFormspec(self,pos)
 	local parentFormspec=industrialtest.ActivatedElectricMachine.getFormspec(self,pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local formspec={
-		"list[context;charged;1,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(1,2.5,1,1),
+		"list[context;charged;1,2.5;1,1]",
 		"label[0.9,3.9;"..S("Charge").."]",
-		"list[context;discharged;3,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(3,2.5,1,1),
+		"list[context;discharged;3,2.5;1,1]",
 		"label[2.7,3.9;"..S("Discharge").."]",
 		self.createPowerIndicatorWidget(charged,9,1),
 		"listring[context;charged]",

machines/fluid_generator.lua

@@ -36,13 +36,13 @@ local function getFormspec(self,pos)
 	local fuel=self.getFuel(fluid)
 	local tile=(fuel and fuel.texture or "industrialtest_gui_fluid_bg.png")
 	local formspec={
-		"list[context;src;2,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(2,1.8,1,1),
+		"list[context;src;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]",
 		industrialtest.internal.getItemSlotBg(2,4.2,1,1),
-		"list[context;charged;6,3;1,1]",
+		"list[context;dst;2,4.2;1,1]",
 		industrialtest.internal.getItemSlotBg(6,3,1,1),
+		"list[context;charged;6,3;1,1]",
 		self.createPowerIndicatorWidget(powerPercent,9,1),
 		"listring[context;src]",
 		"listring[context;dst]"

machines/generator.lua

@@ -72,12 +72,12 @@ function industrialtest.Generator.getFormspec(self,pos)
 	local fuelPercent=meta:get_float("fuelTime")/meta:get_float("maxFuelTime")*100
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local formspec={
-		"list[context;charged;4.7,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
+		"list[context;charged;4.7,1.8;1,1]",
 		(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]",
 		industrialtest.internal.getItemSlotBg(4.7,3.9,1,1),
+		"list[context;src;4.7,3.9;1,1]",
 		self.createPowerIndicatorWidget(charged,9,1),
 		"listring[context;src]"
 	}

machines/induction_furnace.lua

@@ -80,18 +80,18 @@ function industrialtest.InductionFurnace.getFormspec(self,pos)
 	local srcPercent=maxSrcTime>0 and meta:get_float("srcTime")/maxSrcTime*100 or 0
 	local heat=meta:get_int("heat")
 	local formspec={
-		"list[context;src;3.7,1.8;2,1]",
 		industrialtest.internal.getItemSlotBg(3.7,1.8,2,1),
+		"list[context;src;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),
+		"list[context;powerStorage;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]",
+		"list[context;dst;6,2.8;2,1;]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
+		"list[context;upgrades;9,0.9;1,4]",
 		"label[0.5,2.8;"..minetest.formspec_escape(S("Heat: @1 %",heat)).."]",
 		"listring[context;src]",
 		"listring[context;dst]"

machines/iron_furnace.lua

@@ -80,16 +80,16 @@ function industrialtest.IronFurnace.getFormspec(self,pos)
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
+			mcl_formspec.get_itemslot_bg_v4(3.4,1.8,1,1),
 			"list[context;src;3.4,1.8;1,1]",
-			mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
 			(fuelPercent>0 and "image[3.4,2.8;1,1;default_furnace_fire_bg.png^[lowpart:"..fuelPercent..":default_furnace_fire_fg.png]"
 			 or "image[3.4,2.8;1,1;default_furnace_fire_bg.png]"),
+			mcl_formspec.get_itemslot_bg_v4(3.4,3.9,1,1),
 			"list[context;fuel;3.4,3.9;1,1]",
-			mcl_formspec.get_itemslot_bg(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]"),
+			mcl_formspec.get_itemslot_bg_v4(6.4,2.8,1,1),
 			"list[context;dst;6.4,2.8;1,1]",
-			mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
 			"listring[context;src]",
 			"listring[context;dst]"
 		}

machines/machine.lua

@@ -54,12 +54,13 @@ function industrialtest.Machine.getFormspec(self,pos)
 		}
 	elseif industrialtest.mclAvailable then
 		formspec={
-			"size[10.04,12]",
+			"formspec_version[4]",
-			"label[0.25,0.25;"..self.description.."]",
+			"size[12,12.5]",
+			"label[0.5,0.5;"..self.description.."]",
+			mcl_formspec.get_itemslot_bg_v4(0.5,7,9,3),
 			"list[current_player;main;0.5,7;9,3;9]",
-			mcl_formspec.get_itemslot_bg(0.5,7,9,3),
+			mcl_formspec.get_itemslot_bg_v4(0.5,11,9,1),
-			"list[current_player;main;0.5,10.24;9,1]",
+			"list[current_player;main;0.5,11;9,1]",
-			mcl_formspec.get_itemslot_bg(0.5,10.24,9,1),
 			"listring[current_player;main]"
 		}
 	end

machines/magnetizer.lua

@@ -129,6 +129,7 @@ function industrialtest.Magnetizer.getFormspec(self,pos)
 	local formspec={
 		(powerPercent>0 and "image[4.7,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[4.7,2.7;1,1;industrialtest_gui_electricity_bg.png]"),
+		industrialtest.internal.getItemSlotBg(4.7,3.7,1,1),
 		"list[context;powerStorage;4.7,3.7;1,1]",
 		"listring[context;powerStorage]"
 	}

machines/miner.lua

@@ -187,22 +187,22 @@ function industrialtest.Miner.getFormspec(self,pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local formspec={
 		"label[0.7,1.15;"..S("Drill").."]",
-		"list[context;drill;0.7,1.5;1,1]",
 		industrialtest.internal.getItemSlotBg(0.7,1.5,1,1),
+		"list[context;drill;0.7,1.5;1,1]",
 		"label[0.7,2.75;"..S("Pipe").."]",
-		"list[context;src;0.7,3.1;1,1]",
 		industrialtest.internal.getItemSlotBg(0.7,3.1,1,1),
+		"list[context;src;0.7,3.1;1,1]",
 		"label[0.7,4.35;"..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]",
+		"list[context;scanner;0.7,4.7;1,1]",
 		industrialtest.internal.getItemSlotBg(2.28,1.9,5,3),
-		"list[context;upgrades;9.1,1.2;1,1]",
+		"list[context;dst;2.28,1.9;5,3]",
 		industrialtest.internal.getItemSlotBg(9.1,1.2,1,1),
+		"list[context;upgrades;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),
+		"list[context;powerStorage;9.1,3.5;1,1]",
 		"listring[context;src]",
 		"listring[context;dst]"
 	}

machines/nuclear_reactor.lua

@@ -86,10 +86,10 @@ function industrialtest.Reactor.getFormspec(self,pos)
 	local size=math.floor(meta:get_int("size")/3)
 	local switchText=(meta:get_int("enabled")==0 and S("Start") or S("Stop"))
 	local formspec={
-		"list[context;fuel;1,1;"..size..","..size.."]",
 		industrialtest.internal.getItemSlotBg(1,1,size,size),
-		"list[context;charged;7,2.8;1,1]",
+		"list[context;fuel;1,1;"..size..","..size.."]",
 		industrialtest.internal.getItemSlotBg(7.7,2.8,1,1),
+		"list[context;charged;7,2.8;1,1]",
 		"button[7.7,1;1,0.8;toggle;"..minetest.formspec_escape(switchText).."]",
 		self.createPowerIndicatorWidget(charged,9,1),
 		"listring[context;fuel]"

machines/power_storage.lua

@@ -50,11 +50,11 @@ function industrialtest.PowerStorage.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local formspec={
-		"list[context;charged;1,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(1,2.5,1,1),
+		"list[context;charged;1,2.5;1,1]",
 		"label[0.9,3.9;"..S("Charge").."]",
-		"list[context;discharged;3,2.5;1,1]",
 		industrialtest.internal.getItemSlotBg(3,2.5,1,1),
+		"list[context;discharged;3,2.5;1,1]",
 		"label[2.7,3.9;"..S("Discharge").."]",
 		self.createPowerIndicatorWidget(charged,9,1),
 		"listring[context;charged]",

machines/pump.lua

@@ -85,12 +85,12 @@ function industrialtest.Pump.getFormspec(self,pos)
 	local pumpFluid=industrialtest.api.getPumpFluid(fluidType)
 	local tile=(pumpFluid and pumpFluid.texture or "industrialtest_gui_fluid_bg.png")
 	local formspec={
-		"list[context;src;3.2,1.7;1,1]",
 		industrialtest.internal.getItemSlotBg(3.2,1.7,1,1),
-		"list[context;dst;4.6,1.7;1,1]",
+		"list[context;src;3.2,1.7;1,1]",
 		industrialtest.internal.getItemSlotBg(4.6,1.7,1,1),
-		"list[context;powerStorage;3.9,3.7;1,1]",
+		"list[context;dst;4.6,1.7;1,1]",
 		industrialtest.internal.getItemSlotBg(3.9,3.7,1,1),
+		"list[context;powerStorage;3.9,3.7;1,1]",
 		(powerPercent>0 and "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
 		 or "image[3.9,2.7;1,1;industrialtest_gui_electricity_bg.png]"),
 		(srcPercent>0 and "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png]"

machines/rotary_macerator.lua

@@ -84,20 +84,20 @@ function industrialtest.RotaryMacerator.getFormspec(self,pos)
 	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={
-		"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]",
+		"list[context;src;3.8,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(4.9,1.8,1,1),
+		"list[context;modifier;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),
+		"list[context;powerStorage;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]",
+		"list[context;dst;6,2.8;1,1;]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
+		"list[context;upgrades;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]",

machines/simple_electric_item_processor.lua

@@ -56,18 +56,18 @@ function industrialtest.SimpleElectricItemProcessor.getFormspec(self,pos)
 	local recipeOverride=self.isRecipeOverride(meta)
 	local formspec={
 		(recipeOverride and "label[3.4,1.5;"..S("Recipe override: @1", minetest.registered_items[recipeOverride].description).."]" or ""),
-		"list[context;src;3.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(3.4,1.8,1,1),
+		"list[context;src;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),
+		"list[context;powerStorage;3.4,3.9;1,1]",
 		(srcPercent>0 and "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
 		 or "image[4.9,2.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
-		"list[context;dst;6.4,2.8;1,1]",
 		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
-		"list[context;upgrades;9,0.9;1,4]",
+		"list[context;dst;6.4,2.8;1,1]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
+		"list[context;upgrades;9,0.9;1,4]",
 		"listring[context;src]",
 		"listring[context;dst]"
 	}

machines/solar_panel_generator.lua

@@ -48,8 +48,8 @@ function industrialtest.SolarPanelBase.getFormspec(self,pos)
 	local amount=minetest.get_natural_light(vector.offset(pos,0,1,0))/15.0
 	local charging=amount>0.5
 	local formspec={
-		"list[context;charged;4.7,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
+		"list[context;charged;4.7,1.8;1,1]",
 		(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]"),
 		"listring[context;charged]"

machines/tool_workshop.lua

@@ -73,14 +73,14 @@ function industrialtest.ToolWorkshop.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
 	local formspec={
-		"list[context;powerStorage;3.7,3.7;1,1;0]",
 		industrialtest.internal.getItemSlotBg(3.7,3.7,1,1),
+		"list[context;powerStorage;3.7,3.7;1,1;0]",
 		(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]",
 		industrialtest.internal.getItemSlotBg(5.9,3.2,1,1),
-		"list[context;upgrades;9,0.9;1,4]",
+		"list[context;src;5.9,3.2;1,1;0]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
+		"list[context;upgrades;9,0.9;1,4]",
 		"listring[context;src]"
 	}
 	return parentFormspec..table.concat(formspec,"")

machines/wind_mill.lua

@@ -58,8 +58,8 @@ function industrialtest.WindMill.getFormspec(self,pos)
 	local meta=minetest.get_meta(pos)
 	local charging=meta:get_int("charging")
 	local formspec={
-		"list[context;charged;4.7,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(4.7,1.8,1,1),
+		"list[context;charged;4.7,1.8;1,1]",
 		(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]"),
 		"listring[context;charged]"