Merge pull request #2 from ev2-1/master

[mtmap.git] / serialize.go

diff --git a/serialize.go b/serialize.go
index 5f0c461924bdaa9425a2c8bd350c95ac7f97fa18..ddfb72a3dc7dd16c73af7405e0fc0a18605611a0 100644 (file)
--- a/serialize.go
+++ b/serialize.go
@@ -8,7 +8,7 @@ import (
        "io"
 )
 
-func Serialize(blk *MapBlk, w io.Writer, idNameMap map[string]mt.Content) {
+func Serialize(blk *MapBlk, w io.Writer, nameIdMap map[mt.Content]string) {
        if err := binary.Write(w, binary.BigEndian, &SerializeVer); err != nil {
                panic(err)
        }
@@ -37,6 +37,14 @@ func Serialize(blk *MapBlk, w io.Writer, idNameMap map[string]mt.Content) {
                        panic(err)
                }
 
+               if err := binary.Write(zw, binary.BigEndian, &blk.Param1); err != nil {
+                       panic(err)
+               }
+
+               if err := binary.Write(zw, binary.BigEndian, &blk.Param2); err != nil {
+                       panic(err)
+               }
+
                if err := zw.Close(); err != nil {
                        panic(err)
                }
@@ -50,54 +58,61 @@ func Serialize(blk *MapBlk, w io.Writer, idNameMap map[string]mt.Content) {
                var buf bytes.Buffer
                zw := zlib.NewWriter(&buf)
 
-               if err := binary.Write(zw, binary.BigEndian, &NodeMetaVer); err != nil {
-                       panic(err)
+               var version = NodeMetaVer
+               if len(blk.NodeMetas) == 0 {
+                       version = 0
                }
 
-               var count = uint16(len(blk.NodeMetas))
-               if err := binary.Write(zw, binary.BigEndian, &count); err != nil {
+               if err := binary.Write(zw, binary.BigEndian, &version); err != nil {
                        panic(err)
                }
 
-               for pos, data := range blk.NodeMetas {
-                       if err := binary.Write(zw, binary.BigEndian, &pos); err != nil {
-                               panic(err)
-                       }
-
-                       var num = uint32(len(data.Fields))
-                       if err := binary.Write(zw, binary.BigEndian, &num); err != nil {
+               if version != 0 {
+                       var count = uint16(len(blk.NodeMetas))
+                       if err := binary.Write(zw, binary.BigEndian, &count); err != nil {
                                panic(err)
                        }
 
-                       for _, field := range data.Fields {
-                               var lenName = uint16(len(field.Name))
-                               if err := binary.Write(zw, binary.BigEndian, &lenName); err != nil {
-                                       panic(err)
-                               }
-
-                               var name = []byte(field.Name)
-                               if err := binary.Write(zw, binary.BigEndian, &name); err != nil {
+                       for pos, data := range blk.NodeMetas {
+                               if err := binary.Write(zw, binary.BigEndian, &pos); err != nil {
                                        panic(err)
                                }
 
-                               var lenValue = uint32(len(field.Value))
-                               if err := binary.Write(zw, binary.BigEndian, &lenValue); err != nil {
+                               var num = uint32(len(data.Fields))
+                               if err := binary.Write(zw, binary.BigEndian, &num); err != nil {
                                        panic(err)
                                }
 
-                               var value = []byte(field.Value)
-                               if err := binary.Write(zw, binary.BigEndian, &value); err != nil {
-                                       panic(err)
+                               for _, field := range data.Fields {
+                                       var lenName = uint16(len(field.Name))
+                                       if err := binary.Write(zw, binary.BigEndian, &lenName); err != nil {
+                                               panic(err)
+                                       }
+
+                                       var name = []byte(field.Name)
+                                       if err := binary.Write(zw, binary.BigEndian, &name); err != nil {
+                                               panic(err)
+                                       }
+
+                                       var lenValue = uint32(len(field.Value))
+                                       if err := binary.Write(zw, binary.BigEndian, &lenValue); err != nil {
+                                               panic(err)
+                                       }
+
+                                       var value = []byte(field.Value)
+                                       if err := binary.Write(zw, binary.BigEndian, &value); err != nil {
+                                               panic(err)
+                                       }
+
+                                       if err := binary.Write(zw, binary.BigEndian, &field.Private); err != nil {
+                                               panic(err)
+                                       }
                                }
 
-                               if err := binary.Write(zw, binary.BigEndian, &field.Private); err != nil {
+                               if err := data.Inv.Serialize(zw); err != nil {
                                        panic(err)
                                }
                        }
-
-                       if err := data.Inv.Serialize(zw); err != nil {
-                               panic(err)
-                       }
                }
 
                if err := zw.Close(); err != nil {
@@ -151,21 +166,41 @@ func Serialize(blk *MapBlk, w io.Writer, idNameMap map[string]mt.Content) {
                panic(err)
        }
 
-       var nameIdMapCount = uint16(len(idNameMap))
-       if err := binary.Write(w, binary.BigEndian, &nameIdMapCount); err != nil {
-               panic(err)
-       }
+       var localNameIdMap = make(map[mt.Content]string)
 
-       var exists = make(map[mt.Content]struct{})
        for i := 0; i < 4096; i++ {
-               exists[blk.Param0[i]] = struct{}{}
-       }
-
-       for name, id := range idNameMap {
-               if _, ok := exists[id]; !ok {
+               id := blk.Param0[i]
+               if _, ok := localNameIdMap[id]; ok {
                        continue
                }
 
+               var name string
+               var ok bool
+
+               switch id {
+               case mt.Unknown:
+                       name = "unknown"
+               case mt.Air:
+                       name = "air"
+               case mt.Ignore:
+                       name = "ignore"
+               default:
+                       name, ok = nameIdMap[id]
+                       if !ok {
+                               id = mt.Unknown
+                               name = "unknown"
+                       }
+               }
+
+               localNameIdMap[id] = name
+       }
+
+       var nameIdMapCount = uint16(len(localNameIdMap))
+       if err := binary.Write(w, binary.BigEndian, &nameIdMapCount); err != nil {
+               panic(err)
+       }
+
+       for id, name := range localNameIdMap {
                if err := binary.Write(w, binary.BigEndian, &id); err != nil {
                        panic(err)
                }