From 6ab33ce34fc9279258d55e807743e71e09f49007 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Sat, 26 Mar 2016 20:15:38 -0700
Subject: [PATCH] Frame stuff is an entity, not tile entity.

---
 block.py         | 12 ++++++++++++
 tile_entities.py |  4 ----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/block.py b/block.py
index 776030a..7cda649 100644
--- a/block.py
+++ b/block.py
@@ -7,6 +7,7 @@ import sqlite3
 from serialize import *
 from itemstack import *
 from tile_entities import te_convert
+from entities import e_convert
 
 
 class MCMap:
@@ -106,6 +107,12 @@ class MCBlock:
                     t["x"] = self.pos[0]*16 + 15-t["x"]%16
                 self.tile_entities.append(t)
 
+        self.entities = []
+        for e in chunk["Entities"]:
+            t = e.copy()
+            self.entities.append(t)
+
+
     @staticmethod
     def expand_half_bytes(l):
         # This function reverses x axis node order within each slice, and
@@ -312,6 +319,11 @@ class MTBlock:
                 except:
                     self.metadata[(x&0xf, y&0xf, z&0xf)] = meta
 
+        for e in mcblock.entities:
+            id = e["id"]
+            f = e_convert.get(id.lower(), lambda arg: (None, None, None)) # Do nothing if not found
+            block, p2, meta = f(e)
+
     def save(self):
         os = BytesIO()
         writeU8(os, 25) # Version
diff --git a/tile_entities.py b/tile_entities.py
index b4330fd..1721130 100644
--- a/tile_entities.py
+++ b/tile_entities.py
@@ -25,9 +25,6 @@ def escape(s):
             s2 += c
     return s2
 
-def convert_frame(te):
-
-
 def convert_furnace(te):
     src_time = 0
     src_totaltime = 0
@@ -121,7 +118,6 @@ def convert_cmdblock(te):
     return None, None, (fields, {})
 
 te_convert = {"chest": convert_chest,
-              "ItemFrame": convert_frame,
               "sign": convert_sign,
               "furnace": convert_furnace,
               "music": convert_nodeblock,