Release IndustrialTest 2.1.0 (stable, release)

Note: This template doesn't yet include strings from guide

README.md

@@ -1,25 +1,35 @@
 # IndustrialTest
-IndustrialTest is a mod for [Minetest](https://www.minetest.net/) that adds various tech and machinery related stuff.
+IndustrialTest is a mod for [Minetest](https://luanti.org) that adds various tech and machinery related stuff.
+
+## Guide
+Guide can be accessed in-game using `/industrialtest_guide` command.
 
 ## Compatibility
 Currently IndustrialTest supports following games:
-- [Minetest Game](https://content.minetest.net/packages/Minetest/minetest_game) and derivatives
+- [Minetest Game](https://content.luanti.org/packages/Minetest/minetest_game) and derivatives
-- [MineClone2](https://content.minetest.net/packages/Wuzzy/mineclone2/) and derivatives
+- [VoxeLibre](https://content.luanti.org/packages/Wuzzy/mineclone2) and derivatives
 
 ## Additional dependencies
 - Minetest Game
-    - [3D Armor](https://content.minetest.net/packages/stu/3d_armor)
+    - [3D Armor](https://content.luanti.org/packages/stu/3d_armor)
 - VoxeLibre
     - none
 
 ## Optional dependencies
-- [Rubber Addon for MineClone](https://content.minetest.net/packages/biochemist/mcl_rubber)
+- [Rubber Addon for MineClone](https://content.luanti.org/packages/biochemist/mcl_rubber)
-- [Pipeworks](https://content.minetest.net/packages/VanessaE/pipeworks)
+- [Pipeworks](https://content.luanti.org/packages/VanessaE/pipeworks)
-- [Logistica](https://content.minetest.net/packages/ZenonSeth/logistica)
+- [Logistica](https://content.luanti.org/packages/ZenonSeth/logistica)
-- [Mesecons](https://content.minetest.net/packages/Jeija/mesecons)
+- [Mesecons](https://content.luanti.org/packages/Jeija/mesecons)
+
+## Locale
+Mod is available in following languages:
+- English / en_US (base)
+- Polish / pl_PL (by mrkubax10)
+
+New translations highly appreciated!
 
 ## 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]
+- LuanHawk <Discord: luanhawk> [lead graphics]
 - Migdyn <<temp1@cubesoftware.xyz>> [graphics]

compat/pipeworks.lua

@@ -385,6 +385,29 @@ addPipeworksCompatibility("industrialtest:induction_furnace",{
 	{listname="src"}
 },"dst")
 
+-- Miner
+addPipeworksCompatibility("industrialtest:miner",{
+	{
+		y=1,
+		listname="powerStorage"
+	},
+	{listname="src"}
+},"dst")
+
+-- Pump
+addPipeworksCompatibility("industrialtest:pump",{
+	{
+		y=1,
+		listname="powerStorage"
+	},
+	{listname="src"}
+},"dst")
+
+-- Magnetizer
+addPipeworksCompatibility("industrialtest:magnetizer",{
+	{listname="powerStorage"}
+},"powerStorage")
+
 -- Simple electric item processors
 for _,name in ipairs(industrialtest.api.tags.simpleElectricItemProcessor) do
 	addPipeworksCompatibility(name,{

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
 
@@ -528,7 +528,7 @@ if industrialtest.mclAvailable then
 	industrialtest.elementKeys.stoneWithCopper="mcl_copper:stone_with_copper"
 	industrialtest.elementKeys.leadLump="industrialtest:raw_lead"
 	industrialtest.elementKeys.ironPickaxe="mcl_tools:pick_iron"
-	industrialtest.elementKeys.ironHelmet="mcl_tools:helmet_iron"
+	industrialtest.elementKeys.ironHelmet="mcl_armor:helmet_iron"
 	industrialtest.elementKeys.ironBoots="mcl_armor:boots_iron"
 	industrialtest.elementKeys.lavaSource="mcl_core:lava_source"
 	industrialtest.elementKeys.waterSource="mcl_core:water_source"

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]"
@@ -94,6 +94,7 @@ local function takeFuelFromItem(self,pos)
 			inv:set_stack("src",1,fluidSlot)
 			meta:set_string("fluid",fuel.name)
 			meta:set_float("fluidAmount",fluidAmount+1000)
+			self:updateFormspec(pos)
 			return true
 		end
 	end

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]"
@@ -76,13 +76,14 @@ function industrialtest.WindMill.action(self,pos)
 		local dimMax=31000
 		local dim=mcl_worlds.pos_to_dimension(pos)
 		if dim=="overworld" then
-			dimMax=mcl_vars.mg_overworld_max
+			dimMax=mcl_vars.mg_overworld_max_official
 		elseif dim=="nether" then
 			dimMax=mcl_vars.mg_nether_max
 		elseif dim=="end" then
-			dimMax=mcl_vars.mg_end_max
+			dimMax=mcl_vars.mg_end_max_official
 		end
-		charging=math.max(mcl_worlds.layer_to_y(pos.y,dim),0)/dimMax
+		local layer,_=mcl_worlds.y_to_layer(pos.y)
+		charging=math.min(math.max((layer or 0),0)/dimMax,1.0)
 	end
 	local neighbourPositions={
 		vector.offset(pos,-1,0,0),

nodes.lua

@@ -591,6 +591,8 @@ if industrialtest.mtgAvailable then
 		}
 	})
 elseif industrialtest.mclAvailable then
+	-- Some MCL2 forks define this function so use it if available
+	if mcl_fences.register_fence_def then
 		mcl_fences.register_fence_def("iron_fence",{
 			description=S("Iron Fence"),
 			tiles={"default_steel_block.png"},
@@ -607,10 +609,21 @@ elseif industrialtest.mclAvailable then
 			on_destruct=ironFenceOnDestruct,
 			after_destruct=function(pos,oldnode,oldmeta)
 				ironFenceDetach(oldmeta)
-		end,
+			end
-		_mcl_fences_baseitem="industrialtest:iron_plate",
-		_mcl_fences_stickreplacer="industrialtest:iron_plate"
 		})
+	else
+		mcl_fences.register_fence("iron_fence",S("Iron Fence"),"default_steel_block.png",{_industrialtest_metalFence=1},4,5,{"industrialtest:magnetizer","group:fence"},mcl_sounds.node_sound_metal_defaults())
+	end
+	if minetest.registered_nodes["mcl_fences:iron_fence"] then
 		-- mcl_fences.register_fence_def registers fences in it's own namespace so register alias here to keep compatibility
 		minetest.register_alias("industrialtest:iron_fence","mcl_fences:iron_fence")
 	end
+	minetest.register_craft({
+		type="shaped",
+		output="industrialtest:iron_fence 3",
+		recipe={
+			{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"},
+			{"industrialtest:iron_plate","industrialtest:iron_plate","industrialtest:iron_plate"}
+		}
+	})
+end

tools/batpack.lua

@@ -69,8 +69,8 @@ industrialtest.internal.unpackTableInto(industrialtest.LapPack,{
 	description=S("LapPack"),
 	inventoryImage="industrialtest_lappack_v_inv.png",
 	modelImage="industrialtest_lappack_v.png",
-	capacity=60000,
+	capacity=300000,
-	flow=industrialtest.api.lvPowerFlow
+	flow=industrialtest.api.mvPowerFlow
 })
 
 industrialtest.LapPack:register()
@@ -79,7 +79,7 @@ minetest.register_craft({
 	type="shaped",
 	output="industrialtest:lappack_v",
 	recipe={
-		{industrialtest.elementKeys.powerCarrier,"industrialtest:electronic_circuit",industrialtest.elementKeys.powerCarrier},
+		{industrialtest.elementKeys.powerCarrier,"industrialtest:advanced_electronic_circuit",industrialtest.elementKeys.powerCarrier},
 		{industrialtest.elementKeys.powerCarrier,"industrialtest:batpack_v",industrialtest.elementKeys.powerCarrier},
 		{industrialtest.elementKeys.powerCarrier,"",industrialtest.elementKeys.powerCarrier}
 	}

tools/jetpack.lua

@@ -92,15 +92,16 @@ industrialtest.internal.unpackTableInto(industrialtest.ElectricJetpack,{
 	modelImage="industrialtest_electric_jetpack.png",
 	flow=industrialtest.api.lvPowerFlow,
 	capacity=30000,
-	prepare=industrialtest.ElectricItem.prepare
+	prepare=industrialtest.ElectricItem.prepare,
+	_opPower=10
 })
 
 function industrialtest.ElectricJetpack.tryFly(self,itemstack)
 	local meta=itemstack:get_meta()
-	if meta:get_int("industrialtest.powerAmount")<10 then
+	if meta:get_int("industrialtest.powerAmount")<self._opPower then
 		return false
 	end
-	industrialtest.api.addPowerToItem(itemstack,-10)
+	industrialtest.api.addPowerToItem(itemstack,-self._opPower)
 	return true
 end
 

uu_matter_crafts.lua

@@ -121,7 +121,87 @@ minetest.register_craft({
 	}
 })
 
-if industrialtest.mclAvailable then
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.coal,
+	recipe={
+		{"industrialtest:uu_matter","",""},
+		{"","","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","",""}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.stoneWithIron,
+	recipe={
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"","industrialtest:uu_matter",""},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.diamond,
+	recipe={
+		{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output=industrialtest.elementKeys.stickyResin.." 32",
+	recipe={
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"","",""},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:tin_dust 4",
+	recipe={
+		{"","",""},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"","","industrialtest:uu_matter"}
+	}
+})
+
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:copper_dust 4",
+	recipe={
+		{"","","industrialtest:uu_matter"},
+		{"industrialtest:uu_matter","","industrialtest:uu_matter"},
+		{"","",""}
+	}
+})
+
+if industrialtest.mtgAvailable then
+	minetest.register_craft({
+		type="shaped",
+		output="industrialtest:iridium_lump",
+		recipe={
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+			{"","industrialtest:uu_matter",""},
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"}
+		}
+	})
+elseif industrialtest.mclAvailable then
+	minetest.register_craft({
+		type="shaped",
+		output="industrialtest:raw_iridium",
+		recipe={
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+			{"","industrialtest:uu_matter",""},
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"}
+		}
+	})
+
 	minetest.register_craft({
 		type="shaped",
 		output="mcl_core:vine 24",
@@ -141,4 +221,34 @@ if industrialtest.mclAvailable then
 			{"industrialtest:uu_matter",""}
 		}
 	})
+
+	minetest.register_craft({
+		type="shaped",
+		output=industrialtest.elementKeys.powerCarrier.." 10",
+		recipe={
+			{"","",""},
+			{"","industrialtest:uu_matter",""},
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"}
+		}
+	})
+
+	minetest.register_craft({
+		type="shaped",
+		output=industrialtest.elementKeys.blueDye,
+		recipe={
+			{"","industrialtest:uu_matter",""},
+			{"","industrialtest:uu_matter",""},
+			{"","industrialtest:uu_matter","industrialtest:uu_matter"}
+		}
+	})
+
+	minetest.register_craft({
+		type="shaped",
+		output="mcl_core:emerald 8",
+		recipe={
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+			{"industrialtest:uu_matter","industrialtest:uu_matter","industrialtest:uu_matter"},
+			{"","industrialtest:uu_matter",""}
+		}
+	})
 end