Improve glass
[oweals/minetest.git] / src / content_mapnode.cpp
index fb649afbd9d1926cc0d50310424f7d4003ec90bf..e2cf57010fb2637097100ff68275fe16e336fcb6 100644 (file)
@@ -17,14 +17,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-// For g_settings
-#include "main.h"
-
 #include "content_mapnode.h"
+
+#include "irrlichttypes.h"
 #include "mapnode.h"
 #include "content_nodemeta.h"
-#include "settings.h"
-#include "mapnode_contentfeatures.h"
+#include "nodedef.h"
+#include "utility.h"
 
 #define WATER_ALPHA 160
 
@@ -49,7 +48,7 @@ void setStoneLikeMaterialProperties(MaterialProperties &mprop, float toughness)
 void setDirtLikeMaterialProperties(MaterialProperties &mprop, float toughness)
 {
        mprop.diggability = DIGGABLE_NORMAL;
-       mprop.weight = toughness * 2.0;
+       mprop.weight = toughness * 1.2;
        mprop.crackiness = 0;
        mprop.crumbliness = 1.2;
        mprop.cuttability = -0.4;
@@ -59,7 +58,7 @@ void setGravelLikeMaterialProperties(MaterialProperties &mprop, float toughness)
 {
        mprop.diggability = DIGGABLE_NORMAL;
        mprop.weight = toughness * 2.0;
-       mprop.crackiness = 0.5;
+       mprop.crackiness = 0.2;
        mprop.crumbliness = 1.5;
        mprop.cuttability = -1.0;
 }
@@ -68,9 +67,9 @@ void setWoodLikeMaterialProperties(MaterialProperties &mprop, float toughness)
 {
        mprop.diggability = DIGGABLE_NORMAL;
        mprop.weight = toughness * 1.0;
-       mprop.crackiness = 2.0;
+       mprop.crackiness = 0.75;
        mprop.crumbliness = -1.0;
-       mprop.cuttability = 2.0;
+       mprop.cuttability = 1.5;
 }
 
 void setLeavesLikeMaterialProperties(MaterialProperties &mprop, float toughness)
@@ -85,7 +84,7 @@ void setLeavesLikeMaterialProperties(MaterialProperties &mprop, float toughness)
 void setGlassLikeMaterialProperties(MaterialProperties &mprop, float toughness)
 {
        mprop.diggability = DIGGABLE_NORMAL;
-       mprop.weight = 0.5 * toughness;
+       mprop.weight = 0.1 * toughness;
        mprop.crackiness = 2.0;
        mprop.crumbliness = -1.0;
        mprop.cuttability = -1.0;
@@ -156,28 +155,13 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version)
 }
 
 // See header for description
