]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/mapnode.cpp
Weather support
[dragonfireclient.git] / src / mapnode.cpp
index 1e8915b03035adb1d48904ec388ce5a49f83ab24..4707978cbc2a4803fa651060404277648f296511 100644 (file)
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "mapnode.h"
 #include "porting.h"
-#include <string>
-#include "mineral.h"
 #include "main.h" // For g_settings
 #include "nodedef.h"
 #include "content_mapnode.h" // For mapnode_translate_*_internal
+#include "serialization.h" // For ser_ver_supported
+#include "util/serialize.h"
+#include "log.h"
+#include <string>
+#include <sstream>
 
-#ifndef SERVER
-/*
-       Nodes make a face if contents differ and solidness differs.
-       Return value:
-               0: No face
-               1: Face uses m1's content
-               2: Face uses m2's content
-       equivalent: Whether the blocks share the same face (eg. water and glass)
-
-       TODO: Add 3: Both faces drawn with backface culling, remove equivalent
-*/
-u8 face_contents(content_t m1, content_t m2, bool *equivalent,
-               INodeDefManager *nodemgr)
-{
-       *equivalent = false;
-
-       if(m1 == CONTENT_IGNORE || m2 == CONTENT_IGNORE)
-               return 0;
-       
-       bool contents_differ = (m1 != m2);
-       
-       const ContentFeatures &f1 = nodemgr->get(m1);
-       const ContentFeatures &f2 = nodemgr->get(m2);
-
-       // Contents don't differ for different forms of same liquid
-       if(f1.sameLiquid(f2))
-               contents_differ = false;
-       
-       u8 c1 = f1.solidness;
-       u8 c2 = f2.solidness;
-
-       bool solidness_differs = (c1 != c2);
-       bool makes_face = contents_differ && solidness_differs;
-
-       if(makes_face == false)
-               return 0;
-       
-       if(c1 == 0)
-               c1 = f1.visual_solidness;
-       if(c2 == 0)
-               c2 = f2.visual_solidness;
-       
-       if(c1 == c2){
-               *equivalent = true;
-               // If same solidness, liquid takes precense
-               if(f1.isLiquid())
-                       return 1;
-               if(f2.isLiquid())
-                       return 2;
-       }
-       
-       if(c1 > c2)
-               return 1;
-       else
-               return 2;
-}
-#endif
+static const Rotation wallmounted_to_rot[] = {
+       ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270
+};
 
-v3s16 facedir_rotate(u8 facedir, v3s16 dir)
-{
-       /*
-               Face 2 (normally Z-) direction:
-               facedir=0: Z-
-               facedir=1: X-
-               facedir=2: Z+
-               facedir=3: X+
-       */
-       v3s16 newdir;
-       if(facedir==0) // Same
-               newdir = v3s16(dir.X, dir.Y, dir.Z);
-       else if(facedir == 1) // Face is taken from rotXZccv(-90)
-               newdir = v3s16(-dir.Z, dir.Y, dir.X);
-       else if(facedir == 2) // Face is taken from rotXZccv(180)
-               newdir = v3s16(-dir.X, dir.Y, -dir.Z);
-       else if(facedir == 3) // Face is taken from rotXZccv(90)
-               newdir = v3s16(dir.Z, dir.Y, -dir.X);
-       else
-               newdir = dir;
-       return newdir;
-}
+static const u8 rot_to_wallmounted[] = {
+       2, 4, 3, 5
+};
 
-u8 packDir(v3s16 dir)
-{
-       u8 b = 0;
-
-       if(dir.X > 0)
-               b |= (1<<0);
-       else if(dir.X < 0)
-               b |= (1<<1);
-
-       if(dir.Y > 0)
-               b |= (1<<2);
-       else if(dir.Y < 0)
-               b |= (1<<3);
-
-       if(dir.Z > 0)
-               b |= (1<<4);
-       else if(dir.Z < 0)
-               b |= (1<<5);
-       
-       return b;
-}
-v3s16 unpackDir(u8 b)
-{
-       v3s16 d(0,0,0);
-
-       if(b & (1<<0))
-               d.X = 1;
-       else if(b & (1<<1))
-               d.X = -1;
-
-       if(b & (1<<2))
-               d.Y = 1;
-       else if(b & (1<<3))
-               d.Y = -1;
-
-       if(b & (1<<4))
-               d.Z = 1;
-       else if(b & (1<<5))
-               d.Z = -1;
-       
-       return d;
-}
 
 /*
        MapNode
 */
 
