Release IndustrialTest 1.1.0 (stable, release)

Fixes #24

api.lua

@@ -514,6 +514,9 @@ end
 
 industrialtest.api.removeNodeFromNetwork=function(pos,nodePos)
 	local meta=minetest.get_meta(pos)
+	if not meta:contains("industrialtest.network") then
+		return
+	end
 	local network=minetest.deserialize(meta:get_string("industrialtest.network"))
 	local removed=false
 	for key,node in ipairs(network) do

compatibility.lua

@@ -202,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,
@@ -218,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,
@@ -270,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,
@@ -287,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,
@@ -304,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}
@@ -372,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",
@@ -529,7 +530,7 @@ if industrialtest.mclAvailable then
 	})
 	minetest.register_craft({
 		type="shaped",
-		output="industrialcraft:bronze_ingot 9",
+		output="industrialtest:bronze_ingot 9",
 		recipe={
 			{"mcl_copper:copper_ingot","mcl_copper:copper_ingot","mcl_copper:copper_ingot"},
 			{"mcl_copper:copper_ingot","industrialtest:tin_ingot","mcl_copper:copper_ingot"},
@@ -575,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

machines/canning_machine.lua

@@ -40,9 +40,7 @@ canningMachine.getFormspec=function(pos)
 		"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;upgrades]"
+		"listring[context;dst]"
 	}
 	return table.concat(formspec,"")
 end

machines/chargepad.lua

@@ -73,15 +73,15 @@ chargepad.getFormspec=function(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local 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 ""),
+		"listring[context;charged]",
+		"listring[context;discharged]"
 	}
 	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,"")
@@ -551,20 +553,18 @@ simpleElectricItemProcessor.getFormspec=function(pos)
 	local formspec={
 		"list[context;src;3.4,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(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]"
 		 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),
-		"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]",
 		industrialtest.internal.getItemSlotBg(6.4,2.8,1,1),
-		"listring[context;dst]",
 		"list[context;upgrades;9,0.9;1,4]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
-		"listring[context;upgrades]"
+		"listring[context;src]",
+		"listring[context;dst]"
 	}
 	return table.concat(formspec,"")
 end

machines/fluid_generator.lua

@@ -27,16 +27,15 @@ fluidGenerator.getFormspec=function(pos,config)
 	local formspec={
 		"list[context;src;2,1.8;1,1]",
 		industrialtest.internal.getItemSlotBg(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]"),
 		"list[context;dst;2,4.2;1,1]",
 		industrialtest.internal.getItemSlotBg(2,4.2,1,1),
-		"listring[context;dst]",
 		"list[context;charged;6,3;1,1]",
 		industrialtest.internal.getItemSlotBg(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 "")
+		(powerPercent>0 and "box[9,"..(1+4.8-(powerPercent*4.8))..";0.3,"..(powerPercent*4.8)..";#FF1010]" or ""),
+		"listring[context;src]",
+		"listring[context;dst]"
 	}
 	return table.concat(formspec,"")
 end

machines/generator.lua

@@ -24,14 +24,13 @@ generator.getFormspec=function(pos)
 	local formspec={
 		"list[context;charged;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]",
 		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]"
 	}
 	return table.concat(formspec,"")
 end

machines/induction_furnace.lua

@@ -58,9 +58,7 @@ inductionFurnace.getFormspec=function(pos)
 		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;upgrades]"
+		"listring[context;dst]"
     }
 	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

@@ -26,13 +26,12 @@ reactor.getFormspec=function(pos)
 	local formspec={
 		"list[context;fuel;1,1;"..size..","..size.."]",
 		industrialtest.internal.getItemSlotBg(1,1,size,size),
-		"listring[context;fuel]",
 		"list[context;charged;7,2.8;1,1]",
 		industrialtest.internal.getItemSlotBg(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 "")
+		(charged>0 and "box[9,"..(1+4.8-(charged*4.8))..";0.3,"..(charged*4.8)..";#FF1010]" or ""),
+		"listring[context;fuel]"
 	}
 	return table.concat(formspec,"")
 end

machines/power_storage.lua

@@ -22,15 +22,15 @@ powerStorage.getFormspec=function(pos)
 	local charged=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")
 	local 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 ""),
+		"listring[context;charged]",
+		"listring[context;discharged]"
 	}
 	return table.concat(formspec,"")
 end

machines/rotary_macerator.lua

@@ -45,10 +45,7 @@ rotaryMacerator.getFormspec=function(pos)
 		"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]"
