Fix indentation in machines/induction_furnace.lua

(whoops! thought it was lead!)

api.lua

@@ -32,15 +32,6 @@ industrialtest.api.hvPowerFlow=10200
 industrialtest.api.evPowerFlow=40800
 industrialtest.api.ivPowerFlow=163800
 
-industrialtest.api.craftingMethods={
-	macerating="industrialtest.macerating",
-	compressing="industrialtest.compressing",
-	extracting="industrialtest.extracting",
-	recycling="industrialtest.recycling",
-	cableForming="industrialtest.cable_forming",
-	massFabricating="industrialtest.mass_fabricating",
-}
-
 industrialtest.internal.clamp=function(num,min,max)
 	return math.max(math.min(num,max),min)
 end
@@ -681,7 +672,6 @@ 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
@@ -759,16 +749,6 @@ industrialtest.api.registerMaceratorRecipe=function(config)
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
-
-	if mcl_craftguide ~= nil then
-		mcl_craftguide.register_craft({
-			type = industrialtest.api.craftingMethods.macerating,
-			width = 1,
-			output = definition.output,
-			items = {definition.recipe}
-		})
-	end
-
 	industrialtest.api.maceratorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
@@ -787,16 +767,6 @@ industrialtest.api.registerCompressorRecipe=function(config)
 		time=config.time or 2,
 		count=config.count or 1
 	}
-
-	if mcl_craftguide ~= nil then
-		mcl_craftguide.register_craft({
-			type = industrialtest.api.craftingMethods.compressing,
-			width = 1,
-			output = definition.output,
-			items = {definition.recipe}
-		})
-	end
-
 	industrialtest.api.compressorRecipes[definition.recipe]=definition
 end
 -- \brief Returns macerator recipe result
@@ -811,16 +781,6 @@ industrialtest.api.registerExtractorRecipe=function(config)
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
-
-	if mcl_craftguide ~= nil then
-		mcl_craftguide.register_craft({
-			type = industrialtest.api.craftingMethods.extracting,
-			width = 1,
-			output = definition.output,
-			items = {definition.recipe}
-		})
-	end
-
 	industrialtest.api.extractorRecipes[definition.recipe]=definition
 end
 industrialtest.api.getExtractorRecipeResult=function(recipe)
@@ -833,16 +793,6 @@ industrialtest.api.registerCableFormerRecipe=function(config)
 		recipe=config.recipe or "",
 		time=config.time or 2
 	}
-
-	if mcl_craftguide ~= nil then
-		mcl_craftguide.register_craft({
-			type = industrialtest.api.craftingMethods.cableForming,
-			width = 1,
-			output = definition.output,
-			items = {definition.recipe}
-		})
-	end
-
 	industrialtest.api.cableFormerRecipes[definition.recipe]=definition
 end
 

compatibility.lua

@@ -610,32 +610,6 @@ if industrialtest.mclAvailable then
 		y_max=mcl_worlds.layer_to_y(16),
 		y_min=mcl_vars.mg_overworld_min
 	})
-
-	mcl_craftguide.register_craft_type("industrialtest.macerating", {
-		description = S("Macerating"),
-		icon = "industrialtest_machine_block.png^industrialtest_macerator_front_active.png"
-	})
-	mcl_craftguide.register_craft_type("industrialtest.compressing", {
-		description = S("Compressing"),
-		icon = "industrialtest_machine_block.png^industrialtest_compressor_front_active.png"
-	})
-	mcl_craftguide.register_craft_type("industrialtest.extracting", {
-		description = S("Extracting"),
-		icon = "industrialtest_machine_block.png^industrialtest_extractor_front_active.png"
-	})
-	mcl_craftguide.register_craft_type("industrialtest.recycling", {
-		description = S("Recycling"),
-		icon = "industrialtest_machine_block.png^industrialtest_recycler_top_active.png"
-	})
-	mcl_craftguide.register_craft_type("industrialtest.cable_forming", {
-		description = S("Cable Forming"),
-		icon = "industrialtest_machine_block.png^industrialtest_cable_former_front_active.png"
-	})
-	mcl_craftguide.register_craft_type("industrialtest.mass_fabricating", {
-		description = S("Mass Fabricating"),
-		icon = "industrialtest_machine_block.png^industrialtest_mass_fabricator_front_active.png"
-	})
-
 elseif industrialtest.mtgAvailable then
 	industrialtest.internal.explode=function(pos,radius)
 		tnt.boom(pos,{radius=radius})