+// Create directly from a nodename
+// If name is unknown, sets CONTENT_IGNORE
+MapNode::MapNode(INodeDefManager *ndef, const std::string &name,
+               u8 a_param1, u8 a_param2)
+{
+       content_t id = CONTENT_IGNORE;
+       ndef->getId(name, id);
+       param0 = id;
+       param1 = a_param1;
+       param2 = a_param2;
+}
+
 void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr)
 {
        // If node doesn't contain light data, ignore this
@@ -176,8 +76,9 @@ void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr
 u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
 {
        // Select the brightest of [light source, propagated light]
+       const ContentFeatures &f = nodemgr->get(*this);
        u8 light = 0;
-       if(nodemgr->get(*this).param_type == CPT_LIGHT)
+       if(f.param_type == CPT_LIGHT)
        {
                if(bank == LIGHTBANK_DAY)
                        light = param1 & 0x0f;
@@ -186,91 +87,340 @@ u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
                else
                        assert(0);
        }
-       if(nodemgr->get(*this).light_source > light)
-               light = nodemgr->get(*this).light_source;
+       if(f.light_source > light)
+               light = f.light_source;
        return light;
 }
 
-u8 MapNode::getLightBanksWithSource(INodeDefManager *nodemgr) const
+bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodemgr) const
 {
        // Select the brightest of [light source, propagated light]
-       u8 lightday = 0;
-       u8 lightnight = 0;
-       if(nodemgr->get(*this).param_type == CPT_LIGHT)
+       const ContentFeatures &f = nodemgr->get(*this);
+       if(f.param_type == CPT_LIGHT)
        {
                lightday = param1 & 0x0f;
                lightnight = (param1>>4)&0x0f;
        }
-       if(nodemgr->get(*this).light_source > lightday)
-               lightday = nodemgr->get(*this).light_source;
-       if(nodemgr->get(*this).light_source > lightnight)
-               lightnight = nodemgr->get(*this).light_source;
-       return (lightday&0x0f) | ((lightnight<<4)&0xf0);
+       else
+       {
+               lightday = 0;
+               lightnight = 0;
+       }
+       if(f.light_source > lightday)
+               lightday = f.light_source;
+       if(f.light_source > lightnight)
+               lightnight = f.light_source;
+       return f.param_type == CPT_LIGHT || f.light_source != 0;
 }
 