-void content_mapnode_init()
+void content_mapnode_init(IWritableNodeDefManager *nodemgr)
 {
-       if(g_texturesource == NULL)
-               dstream<<"INFO: Initial run of content_mapnode_init with "
-                               "g_texturesource=NULL. If this segfaults, "
-                               "there is a bug with something not checking for "
-                               "the NULL value."<<std::endl;
-       else
-               dstream<<"INFO: Full run of content_mapnode_init with "
-                               "g_texturesource!=NULL"<<std::endl;
-
-       // Read some settings
-       bool new_style_water = g_settings->getBool("new_style_water");
-       bool new_style_leaves = g_settings->getBool("new_style_leaves");
-       bool invisible_stone = g_settings->getBool("invisible_stone");
-       bool opaque_water = g_settings->getBool("opaque_water");
-
        content_t i;
        ContentFeatures *f = NULL;
 
        i = CONTENT_STONE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("stone.png");
        f->setInventoryTextureCube("stone.png", "stone.png", "stone.png");
        f->param_type = CPT_MINERAL;
@@ -185,11 +169,9 @@ void content_mapnode_init()
        f->often_contains_mineral = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 1";
        setStoneLikeMaterialProperties(f->material, 1.0);
-       if(invisible_stone)
-               f->solidness = 0; // For debugging, hides regular stone
        
        i = CONTENT_GRASS;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("mud.png^grass_side.png");
        f->setTexture(0, "grass.png");
        f->setTexture(1, "mud.png");
@@ -199,7 +181,7 @@ void content_mapnode_init()
        setDirtLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_GRASS_FOOTSTEPS;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("mud.png^grass_side.png");
        f->setTexture(0, "grass_footsteps.png");
        f->setTexture(1, "mud.png");
@@ -209,7 +191,7 @@ void content_mapnode_init()
        setDirtLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_MUD;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("mud.png");
        f->setInventoryTextureCube("mud.png", "mud.png", "mud.png");
        f->param_type = CPT_MINERAL;
@@ -218,7 +200,7 @@ void content_mapnode_init()
        setDirtLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_SAND;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("sand.png");
        f->setInventoryTextureCube("sand.png", "sand.png", "sand.png");
        f->param_type = CPT_MINERAL;
@@ -227,7 +209,7 @@ void content_mapnode_init()
        setDirtLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_GRAVEL;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("gravel.png");
        f->setInventoryTextureCube("gravel.png", "gravel.png", "gravel.png");
        f->param_type = CPT_MINERAL;
@@ -236,7 +218,7 @@ void content_mapnode_init()
        setGravelLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_SANDSTONE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("sandstone.png");
        f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
        f->param_type = CPT_MINERAL;
@@ -245,7 +227,7 @@ void content_mapnode_init()
        setDirtLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_CLAY;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("clay.png");
        f->setInventoryTextureCube("clay.png", "clay.png", "clay.png");
        f->param_type = CPT_MINERAL;
@@ -254,7 +236,7 @@ void content_mapnode_init()
        setDirtLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_BRICK;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("brick.png");
        f->setInventoryTextureCube("brick.png", "brick.png", "brick.png");
        f->param_type = CPT_MINERAL;
@@ -263,7 +245,7 @@ void content_mapnode_init()
        setStoneLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_TREE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("tree.png");
        f->setTexture(0, "tree_top.png");
        f->setTexture(1, "tree_top.png");
@@ -273,52 +255,41 @@ void content_mapnode_init()
        setWoodLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_JUNGLETREE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("jungletree.png");
        f->setTexture(0, "jungletree_top.png");
        f->setTexture(1, "jungletree_top.png");
        f->param_type = CPT_MINERAL;
-       //f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_JUNGLEGRASS;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_PLANTLIKE;
+       f->visual_scale = 1.3;
+       f->setAllTextures("junglegrass.png");
        f->setInventoryTexture("junglegrass.png");
-       f->used_texturenames["junglegrass.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
-       //f->is_ground_content = true;
        f->air_equivalent = false; // grass grows underneath
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-       f->solidness = 0; // drawn separately, makes no faces
        f->walkable = false;
        setLeavesLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_LEAVES;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_ALLFACES_OPTIONAL;
+       f->setAllTextures("leaves.png");
+       //f->setAllTextures("[noalpha:leaves.png");
        f->light_propagates = true;
-       //f->param_type = CPT_MINERAL;
        f->param_type = CPT_LIGHT;
-       //f->is_ground_content = true;
-       if(new_style_leaves)
-       {
-               f->solidness = 0; // drawn separately, makes no faces
-               f->visual_solidness = 1;
-               f->setAllTextures("leaves.png");
-               f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png");
-       }
-       else
-       {
-               f->setAllTextures("[noalpha:leaves.png");
-       }
        f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
        f->extra_dug_item_rarity = 20;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setLeavesLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_CACTUS;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("cactus_side.png");
        f->setTexture(0, "cactus_top.png");
        f->setTexture(1, "cactus_top.png");
@@ -329,19 +300,19 @@ void content_mapnode_init()
        setWoodLikeMaterialProperties(f->material, 0.75);
 
        i = CONTENT_PAPYRUS;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_PLANTLIKE;
+       f->setAllTextures("papyrus.png");
        f->setInventoryTexture("papyrus.png");
-       f->used_texturenames["papyrus.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-       f->solidness = 0; // drawn separately, makes no faces
        f->walkable = false;
        setLeavesLikeMaterialProperties(f->material, 0.5);
 
        i = CONTENT_BOOKSHELF;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("bookshelf.png");
        f->setTexture(0, "wood.png");
        f->setTexture(1, "wood.png");
@@ -353,54 +324,59 @@ void content_mapnode_init()
        setWoodLikeMaterialProperties(f->material, 0.75);
 
        i = CONTENT_GLASS;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_GLASSLIKE;
+       f->setAllTextures("glass.png");
        f->light_propagates = true;
        f->sunlight_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-       f->solidness = 0; // drawn separately, makes no faces
-       f->visual_solidness = 1;
-       f->setAllTextures("glass.png");
        f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
        setGlassLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_FENCE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_FENCELIKE;
+       f->setInventoryTexture("fence.png");
+       f->setTexture(0, "wood.png");
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-       f->solidness = 0; // drawn separately, makes no faces
        f->air_equivalent = true; // grass grows underneath
-       f->setInventoryTexture("fence.png");
-       f->used_texturenames["fence.png"] = true;
+       f->selection_box.type = NODEBOX_FIXED;
+       f->selection_box.fixed = core::aabbox3d<f32>(
+                       -BS/7, -BS/2, -BS/7, BS/7, BS/2, BS/7);
        setWoodLikeMaterialProperties(f->material, 0.75);
 
        i = CONTENT_RAIL;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_RAILLIKE;
        f->setInventoryTexture("rail.png");
-       f->used_texturenames["rail.png"] = true;
+       f->setTexture(0, "rail.png");
+       f->setTexture(1, "rail_curved.png");
+       f->setTexture(2, "rail_t_junction.png");
+       f->setTexture(3, "rail_crossing.png");
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-       f->solidness = 0; // drawn separately, makes no faces
        f->air_equivalent = true; // grass grows underneath
        f->walkable = false;
        f->selection_box.type = NODEBOX_FIXED;
        setDirtLikeMaterialProperties(f->material, 0.75);
 
        i = CONTENT_LADDER;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_SIGNLIKE;
+       f->setAllTextures("ladder.png");
        f->setInventoryTexture("ladder.png");
-       f->used_texturenames["ladder.png"] = true;
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
        f->wall_mounted = true;
-       f->solidness = 0;
        f->air_equivalent = true;
        f->walkable = false;
        f->climbable = true;
@@ -409,13 +385,13 @@ void content_mapnode_init()
 
        // Deprecated
        i = CONTENT_COALSTONE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("stone.png^mineral_coal.png");
        f->is_ground_content = true;
        setStoneLikeMaterialProperties(f->material, 1.5);
        
        i = CONTENT_WOOD;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("wood.png");
        f->setInventoryTextureCube("wood.png", "wood.png", "wood.png");
        f->is_ground_content = true;
@@ -423,7 +399,7 @@ void content_mapnode_init()
        setWoodLikeMaterialProperties(f->material, 0.75);
        
        i = CONTENT_MESE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("mese.png");
        f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
        f->is_ground_content = true;
@@ -431,18 +407,17 @@ void content_mapnode_init()
        setStoneLikeMaterialProperties(f->material, 0.5);
        
        i = CONTENT_CLOUD;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("cloud.png");
        f->setInventoryTextureCube("cloud.png", "cloud.png", "cloud.png");
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        
        i = CONTENT_AIR;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
-       f->solidness = 0;
        f->walkable = false;
        f->pointable = false;
        f->diggable = false;
@@ -450,12 +425,12 @@ void content_mapnode_init()
        f->air_equivalent = true;
        
        i = CONTENT_WATER;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_FLOWINGLIQUID;
+       f->setAllTextures("water.png", WATER_ALPHA);
        f->setInventoryTextureCube("water.png", "water.png", "water.png");
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
-       f->solidness = 0; // Drawn separately, makes no faces
-       f->visual_solidness = 1;
        f->walkable = false;
        f->pointable = false;
        f->diggable = false;
@@ -464,57 +439,19 @@ void content_mapnode_init()
        f->liquid_alternative_flowing = CONTENT_WATER;
        f->liquid_alternative_source = CONTENT_WATERSOURCE;
        f->liquid_viscosity = WATER_VISC;
-#ifndef SERVER
-       if(!opaque_water)
-               f->vertex_alpha = WATER_ALPHA;
        f->post_effect_color = video::SColor(64, 100, 100, 200);
-       if(f->special_material == NULL && g_texturesource)
-       {
-               // Flowing water material
-               f->special_material = new video::SMaterial;
-               f->special_material->setFlag(video::EMF_LIGHTING, false);
-               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
-               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
-               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
-               if(!opaque_water)
-                       f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
-               AtlasPointer *pa_water1 = new AtlasPointer(g_texturesource->getTexture(
-                               g_texturesource->getTextureId("water.png")));
-               f->special_material->setTexture(0, pa_water1->atlas);
-
-               // Flowing water material, backface culled
-               f->special_material2 = new video::SMaterial;
-               *f->special_material2 = *f->special_material;
-               f->special_material2->setFlag(video::EMF_BACK_FACE_CULLING, true);
-               
-               f->special_atlas = pa_water1;
-       }
-#endif
-       
+       // Flowing water material
+       f->mspec_special[0].tname = "water.png";
+       f->mspec_special[0].backface_culling = false;
+       f->mspec_special[1].tname = "water.png";
+       f->mspec_special[1].backface_culling = true;
+
        i = CONTENT_WATERSOURCE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_LIQUID;
+       f->setAllTextures("water.png", WATER_ALPHA);
        //f->setInventoryTexture("water.png");
        f->setInventoryTextureCube("water.png", "water.png", "water.png");
-       if(new_style_water)
-       {
-               f->solidness = 0; // drawn separately, makes no faces
-       }
-       else // old style
-       {
-               f->solidness = 1;
-#ifndef SERVER
-               TileSpec t;
-               if(g_texturesource)
-                       t.texture = g_texturesource->getTexture("water.png");
-               
-               if(!opaque_water){
-                       t.alpha = WATER_ALPHA;
-                       t.material_type = MATERIAL_ALPHA_VERTEX;
-               }
-               t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
-               f->setAllTiles(t);
-#endif
-       }
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->walkable = false;
@@ -526,35 +463,19 @@ void content_mapnode_init()
        f->liquid_alternative_flowing = CONTENT_WATER;
        f->liquid_alternative_source = CONTENT_WATERSOURCE;
        f->liquid_viscosity = WATER_VISC;
-#ifndef SERVER
-       if(!opaque_water)
-               f->vertex_alpha = WATER_ALPHA;
        f->post_effect_color = video::SColor(64, 100, 100, 200);
-       if(f->special_material == NULL && g_texturesource)
-       {
-               // New-style water source material (mostly unused)
-               f->special_material = new video::SMaterial;
-               f->special_material->setFlag(video::EMF_LIGHTING, false);
-               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
-               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
-               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
-               f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
-               AtlasPointer *pa_water1 = new AtlasPointer(g_texturesource->getTexture(
-                               g_texturesource->getTextureId("water.png")));
-               f->special_material->setTexture(0, pa_water1->atlas);
-               f->special_atlas = pa_water1;
-       }
-#endif
+       // New-style water source material (mostly unused)
+       f->mspec_special[0].tname = "water.png";
+       f->mspec_special[0].backface_culling = false;
        
        i = CONTENT_LAVA;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_FLOWINGLIQUID;
+       f->setAllTextures("lava.png");
        f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
-       f->used_texturenames["lava.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = false;
        f->light_source = LIGHT_MAX-1;
-       f->solidness = 0; // Drawn separately, makes no faces
-       f->visual_solidness = 1; // Does not completely cover block boundaries
        f->walkable = false;
        f->pointable = false;
        f->diggable = false;
@@ -564,54 +485,18 @@ void content_mapnode_init()
        f->liquid_alternative_source = CONTENT_LAVASOURCE;
        f->liquid_viscosity = LAVA_VISC;
        f->damage_per_second = 4*2;
-#ifndef SERVER
        f->post_effect_color = video::SColor(192, 255, 64, 0);
-       if(f->special_material == NULL && g_texturesource)
-       {
-               // Flowing lava material
-               f->special_material = new video::SMaterial;
-               f->special_material->setFlag(video::EMF_LIGHTING, false);
-               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
-               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
-               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
-               f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-
-               AtlasPointer *pa_lava1 = new AtlasPointer(
-                       g_texturesource->getTexture(
-                               g_texturesource->getTextureId("lava.png")));
-               f->special_material->setTexture(0, pa_lava1->atlas);
-
-               // Flowing lava material, backface culled
-               f->special_material2 = new video::SMaterial;
-               *f->special_material2 = *f->special_material;
-               f->special_material2->setFlag(video::EMF_BACK_FACE_CULLING, true);
-
-               f->special_atlas = pa_lava1;
-       }
-#endif
+       // Flowing lava material
+       f->mspec_special[0].tname = "lava.png";
+       f->mspec_special[0].backface_culling = false;
+       f->mspec_special[1].tname = "lava.png";
+       f->mspec_special[1].backface_culling = true;
        
        i = CONTENT_LAVASOURCE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_LIQUID;
+       f->setAllTextures("lava.png");
        f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
-       f->used_texturenames["ladder.png"] = true;
-       if(new_style_water)
-       {
-               f->solidness = 0; // drawn separately, makes no faces
-       }
-       else // old style
-       {
-               f->solidness = 2;
-#ifndef SERVER
-               TileSpec t;
-               if(g_texturesource)
-                       t.texture = g_texturesource->getTexture("lava.png");
-               
-               //t.alpha = 255;
-               //t.material_type = MATERIAL_ALPHA_VERTEX;
-               //t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
-               f->setAllTiles(t);
-#endif
-       }
        f->param_type = CPT_LIGHT;
        f->light_propagates = false;
        f->light_source = LIGHT_MAX-1;
@@ -625,37 +510,21 @@ void content_mapnode_init()
        f->liquid_alternative_source = CONTENT_LAVASOURCE;
        f->liquid_viscosity = LAVA_VISC;
        f->damage_per_second = 4*2;
-#ifndef SERVER
        f->post_effect_color = video::SColor(192, 255, 64, 0);
-       if(f->special_material == NULL && g_texturesource)
-       {
-               // New-style lava source material (mostly unused)
-               f->special_material = new video::SMaterial;
-               f->special_material->setFlag(video::EMF_LIGHTING, false);
-               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
-               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
-               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
-               f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-               AtlasPointer *pa_lava1 = new AtlasPointer(
-                       g_texturesource->getTexture(
-                               g_texturesource->getTextureId("lava.png")));
-               f->special_material->setTexture(0, pa_lava1->atlas);
-
-               f->special_atlas = pa_lava1;
-       }
-#endif
+       // New-style lava source material (mostly unused)
+       f->mspec_special[0].tname = "lava.png";
+       f->mspec_special[0].backface_culling = false;
        
        i = CONTENT_TORCH;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_TORCHLIKE;
+       f->setTexture(0, "torch_on_floor.png");
+       f->setTexture(1, "torch_on_ceiling.png");
+       f->setTexture(2, "torch.png");
        f->setInventoryTexture("torch_on_floor.png");
-       f->used_texturenames["torch_on_floor.png"] = true;
-       f->used_texturenames["torch_on_ceiling.png"] = true;
-       f->used_texturenames["torch_on_floor.png"] = true;
-       f->used_texturenames["torch.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
-       f->solidness = 0; // drawn separately, makes no faces
        f->walkable = false;
        f->wall_mounted = true;
        f->air_equivalent = true;
@@ -671,24 +540,24 @@ void content_mapnode_init()
        setConstantMaterialProperties(f->material, 0.0);
        
        i = CONTENT_SIGN_WALL;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_SIGNLIKE;
+       f->setAllTextures("sign_wall.png");
        f->setInventoryTexture("sign_wall.png");
-       f->used_texturenames["sign_wall.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
-       f->solidness = 0; // drawn separately, makes no faces
        f->walkable = false;
        f->wall_mounted = true;
        f->air_equivalent = true;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        if(f->initial_metadata == NULL)
-               f->initial_metadata = new SignNodeMetadata("Some sign");
+               f->initial_metadata = new SignNodeMetadata(NULL, "Some sign");
        setConstantMaterialProperties(f->material, 0.5);
        f->selection_box.type = NODEBOX_WALLMOUNTED;
        
        i = CONTENT_CHEST;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->param_type = CPT_FACEDIR_SIMPLE;
        f->setAllTextures("chest_side.png");
        f->setTexture(0, "chest_top.png");
@@ -698,11 +567,11 @@ void content_mapnode_init()
        //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        if(f->initial_metadata == NULL)
-               f->initial_metadata = new ChestNodeMetadata();
+               f->initial_metadata = new ChestNodeMetadata(NULL);
        setWoodLikeMaterialProperties(f->material, 1.0);
        
        i = CONTENT_LOCKABLE_CHEST;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->param_type = CPT_FACEDIR_SIMPLE;
        f->setAllTextures("chest_side.png");
        f->setTexture(0, "chest_top.png");
@@ -712,11 +581,11 @@ void content_mapnode_init()
        //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        if(f->initial_metadata == NULL)
-               f->initial_metadata = new LockingChestNodeMetadata();
+               f->initial_metadata = new LockingChestNodeMetadata(NULL);
        setWoodLikeMaterialProperties(f->material, 1.0);
 
        i = CONTENT_FURNACE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->param_type = CPT_FACEDIR_SIMPLE;
        f->setAllTextures("furnace_side.png");
        f->setTexture(5, "furnace_front.png"); // Z-
@@ -724,11 +593,11 @@ void content_mapnode_init()
        //f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 6";
        if(f->initial_metadata == NULL)
-               f->initial_metadata = new FurnaceNodeMetadata();
+               f->initial_metadata = new FurnaceNodeMetadata(NULL);
        setStoneLikeMaterialProperties(f->material, 3.0);
        
        i = CONTENT_COBBLE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("cobble.png");
        f->setInventoryTextureCube("cobble.png", "cobble.png", "cobble.png");
        f->param_type = CPT_NONE;
@@ -737,7 +606,7 @@ void content_mapnode_init()
        setStoneLikeMaterialProperties(f->material, 0.9);
 
        i = CONTENT_MOSSYCOBBLE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("mossycobble.png");
        f->setInventoryTextureCube("mossycobble.png", "mossycobble.png", "mossycobble.png");
        f->param_type = CPT_NONE;
@@ -746,7 +615,7 @@ void content_mapnode_init()
        setStoneLikeMaterialProperties(f->material, 0.8);
        
        i = CONTENT_STEEL;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("steel_block.png");
        f->setInventoryTextureCube("steel_block.png", "steel_block.png",
                        "steel_block.png");
@@ -756,7 +625,7 @@ void content_mapnode_init()
        setStoneLikeMaterialProperties(f->material, 5.0);
        
        i = CONTENT_NC;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->param_type = CPT_FACEDIR_SIMPLE;
        f->setAllTextures("nc_side.png");
        f->setTexture(5, "nc_front.png"); // Z-
@@ -766,33 +635,34 @@ void content_mapnode_init()
        setStoneLikeMaterialProperties(f->material, 3.0);
        
        i = CONTENT_NC_RB;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
        f->setAllTextures("nc_rb.png");
        f->setInventoryTexture("nc_rb.png");
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setStoneLikeMaterialProperties(f->material, 3.0);
 
        i = CONTENT_SAPLING;
-       f = &content_features(i);
-       f->param_type = CPT_LIGHT;
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_PLANTLIKE;
+       f->visual_scale = 1.5;
        f->setAllTextures("sapling.png");
        f->setInventoryTexture("sapling.png");
-       f->used_texturenames["sapling.png"] = true;
+       f->param_type = CPT_LIGHT;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->light_propagates = true;
        f->air_equivalent = false;
-       f->solidness = 0; // drawn separately, makes no faces
        f->walkable = false;
        setConstantMaterialProperties(f->material, 0.0);
        
        i = CONTENT_APPLE;
-       f = &content_features(i);
+       f = nodemgr->getModifiable(i);
+       f->drawtype = NDT_PLANTLIKE;
+       f->visual_scale = 1.0;
+       f->setAllTextures("apple.png");
        f->setInventoryTexture("apple.png");
-       f->used_texturenames["apple.png"] = true;
        f->param_type = CPT_LIGHT;
        f->light_propagates = true;
        f->sunlight_propagates = true;
-       f->solidness = 0; // drawn separately, makes no faces
        f->walkable = false;
        f->air_equivalent = true;
        f->dug_item = std::string("CraftItem apple 1");