craftitems.lua

@@ -15,23 +15,6 @@
 -- 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",
-}
 
 -- Power storage items
 minetest.register_tool("industrialtest:re_battery",{
@@ -214,13 +197,13 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("coal","Coal",resources,colors.coal,true)
+industrialtest.api.registerResourceDust("coal","Coal",resources,"#262523ff",true)
 industrialtest.api.registerResourceDust("clay","Clay",{
 	{
 		resource=industrialtest.elementKeys.clayBlock,
 		count=2
 	}
-},colors.clay,true)
+},"#707070ff",true)
 resources={
 	{
 		resource=industrialtest.elementKeys.diamondBlock,
@@ -238,7 +221,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("diamond","Diamond",resources,colors.diamond,true)
+industrialtest.api.registerResourceDust("diamond","Diamond",resources,"#77cefbff",true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.diamond,
@@ -265,7 +248,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("iron","Iron",resources,colors.iron,true)
+industrialtest.api.registerResourceDust("iron","Iron",resources,"#afaca5ff",true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.ironIngot,
@@ -286,9 +269,9 @@ if industrialtest.mclAvailable then
 			count=9
 		},
 		{resource="mcl_core:lapis_lazuli"}
-	},colors.lapis_lazuli,true)
+	},"#3a4cceff",true)
 end
