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
-- [MineClone2](https://content.minetest.net/packages/Wuzzy/mineclone2/) and derivatives
+- [Minetest Game](https://content.luanti.org/packages/Minetest/minetest_game) 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)
-- [Pipeworks](https://content.minetest.net/packages/VanessaE/pipeworks)
-- [Logistica](https://content.minetest.net/packages/ZenonSeth/logistica)
-- [Mesecons](https://content.minetest.net/packages/Jeija/mesecons)
+- [Rubber Addon for MineClone](https://content.luanti.org/packages/biochemist/mcl_rubber)
+- [Pipeworks](https://content.luanti.org/packages/VanessaE/pipeworks)
+- [Logistica](https://content.luanti.org/packages/ZenonSeth/logistica)
+- [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

@@ -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"

guide.lua

@@ -66,14 +66,15 @@ local function createMachineInformationTable(fields,machineName,num)
 	local fieldLabels={
 		inputVoltage="Input voltage level",
 		outputVoltage="Output voltage level",
-		voltage="Voltage",
-		lowVoltage="Low voltage",
-		highVoltage="High voltage",
+		voltage="Voltage level",
+		lowVoltage="Low voltage level",
+		highVoltage="High voltage level",
 		damageRed="Damage reduction",
 		recipe="Recipe type",
 		powerCapacity="Power capacity",
 		opPower="Power per operation",
 		powerPerFuel="Power per fuel unit",
+		uses="Uses",
 		efficiency="Default efficiency"
 	}
 
@@ -86,7 +87,7 @@ local function createMachineInformationTable(fields,machineName,num)
 		})
 	end
 
-	return createTable(rows,false,string.format("Figure %d. Machine information for %s",(num or 1),machineName))
+	return createTable(rows,false,S("Figure @1. Information for @2",(num or 1),machineName))
 end
 
 local pages={
@@ -206,7 +207,7 @@ local pages={
 			[[
 				<big>||Canning Machine||</big>
 				<left>
-					||Canning Machine is used to move certain fluid from one item to another. The common usage is to refill fuel in <item name="industrialtest:jetpack_v" height="{{ITEM_HEIGHT}}">  <b>Jetpack</b> or <item name="industrialtest:fuel_can" height="{{ITEM_HEIGHT}}"> <b>Fuel Can</b>.||
+					||Canning Machine is used to move certain fluid from one item to another. The common usage is to refill fuel in <item name="industrialtest:jetpack_v" height="{{ITEM_HEIGHT}}"> <b>Jetpack</b> or <item name="industrialtest:fuel_can" height="{{ITEM_HEIGHT}}"> <b>Fuel Can</b>.||
 				</left>
 			]],
 			createMachineInformationTable({
@@ -1800,13 +1801,102 @@ local pages={
 				<left>||Picture 1. <item name="industrialtest:od_scanner" height="{{ITEM_HEIGHT}}"> <b>OD Scanner</b> detecting some ores.||</left>
 			]]
 		}
+	},
+
+	{
+		name="solarHelmet",
+		title=S("Solar Helmet"),
+		icon="industrialtest:solar_helmet",
+		content={
+			[[
+				<big>||Solar Helmet||</big>
+				<left>
+					||Solar Helmet consists of <item name="{{elementKeyIronHelmet}}" height="{{ITEM_HEIGHT}}"> <b>Iron Helmet</b> with <item name="industrialtest:solar_panel" height="{{ITEM_HEIGHT}}"> <b>Solar Panel</b> attached to the top of it. It is capable of charging electric gear equipped as armor while exposed to light. However it is less efficent than regular solar panels.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="efficiency",
+					value="0.5"
+				}
+			},S("Solar Panel"))
+		}
+	},
+
+	{
+		name="staticBoots",
+		title=S("Static Boots"),
+		icon="industrialtest:static_boots",
+		content={
+			[[
+				<big>||Static Boots||</big>
+				<left>
+					||Static Boots are <item name="{{elementKeyIronBoots}}" height="{{ITEM_HEIGHT}}"> <b>Iron Boots</b> with <item name="industrialtest:insulated_copper_cable" height="{{ITEM_HEIGHT}}"> <b>Insulated Copper Cable</b> attached to the bottom. They are capable of charging electric gear equipped as armor by using static electricity which is produced while player is walking.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="Nodes per EU",
+					value="5"
+				}
+			},S("Static Boots"))
+		}
+	},
+
+	{
+		name="treetap",
+		title=S("Treetap"),
+		icon=industrialtest.elementKeys.treetap,
+		content={
+			[[
+				<big>||Treetap||</big>
+				<left>
+					||Treetap is used to extract <item name="{{elementKeyStickyResin}}" height="{{ITEM_HEIGHT}}"> <b>Sticky Resin</b> from <item name="{{elementKeyRubberWood}}" height="{{ITEM_HEIGHT}}"> <b>Rubber Wood</b>.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="uses",
+					value=tostring(industrialtest.Treetap.uses)
+				}
+			},S("Treetap"))
+		}
+	},
+
+	{
+		name="wrench",
+		title=S("Wrench"),
+		icon="industrialtest:wrench",
+		content={
+			[[
+				<big>||Wrench||</big>
+				<left>
+					||Wrench is one of the most important tools in this mod. It is used to safely remove machines with no material loss. In many cases when machine is removed without Wrench it drops <item name="industrialtest:machine_block" height="{{ITEM_HEIGHT}}"> <b>Machine Block</b> instead.||
+				</left>
+			]],
+			createMachineInformationTable({
+				{
+					name="uses",
+					value=tostring(industrialtest.Wrench.uses)
+				}
+			},S("Wrench"))
+		}
 	}
 }
 
 local function preprocessHypertext(content,vars)
 	-- Find and replace strings which should be translated, this pattern matches any string that doesn't include | which is contained within || at both ends
 	content=string.gsub(content,"||([^|]+)||",function(sourceString)
-		return S(sourceString)
+		-- Replace all sequences which should be treated as variables inside translation with format string
+		local trFormatIndex=1
+		local trFormatValues={}
+		sourceString=string.gsub(sourceString,"{{([^{}]+)}}",function(var)
+			local result=string.format("@%d",trFormatIndex)
+			trFormatIndex=trFormatIndex+1
+			table.insert(trFormatValues,vars[var] or "nil")
+			return result
+		end)
+		return S(sourceString,unpack(trFormatValues))
 	end)
 
 	-- Replace all sequences which should be treated as variables with values provided in vars
@@ -1849,9 +1939,12 @@ local function getGuideFormspec(playerName,pageName)
 				elementKeyBucket=industrialtest.elementKeys.bucket,
 				elementKeyCoal=industrialtest.elementKeys.coal,
 				elementKeyCopperIngot=industrialtest.elementKeys.copperIngot,
+				elementKeyIronBoots=industrialtest.elementKeys.ironBoots,
+				elementKeyIronHelmet=industrialtest.elementKeys.ironHelmet,
 				elementKeyIronIngot=industrialtest.elementKeys.ironIngot,
 				elementKeyIronLump=industrialtest.elementKeys.ironLump,
 				elementKeyIronPickaxe=industrialtest.elementKeys.ironPickaxe,
+				elementKeyStickyResin=industrialtest.elementKeys.stickyResin,
 				elementKeyRubber=industrialtest.elementKeys.rubber,
 				elementKeyRubberWood=industrialtest.elementKeys.rubberWood
 			})

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