api.lua

@@ -672,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

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/common.lua

@@ -357,29 +357,9 @@ function industrialtest.internal.registerMachine(config)
 		if config.sounds=="metal" then
 			definition.sounds=mcl_sounds.node_sound_metal_defaults()
 		end
-		definition.groups={
-			pickaxey=1,
-			container=2
-		}
+		definition.groups={pickaxey=1}
 		definition._mcl_blast_resistance=3.5
 		definition._mcl_hardness=3.9
-		definition._mcl_hoppers_on_try_pull=function(pos, hop_pos, hop_inv, hop_list)
-			local meta = minetest.get_meta(pos)
-			local inv = meta:get_inventory()
-			local stack = inv:get_stack("dst", 1)
-			if not stack:is_empty() and hop_inv:room_for_item(hop_list, stack) then
-				return inv, "dst", 1
-			end
-			return nil, nil, nil
-		end
-		definition._mcl_hoppers_on_try_push=function(pos, hop_pos, hop_inv, hop_list)
-			local meta = minetest.get_meta(pos)
-			local inv = meta:get_inventory()
-			return inv, "src", mcl_util.select_stack(hop_inv, hop_list, inv, "src")
-		end
-		definition._mcl_hoppers_on_after_push=function(pos)
-			minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-		end
 	end
 	definition.groups._industrialtest_wrenchUnmountable=1
 	if config.requiresWrench then

machines/iron_furnace.lua

@@ -293,21 +293,12 @@ if industrialtest.mtgAvailable then
 		return not (inv:get_list("src")[1]:get_count()>0 or inv:get_list("fuel")[1]:get_count()>0 or inv:get_list("dst")[1]:get_count()>0)
 	end
 elseif industrialtest.mclAvailable then
-	definition.groups={
-		pickaxey=1,
-		container=2
-	}
 	definition.after_dig_node=function(pos,oldnode,oldmeta)
 		industrialtest.internal.mclAfterDigNode(pos,oldmeta,{"src","fuel","dst"})
 	end
 	definition.sounds=mcl_sounds.node_sound_metal_defaults()
 	definition._mcl_blast_resistance=3
 	definition._mcl_hardness=3.5
-	definition._mcl_hoppers_on_try_pull = mcl_furnaces.hoppers_on_try_pull
-	definition._mcl_hoppers_on_try_push = mcl_furnaces.hoppers_on_try_push
-	definition._mcl_hoppers_on_after_push = function(pos)
-		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
-	end
 end
 minetest.register_node("industrialtest:iron_furnace",definition)
 definition=table.copy(definition)
@@ -326,9 +317,7 @@ definition.drop="industrialtest:iron_furnace"
 definition.on_timer=ironFurnace.activeOnTimer
 if industrialtest.mclAvailable then
 	definition.groups={
-		not_in_creative_inventory=1,
-		pickaxey=1,
-		container=2
+		not_in_creative_inventory=1
 	}
 	definition._doc_items_create_entry=false
 end