-industrialtest.api.registerResourceDust("obsidian","Obsidian",{{resource=industrialtest.elementKeys.obsidian}},colors.obsidian,true)
+industrialtest.api.registerResourceDust("obsidian","Obsidian",{{resource=industrialtest.elementKeys.obsidian}},"#292843ff",true)
 resources={
 	{
 		resource=industrialtest.elementKeys.goldBlock,
@@ -310,7 +293,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("gold","Gold",resources,colors.gold,true)
+industrialtest.api.registerResourceDust("gold","Gold",resources,"#eac162ff",true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.goldIngot,
@@ -337,7 +320,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("copper","Copper",resources,colors.copper,true)
+industrialtest.api.registerResourceDust("copper","Copper",resources,"#bf644aff",true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.copperIngot,
@@ -364,7 +347,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("tin","Tin",resources,colors.tin,true)
+industrialtest.api.registerResourceDust("tin","Tin",resources,"#ebd182ff",true)
 minetest.register_craft({
 	type="cooking",
 	output=industrialtest.elementKeys.tinIngot,
@@ -391,7 +374,7 @@ if industrialtest.mclAvailable then
 		count=2
 	})
 end
-industrialtest.api.registerResourceDust("uranium","Uranium",resources,colors.uranium,true)
+industrialtest.api.registerResourceDust("uranium","Uranium",resources,"#3b8c09ff",true)
 minetest.register_craft({
 	type="cooking",
 	output="industrialtest:uranium_ingot",
@@ -408,7 +391,7 @@ if industrialtest.mtgAvailable then
 			count=2
 		},
 		{resource="default:mese_crystal"}
-	},colors.mese,true)
+	},"#909000ff",true)
 	minetest.register_craft({
 		type="cooking",
 		output="default:mese_crystal",
@@ -421,7 +404,7 @@ industrialtest.api.registerResourceDust("bronze","Bronze",{
 		count=9
 	},
 	{resource=industrialtest.elementKeys.bronzeIngot}
-},colors.bronze,true)
+},"#be4325ff",true)
 minetest.register_craft({
 	type="shaped",
 	output="industrialtest:bronze_dust 9",
@@ -448,7 +431,7 @@ industrialtest.api.registerRotaryMaceratorModifier({
 	output="industrialtest:bronze_dust",
 	uses=4
 })
-industrialtest.api.registerResourceDust("sulfur","Sulfur",{},colors.sulfur,false)
+industrialtest.api.registerResourceDust("sulfur","Sulfur",{},"#b88805ff",false)
 industrialtest.api.registerExtractorRecipe({
 	output="industrialtest:sulfur_dust",
 	recipe=industrialtest.elementKeys.gunpowder
@@ -467,7 +450,7 @@ industrialtest.api.registerResourceDust("lead","Lead",{
 		count=2
 	},
 	{resource="industrialtest:lead_ingot"}
-},colors.lead,true)
+},"#6d6393ff",true)
 minetest.register_craft({
 	type="cooking",
 	output="industrialtest:lead_ingot",
@@ -478,7 +461,7 @@ industrialtest.api.registerResourceDust("refined_iron","Refined Iron",{
 		resource="industrialtest:refined_iron_ingot",
 		count=1
 	}
-},colors.refined_iron,true)
+},"#94bab9ff",true)
 industrialtest.api.registerRotaryMaceratorModifier({
 	name=industrialtest.elementKeys.ironLump,
 	modifier=industrialtest.elementKeys.coal,
@@ -541,14 +524,14 @@ industrialtest.api.registerPlate("bronze_plate",S("Bronze Plate"),{
 		resource=industrialtest.elementKeys.bronzeIngot,
 		count=1
 	}
-},colors.bronze,true)
+},"#e48e88ff",true)
 
 industrialtest.api.registerPlate("copper_plate",S("Copper Plate"),{
 	{
 		resource=industrialtest.elementKeys.copperIngot,
 		count=1
 	}
-},colors.copper,true)
+},"#f48e44ff",true)
 
 industrialtest.api.registerPlate("advanced_alloy",S("Advanced Alloy"),{
 	{
@@ -569,14 +552,14 @@ industrialtest.api.registerPlate("tin_plate",S("Tin Plate"),{
 		resource=industrialtest.elementKeys.tinIngot,
 		count=1
 	}
-},colors.tin,true)
+},"#e0e0e0ff",true)
 
 industrialtest.api.registerPlate("lead_plate",S("Lead Plate"),{
 	{
 		resource="industrialtest:lead_ingot",
 		count=1
 	}
-},colors.lead,true)
+},"#eafef8ff",true)
 
 industrialtest.api.registerPlate("iridium_plate",S("Iridium Plate"),{},false,"#ffffffff")
 minetest.register_craft({

machines/cable_former.lua

@@ -24,7 +24,7 @@ industrialtest.internal.registerSimpleElectricItemProcessor({
 	capacity=1400,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=80,
-	method=industrialtest.api.craftingMethods.cableForming,
+	method="industrialtest.cable_forming",
 	efficiency=1
 })
 minetest.register_craft({

machines/common.lua

@@ -453,7 +453,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=after.items[1]
 		}
-	elseif method==industrialtest.api.craftingMethods.macerating then
+	elseif method=="industrialtest.macerating" then
 		local output=industrialtest.api.getMaceratorRecipeResult(item:get_name())
 		if not output then
 			return {
@@ -469,7 +469,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method==industrialtest.api.craftingMethods.compressing then
+	elseif method=="industrialtest.compressing" then
 		local output=industrialtest.api.getCompressorRecipeResult(item:get_name())
 		if not output or item:get_count()<output.count then
 			return {
@@ -485,7 +485,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method==industrialtest.api.craftingMethods.extracting then
+	elseif method=="industrialtest.extracting" then
 		local output=industrialtest.api.getExtractorRecipeResult(item:get_name())
 		if not output then
 			return {
@@ -501,7 +501,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method==industrialtest.api.craftingMethods.recycling then
+	elseif method=="industrialtest.recycling" then
 		local srcAfter=ItemStack(item:get_name())
 		srcAfter:set_count(item:get_count()-1)
 		return {
@@ -509,7 +509,7 @@ local function craftResultProxy(method,item)
 			time=2,
 			src=srcAfter
 		}
-	elseif method==industrialtest.api.craftingMethods.cableForming then
+	elseif method=="industrialtest.cable_forming" then
 		local output=industrialtest.api.getCableFormerRecipeResult(item:get_name())
 		if not output then
 			return {
@@ -525,7 +525,7 @@ local function craftResultProxy(method,item)
 			time=output.time,
 			src=srcAfter
 		}
-	elseif method==industrialtest.api.craftingMethods.massFabricating then
+	elseif method=="industrialtest.mass_fabricating" then
 		if item:get_count()<34 then
 			return {
 				item=ItemStack(),

machines/compressor.lua

@@ -24,7 +24,7 @@ industrialtest.internal.registerSimpleElectricItemProcessor({
 	capacity=1400,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=120,
-	method=industrialtest.api.craftingMethods.compressing,
+	method="industrialtest.compressing",
 	efficiency=1
 })
 minetest.register_craft({

machines/macerator.lua

@@ -24,7 +24,7 @@ industrialtest.internal.registerSimpleElectricItemProcessor({
 	capacity=1200,
 	flow=industrialtest.api.lvPowerFlow,
 	opPower=100,
-	method=industrialtest.api.craftingMethods.macerating,
+	method="industrialtest.macerating",
 	efficiency=1
 })
 minetest.register_craft({