-#ifndef SERVER
-TileSpec MapNode::getTile(v3s16 dir, ITextureSource *tsrc,
-               INodeDefManager *nodemgr) const
+u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
-       if(nodemgr->get(*this).param_type == CPT_FACEDIR_SIMPLE)
-               dir = facedir_rotate(param1, dir);
-       
-       TileSpec spec;
-       
-       s32 dir_i = -1;
-       
-       if(dir == v3s16(0,0,0))
-               dir_i = -1;
-       else if(dir == v3s16(0,1,0))
-               dir_i = 0;
-       else if(dir == v3s16(0,-1,0))
-               dir_i = 1;
-       else if(dir == v3s16(1,0,0))
-               dir_i = 2;
-       else if(dir == v3s16(-1,0,0))
-               dir_i = 3;
-       else if(dir == v3s16(0,0,1))
-               dir_i = 4;
-       else if(dir == v3s16(0,0,-1))
-               dir_i = 5;
-       
-       if(dir_i == -1)
-               // Non-directional
-               spec = nodemgr->get(*this).tiles[0];
-       else 
-               spec = nodemgr->get(*this).tiles[dir_i];
-       
-       /*
-               If it contains some mineral, change texture id
-       */
-       if(nodemgr->get(*this).param_type == CPT_MINERAL && tsrc)
+       const ContentFeatures &f = nodemgr->get(*this);
+       if(f.param_type_2 == CPT2_FACEDIR)
+               return getParam2() & 0x1F;
+       return 0;
+}
+
+u8 MapNode::getWallMounted(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       if(f.param_type_2 == CPT2_WALLMOUNTED)
+               return getParam2() & 0x07;
+       return 0;
+}
+
+v3s16 MapNode::getWallMountedDir(INodeDefManager *nodemgr) const
+{
+       switch(getWallMounted(nodemgr))
+       {
+       case 0: default: return v3s16(0,1,0);
+       case 1: return v3s16(0,-1,0);
+       case 2: return v3s16(1,0,0);
+       case 3: return v3s16(-1,0,0);
+       case 4: return v3s16(0,0,1);
+       case 5: return v3s16(0,0,-1);
+       }
+}
+
+void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
+       ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
+
+       if (cpt2 == CPT2_FACEDIR) {
+               u8 newrot = param2 & 3;
+               param2 &= ~3;
+               param2 |= (newrot + rot) & 3;
+       } else if (cpt2 == CPT2_WALLMOUNTED) {
+               u8 wmountface = (param2 & 7);
+               if (wmountface <= 1)
+                       return;
+                       
+               Rotation oldrot = wallmounted_to_rot[wmountface - 2];
+               param2 &= ~7;
+               param2 |= rot_to_wallmounted[(oldrot - rot) & 3];
+       }
+}
+
+static std::vector<aabb3f> transformNodeBox(const MapNode &n,
+               const NodeBox &nodebox, INodeDefManager *nodemgr)
+{
+       std::vector<aabb3f> boxes;
+       if(nodebox.type == NODEBOX_FIXED || nodebox.type == NODEBOX_LEVELED)
        {
-               u8 mineral = getMineral(nodemgr);
-               std::string mineral_texture_name = mineral_block_texture(mineral);
-               if(mineral_texture_name != "")
+               const std::vector<aabb3f> &fixed = nodebox.fixed;
+               int facedir = n.getFaceDir(nodemgr);
+               u8 axisdir = facedir>>2;
+               facedir&=0x03;
+               for(std::vector<aabb3f>::const_iterator
+                               i = fixed.begin();
+                               i != fixed.end(); i++)
                {
-                       u32 orig_id = spec.texture.id;
-                       std::string texture_name = tsrc->getTextureName(orig_id);
-                       //texture_name += "^blit:";
-                       texture_name += "^";
-                       texture_name += mineral_texture_name;
-                       u32 new_id = tsrc->getTextureId(texture_name);
-                       spec.texture = tsrc->getTexture(new_id);
+                       aabb3f box = *i;
+
+                       if (nodebox.type == NODEBOX_LEVELED) {
+                               box.MaxEdge.Y = -BS/2 + BS*((float)1/LEVELED_MAX) * n.getLevel(nodemgr);
+                       }
+
+                       switch (axisdir)
+                       {
+                       case 0:
+                               if(facedir == 1)
+                               {
+                                       box.MinEdge.rotateXZBy(-90);
+                                       box.MaxEdge.rotateXZBy(-90);
+                               }
+                               else if(facedir == 2)
+                               {
+                                       box.MinEdge.rotateXZBy(180);
+                                       box.MaxEdge.rotateXZBy(180);
+                               }
+                               else if(facedir == 3)
+                               {
+                                       box.MinEdge.rotateXZBy(90);
+                                       box.MaxEdge.rotateXZBy(90);
+                               }
+                               break;
+                       case 1: // z+
+                               box.MinEdge.rotateYZBy(90);
+                               box.MaxEdge.rotateYZBy(90);
+                               if(facedir == 1)
+                               {
+                                       box.MinEdge.rotateXYBy(90);
+                                       box.MaxEdge.rotateXYBy(90);
+                               }
+                               else if(facedir == 2)
+                               {
+                                       box.MinEdge.rotateXYBy(180);
+                                       box.MaxEdge.rotateXYBy(180);
+                               }
+                               else if(facedir == 3)
+                               {
+                                       box.MinEdge.rotateXYBy(-90);
+                                       box.MaxEdge.rotateXYBy(-90);
+                               }
+                               break;
+                       case 2: //z-
+                               box.MinEdge.rotateYZBy(-90);
+                               box.MaxEdge.rotateYZBy(-90);
+                               if(facedir == 1)
+                               {
+                                       box.MinEdge.rotateXYBy(-90);
+                                       box.MaxEdge.rotateXYBy(-90);
+                               }
+                               else if(facedir == 2)
+                               {
+                                       box.MinEdge.rotateXYBy(180);
+                                       box.MaxEdge.rotateXYBy(180);
+                               }
+                               else if(facedir == 3)
+                               {
+                                       box.MinEdge.rotateXYBy(90);
+                                       box.MaxEdge.rotateXYBy(90);
+                               }
+                               break;
+                       case 3:  //x+
+                               box.MinEdge.rotateXYBy(-90);
+                               box.MaxEdge.rotateXYBy(-90);
+                               if(facedir == 1)
+                               {
+                                       box.MinEdge.rotateYZBy(90);
+                                       box.MaxEdge.rotateYZBy(90);
+                               }
+                               else if(facedir == 2)
+                               {
+                                       box.MinEdge.rotateYZBy(180);
+                                       box.MaxEdge.rotateYZBy(180);
+                               }
+                               else if(facedir == 3)
+                               {
+                                       box.MinEdge.rotateYZBy(-90);
+                                       box.MaxEdge.rotateYZBy(-90);
+                               }
+                               break;
+                       case 4:  //x-
+                               box.MinEdge.rotateXYBy(90);
+                               box.MaxEdge.rotateXYBy(90);
+                               if(facedir == 1)
+                               {
+                                       box.MinEdge.rotateYZBy(-90);
+                                       box.MaxEdge.rotateYZBy(-90);
+                               }
+                               else if(facedir == 2)
+                               {
+                                       box.MinEdge.rotateYZBy(180);
+                                       box.MaxEdge.rotateYZBy(180);
+                               }
+                               else if(facedir == 3)
+                               {
+                                       box.MinEdge.rotateYZBy(90);
+                                       box.MaxEdge.rotateYZBy(90);
+                               }
+                               break;
+                       case 5:
+                               box.MinEdge.rotateXYBy(-180);
+                               box.MaxEdge.rotateXYBy(-180);
+                               if(facedir == 1)
+                               {
+                                       box.MinEdge.rotateXZBy(90);
+                                       box.MaxEdge.rotateXZBy(90);
+                               }
+                               else if(facedir == 2)
+                               {
+                                       box.MinEdge.rotateXZBy(180);
+                                       box.MaxEdge.rotateXZBy(180);
+                               }
+                               else if(facedir == 3)
+                               {
+                                       box.MinEdge.rotateXZBy(-90);
+                                       box.MaxEdge.rotateXZBy(-90);
+                               }
+                               break;
+                       default:
+                               break;
+                       }
+                       box.repair();
+                       boxes.push_back(box);
                }
        }
+       else if(nodebox.type == NODEBOX_WALLMOUNTED)
+       {
+               v3s16 dir = n.getWallMountedDir(nodemgr);
 
-       return spec;
+               // top
+               if(dir == v3s16(0,1,0))
+               {
+                       boxes.push_back(nodebox.wall_top);
+               }
+               // bottom
+               else if(dir == v3s16(0,-1,0))
+               {
+                       boxes.push_back(nodebox.wall_bottom);
+               }
+               // side
+               else
+               {
+                       v3f vertices[2] =
+                       {
+                               nodebox.wall_side.MinEdge,
+                               nodebox.wall_side.MaxEdge
+                       };
+
+                       for(s32 i=0; i<2; i++)
+                       {
+                               if(dir == v3s16(-1,0,0))
+                                       vertices[i].rotateXZBy(0);
+                               if(dir == v3s16(1,0,0))
+                                       vertices[i].rotateXZBy(180);
+                               if(dir == v3s16(0,0,-1))
+                                       vertices[i].rotateXZBy(90);
+                               if(dir == v3s16(0,0,1))
+                                       vertices[i].rotateXZBy(-90);
+                       }
+
+                       aabb3f box = aabb3f(vertices[0]);
+                       box.addInternalPoint(vertices[1]);
+                       boxes.push_back(box);
+               }
+       }
+       else // NODEBOX_REGULAR
+       {
+               boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2));
+       }
+       return boxes;
 }
