From 673689fc7ce727c79537c054fcaf0f1cae45402e Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Sun, 25 Jan 2015 21:00:13 -1000
Subject: [PATCH] Add question mark texture (and "model") for unknown blocks.

---
 src/mcedit2/assets/mcedit2/block_unknown.png  | Bin 0 -> 271 bytes
 src/mcedit2/rendering/blockmodels.pyx         |  42 ++++++++++++++++--
 src/mcedit2/rendering/textureatlas.py         |  19 ++++----
 src/mceditlib/blocktypes/__init__.py          |   2 +-
 .../{idmapping.json => idmapping_raw.json}    |   0
 5 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 src/mcedit2/assets/mcedit2/block_unknown.png
 rename src/mceditlib/blocktypes/{idmapping.json => idmapping_raw.json} (100%)

diff --git a/src/mcedit2/assets/mcedit2/block_unknown.png b/src/mcedit2/assets/mcedit2/block_unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..5191b1389002b9d0feffc3cd35d61d0299545f65
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66
zdZwwZMyWtG4W2HJAs*guFP!E)pdi2yxSDsRM(dJ^CKKY!sstrX>n5=}KCFyPWj9$a
zXnS2xPvKeECMMU-tY*b61+zn>4`lJ5PYPw!VYO-7=1|mO`Gr01*+N4m%Pz+Kzy33X
zMOQGyGw<mA%5HF8QvX8Mo`(O6PQ}kMxRAx#6}I36>zlwWr<vOq8UHcc@oWvyEexKn
KelF{r5}E)Bu3Di0

literal 0
HcmV?d00001

diff --git a/src/mcedit2/rendering/blockmodels.pyx b/src/mcedit2/rendering/blockmodels.pyx
index 3236f62..1ef798a 100644
--- a/src/mcedit2/rendering/blockmodels.pyx
+++ b/src/mcedit2/rendering/blockmodels.pyx
@@ -14,6 +14,7 @@ from cpython cimport array
 from array import array
 
 from mceditlib import faces
+from mceditlib.blocktypes import BlockType
 from mceditlib.geometry import Vector
 from mceditlib.selection import FloatBox
 
@@ -33,6 +34,13 @@ cdef struct ModelQuadList:
 cdef class BlockModels(object):
 
     def _getBlockModel(self, modelName):
+        if modelName == "block/MCEDIT_UNKNOWN":
+            return {
+                "parent": "block/cube_all",
+                "textures": {
+                    "all": "MCEDIT_UNKNOWN"
+                }
+            }
         model = self.modelBlockJsons.get(modelName)
         if model is None:
             model = json.load(self.resourceLoader.openStream("models/%s.json" % modelName))
@@ -40,6 +48,14 @@ cdef class BlockModels(object):
         return model
 
     def _getBlockState(self, stateName):
+        if stateName == "MCEDIT_UNKNOWN":
+            return {
+                "variants": {
+                    "MCEDIT_UNKNOWN": {
+                        "model": "MCEDIT_UNKNOWN",
+                    }
+                }
+            }
         state = self.modelStateJsons.get(stateName)
         if state is None:
             state = json.load(self.resourceLoader.openStream("blockstates/%s.json" % stateName))
@@ -69,7 +85,15 @@ cdef class BlockModels(object):
         memset(self.cookedModelsByID, 0, sizeof(self.cookedModelsByID))
         self.cooked = False
 
-        for i, block in enumerate(blocktypes):
+        missingnoProxy = BlockType(-1, -1, blocktypes)
+        missingnoProxy.internalName = "MCEDIT_UNKNOWN"
+        missingnoProxy.blockState = ""
+        missingnoProxy.renderType = 3
+        missingnoProxy.resourcePath = "MCEDIT_UNKNOWN"
+        missingnoProxy.resourceVariant = "MCEDIT_UNKNOWN"
+        missingnoProxy.color = 0xFFFFFF
+
+        for i, block in enumerate(list(blocktypes) + [missingnoProxy]):
             if i % 100 == 0:
                 log.info("Loading block models %s/%s", i, len(blocktypes))
 
@@ -196,6 +220,7 @@ cdef class BlockModels(object):
                           allElements, textureVars)
                 raise
 
+
     def buildBoxQuads(self, element, nameAndState, textureVars, variantXrot, variantYrot, variantZrot, blockColor):
         quads = []
         shade = element.get("shade", True)
@@ -253,6 +278,7 @@ cdef class BlockModels(object):
         cdef int u1, u2, v1, v2
         cdef int uw, vh
         cdef list cookedQuads
+
         for nameAndState, allQuads in self.modelQuads.iteritems():
             cookedQuads = []
             for (box, face, texture, uv, cullface, shade, rotation, textureRotation,
@@ -307,8 +333,18 @@ cdef class BlockModels(object):
                 cookedQuads.append((xyzuvc, cullface))
 
             cookedModels[nameAndState] = cookedQuads
-            ID, meta = self.blocktypes.IDsByState[nameAndState]
-            self.storeQuads(cookedQuads, ID, meta)
+            try:
+                ID, meta = self.blocktypes.IDsByState[nameAndState]
+            except KeyError:
+                pass
+            else:
+                self.storeQuads(cookedQuads, ID, meta)
+
+        stoneModels = cookedModels['MCEDIT_UNKNOWN']
+        for ID in range(4096):
+            for meta in range(16):
+                if self.cookedModelsByID[ID][meta].count == 0:
+                    self.storeQuads(stoneModels, ID, meta)
 
         self.cookedModels = cookedModels
         self.cooked = True
diff --git a/src/mcedit2/rendering/textureatlas.py b/src/mcedit2/rendering/textureatlas.py
index 9c0eb60..bbece06 100644
--- a/src/mcedit2/rendering/textureatlas.py
+++ b/src/mcedit2/rendering/textureatlas.py
@@ -12,6 +12,7 @@ from mcedit2.util.load_png import loadPNGData
 from mcedit2.rendering.lightmap import generateLightmap
 from mcedit2.resourceloader import ResourceLoader
 from mcedit2.util import glutils
+from mcedit2.util.resources import resourcePath
 from mceditlib import util
 
 
@@ -87,22 +88,16 @@ class TextureAtlas(object):
         self._terrainTexture = None
         self._maxLOD = maxLOD
 
-        missingno = numpy.empty((16, 16, 4), 'uint8')
-        missingno[:] = [[[0xff, 0x00, 0xff, 0xff]]]
 
-        missingnoTexture = 16, 16, missingno
         names = set()
         self._rawTextures = rawTextures = []
-
+        assert "MCEDIT_UNKNOWN" in blockModels.getTextureNames()
         for filename in blockModels.getTextureNames():
             if filename in names:
                 continue
             try:
-                if filename == "missingno":
-                    rawTextures.append((filename,) + missingnoTexture)
-                else:
-                    f = self._openImageStream(filename)
-                    rawTextures.append((filename,) + loadPNGData(f.read()))
+                f = self._openImageStream(filename)
+                rawTextures.append((filename,) + loadPNGData(f.read()))
                 names.add(filename)
                 log.debug("Loaded texture %s", filename)
             except KeyError as e:
@@ -115,6 +110,7 @@ class TextureAtlas(object):
         log.info("Preloaded %d textures for world %s (%i kB)",
                  len(self._rawTextures), util.displayName(self._filename), rawSize/1024)
 
+
     def load(self):
         if self._terrainTexture:
             return
@@ -211,8 +207,9 @@ class TextureAtlas(object):
         #raise SystemExit
 
     def _openImageStream(self, name):
-        if name == "missingno":
-            name = "stone"
+        if name == "MCEDIT_UNKNOWN":
+            block_unknown = resourcePath("mcedit2/assets/mcedit2/block_unknown.png")
+            return file(block_unknown, "rb")
         return self._resourceLoader.openStream("textures/" + name + ".png")
 
     def bindTerrain(self):
diff --git a/src/mceditlib/blocktypes/__init__.py b/src/mceditlib/blocktypes/__init__.py
index a535025..16398cc 100644
--- a/src/mceditlib/blocktypes/__init__.py
+++ b/src/mceditlib/blocktypes/__init__.py
@@ -92,7 +92,7 @@ class BlockTypeSet(object):
             'blockState': '[UNKNOWN_STATE]',
             'unlocalizedName': 'name.unknown',
             'opaqueCube': True,
-            'renderType': -1, #xxx unknowns
+            'renderType': 3,  # Model block - defaults to stone(?)
         }
 
         self.aka = defaultdict(lambda: "")
diff --git a/src/mceditlib/blocktypes/idmapping.json b/src/mceditlib/blocktypes/idmapping_raw.json
similarity index 100%
rename from src/mceditlib/blocktypes/idmapping.json
rename to src/mceditlib/blocktypes/idmapping_raw.json