Change ResourceLoader.openStream to use a full path

Anticipating textures loaded from mods

src/mcedit2/rendering/blockmodels.pyx

@@ -83,7 +83,7 @@ cdef class BlockModels(object):
             }
         model = self.modelBlockJsons.get(modelName)
         if model is None:
-            model = json.load(self.resourceLoader.openStream("models/%s.json" % modelName))
+            model = json.load(self.resourceLoader.openStream("assets/minecraft/models/%s.json" % modelName))
             self.modelBlockJsons[modelName] = model
         return model
 
@@ -98,7 +98,7 @@ cdef class BlockModels(object):
             }
         state = self.modelStateJsons.get(stateName)
         if state is None:
-            state = json.load(self.resourceLoader.openStream("blockstates/%s.json" % stateName))
+            state = json.load(self.resourceLoader.openStream("assets/minecraft/blockstates/%s.json" % stateName))
             self.modelStateJsons[stateName] = state
         return state
 

src/mcedit2/rendering/textureatlas.py

@@ -210,7 +210,7 @@ class TextureAtlas(object):
         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")
+        return self._resourceLoader.openStream("assets/minecraft/textures/" + name + ".png")
 
     def bindTerrain(self):
         self.load()

src/mcedit2/resourceloader.py

@@ -23,8 +23,6 @@ class ResourceLoader(object):
         self.zipFiles.append(zf)
 
     def openStream(self, path):
-        path = "assets/minecraft/%s" % path
-
         for zipFile in self.zipFiles:
             try:
                 stream = zipFile.open(path)