-#endif
 
-u8 MapNode::getMineral(INodeDefManager *nodemgr) const
+std::vector<aabb3f> MapNode::getNodeBoxes(INodeDefManager *nodemgr) const
 {
-       if(nodemgr->get(*this).param_type == CPT_MINERAL)
-       {
-               return param1 & 0x0f;
+       const ContentFeatures &f = nodemgr->get(*this);
+       return transformNodeBox(*this, f.node_box, nodemgr);
+}
+
+std::vector<aabb3f> MapNode::getSelectionBoxes(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       return transformNodeBox(*this, f.selection_box, nodemgr);
+}
+
+u8 MapNode::getMaxLevel(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       // todo: after update in all games leave only if (f.param_type_2 ==
+       if(        f.liquid_type == LIQUID_SOURCE 
+               || f.liquid_type == LIQUID_FLOWING 
+               || f.param_type_2 == CPT2_FLOWINGLIQUID)
+               return LIQUID_LEVEL_MAX;
+       if(f.leveled || f.param_type_2 == CPT2_LEVELED)
+               return LEVELED_MAX;
+       return 0;
+}
+
+u8 MapNode::getLevel(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       // todo: after update in all games leave only if (f.param_type_2 ==
+       if(f.liquid_type == LIQUID_SOURCE)
+               return LIQUID_LEVEL_SOURCE;
+       if (f.param_type_2 == CPT2_FLOWINGLIQUID)
+               return getParam2() & LIQUID_LEVEL_MASK;
+       if(f.liquid_type == LIQUID_FLOWING) // can remove if all param_type_2 setted
+               return getParam2() & LIQUID_LEVEL_MASK;
+       if(f.leveled || f.param_type_2 == CPT2_LEVELED) {
+                u8 level = getParam2() & LEVELED_MASK;
+                if(level) return level;
+                if(f.leveled > LEVELED_MAX) return LEVELED_MAX;
+                return f.leveled; //default
        }
+       return 0;
+}
 
-       return MINERAL_NONE;
+u8 MapNode::addLevel(INodeDefManager *nodemgr, s8 add)
+{
+       s8 level = getLevel(nodemgr);
+       u8 rest = 0;
+       if (add == 0) level = 1;
+       level += add;
+       if (level < 1) {
+               setContent(CONTENT_AIR);
+               return 0;
+       }
+       const ContentFeatures &f = nodemgr->get(*this);
+       if (       f.param_type_2 == CPT2_FLOWINGLIQUID
+               || f.liquid_type == LIQUID_FLOWING
+               || f.liquid_type == LIQUID_SOURCE) {
+               if (level >= LIQUID_LEVEL_MAX) {
+                       rest = level - LIQUID_LEVEL_MAX;
+                       setContent(nodemgr->getId(f.liquid_alternative_source));
+               } else {
+                       setContent(nodemgr->getId(f.liquid_alternative_flowing));
+                       setParam2(level & LIQUID_LEVEL_MASK);
+               }
+       } else if (f.leveled || f.param_type_2 == CPT2_LEVELED) {
+               if (level > LEVELED_MAX) {
+                       rest = level - LEVELED_MAX;
+                       level = LEVELED_MAX;
+               }
+               setParam2(level & LEVELED_MASK);
+       }
+       return rest;
 }
 
 u32 MapNode::serializedLength(u8 version)
@@ -282,63 +432,176 @@ u32 MapNode::serializedLength(u8 version)
                return 1;
        else if(version <= 9)
                return 2;
-       else
+       else if(version <= 23)
                return 3;
+       else
+               return 4;
 }
 void MapNode::serialize(u8 *dest, u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
+       
+       // Can't do this anymore; we have 16-bit dynamically allocated node IDs
+       // in memory; conversion just won't work in this direction.
+       if(version < 24)
+               throw SerializationError("MapNode::serialize: serialization to "
+                               "version < 24 not possible");
                
-       // Translate to wanted version
-       MapNode n_foreign = mapnode_translate_from_internal(*this, version);
-
-       u8 actual_param0 = n_foreign.param0;
-
-       // Convert special values from new version to old
-       if(version <= 18)
+       writeU16(dest+0, param0);
+       writeU8(dest+2, param1);
+       writeU8(dest+3, param2);
+}
+void MapNode::deSerialize(u8 *source, u8 version)
+{
+       if(!ser_ver_supported(version))
+               throw VersionMismatchException("ERROR: MapNode format not supported");
+               
+       if(version <= 21)
        {
-               // In these versions, CONTENT_IGNORE and CONTENT_AIR
-               // are 255 and 254
-               if(actual_param0 == CONTENT_IGNORE)
-                       actual_param0 = 255;
-               else if(actual_param0 == CONTENT_AIR)
-                       actual_param0 = 254;
+               deSerialize_pre22(source, version);
+               return;
        }
 
-       if(version == 0)
-       {
-               dest[0] = actual_param0;
+       if(version >= 24){
+               param0 = readU16(source+0);
+               param1 = readU8(source+2);
+               param2 = readU8(source+3);
        }
-       else if(version <= 9)
+       else{
+               param0 = readU8(source+0);
+               param1 = readU8(source+1);
+               param2 = readU8(source+2);
+               if(param0 > 0x7F){
+                       param0 |= ((param2&0xF0)<<4);
+                       param2 &= 0x0F;
+               }
+       }
+}
+void MapNode::serializeBulk(std::ostream &os, int version,
+               const MapNode *nodes, u32 nodecount,
+               u8 content_width, u8 params_width, bool compressed)
+{
+       if(!ser_ver_supported(version))
+               throw VersionMismatchException("ERROR: MapNode format not supported");
+
+       assert(content_width == 2);
+       assert(params_width == 2);
+
+       // Can't do this anymore; we have 16-bit dynamically allocated node IDs
+       // in memory; conversion just won't work in this direction.
+       if(version < 24)
+               throw SerializationError("MapNode::serializeBulk: serialization to "
+                               "version < 24 not possible");
+
+       SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
+
+       // Serialize content
+       for(u32 i=0; i<nodecount; i++)
+               writeU16(&databuf[i*2], nodes[i].param0);
+
+       // Serialize param1
+       u32 start1 = content_width * nodecount;
+       for(u32 i=0; i<nodecount; i++)
+               writeU8(&databuf[start1 + i], nodes[i].param1);
+
+       // Serialize param2
+       u32 start2 = (content_width + 1) * nodecount;
+       for(u32 i=0; i<nodecount; i++)
+               writeU8(&databuf[start2 + i], nodes[i].param2);
+
+       /*
+               Compress data to output stream
+       */
+
+       if(compressed)
        {
-               dest[0] = actual_param0;
-               dest[1] = n_foreign.param1;
+               compressZlib(databuf, os);
        }
        else
        {
-               dest[0] = actual_param0;
-               dest[1] = n_foreign.param1;
-               dest[2] = n_foreign.param2;
+               os.write((const char*) &databuf[0], databuf.getSize());
        }
 }
-void MapNode::deSerialize(u8 *source, u8 version, INodeDefManager *nodemgr)
+
+// Deserialize bulk node data
+void MapNode::deSerializeBulk(std::istream &is, int version,
+               MapNode *nodes, u32 nodecount,
+               u8 content_width, u8 params_width, bool compressed)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-               
-       if(version == 0)
+
+       assert(version >= 22);
+       assert(content_width == 1 || content_width == 2);
+       assert(params_width == 2);
+
+       // Uncompress or read data
+       u32 len = nodecount * (content_width + params_width);
+       SharedBuffer<u8> databuf(len);
+       if(compressed)
        {
-               param0 = source[0];
+               std::ostringstream os(std::ios_base::binary);
+               decompressZlib(is, os);
+               std::string s = os.str();
+               if(s.size() != len)
+                       throw SerializationError("deSerializeBulkNodes: "
+                                       "decompress resulted in invalid size");
+               memcpy(&databuf[0], s.c_str(), len);
        }
-       else if(version == 1)
+       else
+       {
+               is.read((char*) &databuf[0], len);
+               if(is.eof() || is.fail())
+                       throw SerializationError("deSerializeBulkNodes: "
+                                       "failed to read bulk node data");
+       }
+
+       // Deserialize content
+       if(content_width == 1)
+       {
+               for(u32 i=0; i<nodecount; i++)
+                       nodes[i].param0 = readU8(&databuf[i]);
+       }
+       else if(content_width == 2)
+       {
+               for(u32 i=0; i<nodecount; i++)
+                       nodes[i].param0 = readU16(&databuf[i*2]);
+       }
+
+       // Deserialize param1
+       u32 start1 = content_width * nodecount;
+       for(u32 i=0; i<nodecount; i++)
+               nodes[i].param1 = readU8(&databuf[start1 + i]);
+
+       // Deserialize param2
+       u32 start2 = (content_width + 1) * nodecount;
+       if(content_width == 1)
+       {
+               for(u32 i=0; i<nodecount; i++) {
+                       nodes[i].param2 = readU8(&databuf[start2 + i]);
+                       if(nodes[i].param0 > 0x7F){
+                               nodes[i].param0 <<= 4;
+                               nodes[i].param0 |= (nodes[i].param2&0xF0)>>4;
+                               nodes[i].param2 &= 0x0F;
+                       }
+               }
+       }
+       else if(content_width == 2)
+       {
+               for(u32 i=0; i<nodecount; i++)
+                       nodes[i].param2 = readU8(&databuf[start2 + i]);
+       }
+}
+
+/*
+       Legacy serialization
+*/
+void MapNode::deSerialize_pre22(u8 *source, u8 version)
+{
+       if(version <= 1)
        {
                param0 = source[0];
-               // This version doesn't support saved lighting
-               if(nodemgr->get(*this).light_propagates || nodemgr->get(*this).light_source > 0)
-                       param1 = 0;
-               else
-                       param1 = source[1];
        }
        else if(version <= 9)
        {
@@ -350,21 +613,19 @@ void MapNode::deSerialize(u8 *source, u8 version, INodeDefManager *nodemgr)
                param0 = source[0];
                param1 = source[1];
                param2 = source[2];
+               if(param0 > 0x7f){
+                       param0 <<= 4;
+                       param0 |= (param2&0xf0)>>4;
+                       param2 &= 0x0f;
+               }
        }
        
        // Convert special values from old version to new
-       if(version <= 18)
+       if(version <= 19)
        {
                // In these versions, CONTENT_IGNORE and CONTENT_AIR
                // are 255 and 254
-               if(param0 == 255)
-                       param0 = CONTENT_IGNORE;
-               else if(param0 == 254)
-                       param0 = CONTENT_AIR;
-       }
-       // version 19 is fucked up with sometimes the old values and sometimes not
-       if(version == 19)
-       {
+               // Version 19 is fucked up with sometimes the old values and sometimes not
                if(param0 == 255)
                        param0 = CONTENT_IGNORE;
                else if(param0 == 254)
@@ -374,55 +635,3 @@ void MapNode::deSerialize(u8 *source, u8 version, INodeDefManager *nodemgr)
        // Translate to our known version
        *this = mapnode_translate_to_internal(*this, version);
 }
-
-/*
-       Gets lighting value at face of node
-       
-       Parameters must consist of air and !air.
-       Order doesn't matter.
-
-       If either of the nodes doesn't exist, light is 0.
-       
-       parameters:
-               daynight_ratio: 0...1000
-               n: getNode(p) (uses only the lighting value)
-               n2: getNode(p + face_dir) (uses only the lighting value)
-               face_dir: axis oriented unit vector from p to p2
-       
-       returns encoded light value.
-*/
-u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
-               v3s16 face_dir, INodeDefManager *nodemgr)
-{
-       try{
-               u8 light;
-               u8 l1 = n.getLightBlend(daynight_ratio, nodemgr);
-               u8 l2 = n2.getLightBlend(daynight_ratio, nodemgr);
-               if(l1 > l2)
-                       light = l1;
-               else
-                       light = l2;
-
-               // Make some nice difference to different sides
-
-               // This makes light come from a corner
-               /*if(face_dir.X == 1 || face_dir.Z == 1 || face_dir.Y == -1)
-                       light = diminish_light(diminish_light(light));
-               else if(face_dir.X == -1 || face_dir.Z == -1)
-                       light = diminish_light(light);*/
-               
-               // All neighboring faces have different shade (like in minecraft)
-               if(face_dir.X == 1 || face_dir.X == -1 || face_dir.Y == -1)
-                       light = diminish_light(diminish_light(light));
-               else if(face_dir.Z == 1 || face_dir.Z == -1)
-                       light = diminish_light(light);
-
-               return light;
-       }
-       catch(InvalidPositionException &e)
-       {
-               return 0;
-       }
-}
-
-