+		"listring[context;dst]"
 	}
 	return table.concat(formspec,"")
 end

machines/solar_panel_generator.lua

@@ -23,9 +23,9 @@ solarPanel.getFormspec=function(pos)
 	local formspec={
 		"list[context;charged;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]"
 	}
 	return table.concat(formspec,"")
 end

machines/tool_workshop.lua

@@ -23,15 +23,13 @@ toolWorkshop.getFormspec=function(pos)
 	local formspec={
 		"list[context;powerStorage;3.7,3.7;1,1;0]",
 		industrialtest.internal.getItemSlotBg(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]",
 		industrialtest.internal.getItemSlotBg(5.9,3.2,1,1),
-		"listring[context;src]",
 		"list[context;upgrades;9,0.9;1,4]",
 		industrialtest.internal.getItemSlotBg(9,0.9,1,4),
-		"listring[context;upgrades]"
+		"listring[context;src]"
 	}
 	return table.concat(formspec,"")
 end

machines/transformer.lua

@@ -20,7 +20,7 @@ local transformer={}
 transformer.onPowerFlow=function(pos,side,amount)
 	local normalized=industrialtest.api.normalizeSide(pos,side)
 	local def=minetest.registered_nodes[minetest.get_node(pos).name]
-	if normalized~=5 and amount>=def._industrialtest_lowerFlow then
+	if normalized~=5 and amount>def._industrialtest_lowerFlow then
 		minetest.remove_node(pos)
 		industrialtest.internal.explode(pos,2)
 	end

machines/wind_mill.lua

@@ -23,9 +23,9 @@ windMill.getFormspec=function(pos)
 	local formspec={
 		"list[context;charged;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]"
 	}
 	return table.concat(formspec,"")
 end

tools/electric_chainsaw.lua

@@ -31,6 +31,10 @@ local function registerElectricChainsaw(config)
 	local definition={
 		description=config.displayName,
 		inventory_image="industrialtest_"..config.name..".png",
+		after_use=function(itemstack)
+			-- Hack to make sure that chainsaw won't be destroyed when has 0 EU
+			return nil
+		end,
 		_industrialtest_powerStorage=true,
 		_industrialtest_powerCapacity=10000,
 		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
@@ -70,10 +74,6 @@ local function registerElectricChainsaw(config)
 			end
 			return nil
 		end
-		definition.after_use=function(itemstack)
-			-- Hack to make sure that chainsaw won't be destroyed when has 0 EU in MCL
-			return nil
-		end
 		definition._mcl_diggroups={
 			axey={
 				speed=config.inactiveDigSpeed,

tools/electric_drill.lua

@@ -31,6 +31,10 @@ local function registerElectricDrill(config)
 	local definition={
 		description=config.displayName,
 		inventory_image="industrialtest_"..config.name..".png",
+		after_use=function()
+			-- Hack to make sure that drill won't be destroyed when has 0 EU
+			return nil
+		end,
 		_industrialtest_powerStorage=true,
 		_industrialtest_powerCapacity=10000,
 		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
@@ -64,10 +68,6 @@ local function registerElectricDrill(config)
 			tool=1,
 			dig_speed_class=config.digSpeedClass
 		}
-		definition.after_use=function()
-			-- Hack to make sure that drill won't be destroyed when has 0 EU in MCL
-			return nil
-		end
 		definition._mcl_diggroups={
 			pickaxey={
 				speed=config.inactiveDigSpeed,

tools/electric_saber.lua

@@ -31,6 +31,10 @@ local function registerElectricSaber(config)
 	local definition={
 		description=config.displayName,
 		inventory_image="industrialtest_"..config.name..".png",
+		after_use=function()
+			-- Hack to make sure that saber won't be destroyed when has 0 EU
+			return nil
+		end,
 		_industrialtest_powerStorage=true,
 		_industrialtest_powerCapacity=10000,
 		_industrialtest_powerFlow=industrialtest.api.lvPowerFlow,
@@ -62,10 +66,6 @@ local function registerElectricSaber(config)
 			max_drop_level=config.maxDropLevel,
 			damage_groups={fleshy=config.inactiveDamage}
 		}
-		definition.after_use=function()
-			-- Hack to make sure that saber won't be destroyed when has 0 EU in MCL
-			return nil
-		end
 		definition._mcl_toollike_wield=true
 		definition._mcl_diggroups={
 			swordy={