Merge 12758f32d4 into d5ff69d1d9

technic_worldgen/config.lua

@@ -6,6 +6,7 @@ local defaults = {
 	enable_granite_generation = "true",
 	enable_marble_generation = "true",
 	enable_rubber_tree_generation = "true",
+	enable_steel_override = "true",
 }
 
 for k, v in pairs(defaults) do

technic_worldgen/crafts.lua

@@ -50,11 +50,6 @@ minetest.register_craftitem(":technic:sulfur_lump", {
 
 minetest.register_alias("technic:wrought_iron_ingot", "default:steel_ingot")
 
-minetest.override_item("default:steel_ingot", {
-	description = S("Wrought Iron Ingot"),
-	inventory_image = "technic_wrought_iron_ingot.png",
-})
-
 minetest.register_craftitem(":technic:cast_iron_ingot", {
 	description = S("Cast Iron Ingot"),
 	inventory_image = "technic_cast_iron_ingot.png",
@@ -166,8 +161,14 @@ local function for_each_registered_item(action)
 	end
 end
 
-local steel_to_iron = {}
-for _, i in ipairs({
+if technic.config:get_bool("enable_steel_override") then
+	minetest.override_item("default:steel_ingot", {
+		description = S("Wrought Iron Ingot"),
+		inventory_image = "technic_wrought_iron_ingot.png",
+	})
+
+	local steel_to_iron = {}
+	for _, i in ipairs({
 		"default:axe_steel",
 		"default:pick_steel",
 		"default:shovel_steel",
@@ -180,13 +181,14 @@ for _, i in ipairs({
 		"mesecons_doors:op_door_steel",
 		"mesecons_doors:sig_door_steel",
 		"vessels:steel_bottle",
-}) do
+	}) do
 		steel_to_iron[i] = true
-end
+	end
 
-for_each_registered_item(function(item_name)
+	for_each_registered_item(function(item_name)
 		local item_def = minetest.registered_items[item_name]
 		if steel_to_iron[item_name] and string.find(item_def.description, "Steel") then
 			minetest.override_item(item_name, { description = string.gsub(item_def.description, "Steel", S("Iron")) })
 		end
-end)
+	end)
+end

technic_worldgen/nodes.lua

@@ -112,11 +112,6 @@ minetest.register_node(":technic:lead_block", {
 
 minetest.register_alias("technic:wrought_iron_block", "default:steelblock")
 
-minetest.override_item("default:steelblock", {
-	description = S("Wrought Iron Block"),
-	tiles = { "technic_wrought_iron_block.png" },
-})
-
 minetest.register_node(":technic:cast_iron_block", {
 	description = S("Cast Iron Block"),
 	tiles = { "technic_cast_iron_block.png" },
@@ -172,7 +167,13 @@ local function for_each_registered_node(action)
 	end
 end
 
-for_each_registered_node(function(node_name, node_def)
+if technic.config:get_bool("enable_steel_override") then
+	minetest.override_item("default:steelblock", {
+		description = S("Wrought Iron Block"),
+		tiles = { "technic_wrought_iron_block.png" },
+	})
+
+	for_each_registered_node(function(node_name, node_def)
 		if node_name ~= "default:steelblock" and
 				node_name:find("steelblock", 1, true) and
 				node_def.description:find("Steel", 1, true) then
@@ -200,5 +201,6 @@ for_each_registered_node(function(node_name, node_def)
 				})
 			end
 		end
-end)
+	end)
+end