 @@ -32 +32 @@ public class Tessellator
 -        return this.worldRenderer;
 +        return this.worldBuffer;
-diff --git a/minecraft/client/renderer/VboRenderList.java b/minecraft/client/renderer/VboRenderList.java
-index c140fee..e183401 100644
---- a/minecraft/client/renderer/VboRenderList.java
-+++ b/minecraft/client/renderer/VboRenderList.java
-@@ -12 +12 @@ public class VboRenderList extends ChunkRenderContainer
--            for (RenderChunk renderchunk : this.renderChunks)
-+            for (RenderChunk chunk : this.renderChunks)
-@@ -14 +14 @@ public class VboRenderList extends ChunkRenderContainer
--                net.minecraft.client.renderer.vertex.VertexBuffer vertexbuffer = renderchunk.getVertexBufferByLayer(layer.ordinal());
-+                net.minecraft.client.renderer.vertex.VertexBuffer buffer = chunk.getVertexBufferByLayer(layer.ordinal());
-@@ -16,3 +16,3 @@ public class VboRenderList extends ChunkRenderContainer
--                this.preRenderChunk(renderchunk);
--                renderchunk.multModelviewMatrix();
--                vertexbuffer.bindBuffer();
-+                this.preRenderChunk(chunk);
-+                chunk.multModelviewMatrix();
-+                buffer.bindBuffer();
-@@ -20 +20 @@ public class VboRenderList extends ChunkRenderContainer
--                vertexbuffer.drawArrays(7);
-+                buffer.drawArrays(7);
-diff --git a/minecraft/client/renderer/ViewFrustum.java b/minecraft/client/renderer/ViewFrustum.java
-index 5437581..cac4763 100644
---- a/minecraft/client/renderer/ViewFrustum.java
-+++ b/minecraft/client/renderer/ViewFrustum.java
-@@ -41 +41 @@ public class ViewFrustum
--                    this.renderChunks[j1].func_189562_a(k * 16, l * 16, i1 * 16);
-+                    this.renderChunks[j1].setPosition(k * 16, l * 16, i1 * 16);
-@@ -81 +81 @@ public class ViewFrustum
--                    renderchunk.func_189562_a(i1, i2, k1);
-+                    renderchunk.setPosition(i1, i2, k1);
-diff --git a/minecraft/client/renderer/block/model/ModelBakery.java b/minecraft/client/renderer/block/model/ModelBakery.java
-index ce26fa3..0e63e68 100644
---- a/minecraft/client/renderer/block/model/ModelBakery.java
-+++ b/minecraft/client/renderer/block/model/ModelBakery.java
-@@ -866 +866 @@ public class ModelBakery
--                textureatlassprite.clearFramesTextureData();
-+                // textureatlassprite.clearFramesTextureData();
-diff --git a/minecraft/client/renderer/block/model/ModelManager.java b/minecraft/client/renderer/block/model/ModelManager.java
-index ac21ed8..6ffada5 100644
---- a/minecraft/client/renderer/block/model/ModelManager.java
-+++ b/minecraft/client/renderer/block/model/ModelManager.java
-@@ -2,0 +3,2 @@ package net.minecraft.client.renderer.block.model;
-+import com.continuum.nova.NovaRenderer;
-+import net.minecraft.client.Minecraft;
-@@ -8,0 +11 @@ import net.minecraft.util.registry.IRegistry;
-+@SuppressWarnings("ALL")
-@@ -27,0 +31 @@ public class ModelManager implements IResourceManagerReloadListener
-+        Minecraft.getMinecraft().getNovaRenderer().addTerrainAtlas(texMap);
 diff --git a/minecraft/client/renderer/block/model/ModelResourceLocation.java b/minecraft/client/renderer/block/model/ModelResourceLocation.java
 index 13f21f3..34444f3 100644
 --- a/minecraft/client/renderer/block/model/ModelResourceLocation.java

+                        for (int[] aint1 : aint) {
+                            if(stringbuilder.length() > 0) {
+                                stringbuilder.append(", ");
@@ -361 +335 @@ public class TextureAtlasSprite
-                            return stringbuilder.toString();
+                            stringbuilder.append(aint1 == null ? "null" : Integer.valueOf(aint1.length));
@@ -362,0 +337,2 @@ public class TextureAtlasSprite
+
+                        return stringbuilder.toString();
@@ -372,6 +348,3 @@ public class TextureAtlasSprite
-    private void allocateFrameTextureData(int index)
-    {
-        if (this.framesTextureData.size() <= index)

+
+        this.textureManager.loadTickableTexture(TextureMap.LOCATION_BLOCKS_TEXTURE, this.textureMapBlocks);
+        this.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
@@ -578,2 +583,2 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        this.renderItem = new RenderItem(this.renderEngine, this.modelManager, this.itemColors);
-        this.renderManager = new RenderManager(this.renderEngine, this.renderItem);
+        this.renderItem = new RenderItem(this.textureManager, this.modelManager, this.itemColors);
+        //this.renderManager = new RenderManager(this.textureManager, this.renderItem);
@@ -590 +595 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        this.effectRenderer = new ParticleManager(this.theWorld, this.renderEngine);
+        this.effectRenderer = new ParticleManager(this.theWorld, this.textureManager);
@@ -603 +608 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        this.renderEngine.deleteTexture(this.mojangLogo);
+        this.textureManager.deleteTexture(this.mojangLogo);
@@ -776,2 +781 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-    public void displayCrashReport(CrashReport crashReportIn)
-    {
+    public void displayCrashReport(CrashReport crashReportIn) {
@@ -782,2 +786 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        if (crashReportIn.getFile() != null)
-        {
+        if(crashReportIn.getFile() != null) {
@@ -786,3 +789 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        }
-        else if (crashReportIn.saveToFile(file2))
-        {
+        } else if(crashReportIn.saveToFile(file2)) {
@@ -791,3 +792 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        }
-        else
-        {
+        } else {
@@ -799,2 +798 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-    public boolean isUnicode()
-    {
+    public boolean isUnicode() {
@@ -998,2 +996 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        if (this.currentScreen != null)
-        {
+        if (this.currentScreen != null) {
@@ -1003,2 +1000 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        if (guiScreenIn == null && this.theWorld == null)
-        {
+        if (guiScreenIn == null && this.theWorld == null) {
@@ -1006,3 +1002 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        }
-        else if (guiScreenIn == null && this.thePlayer.getHealth() <= 0.0F)
-        {
+        } else if (guiScreenIn == null && this.thePlayer.getHealth() <= 0.0F) {
@@ -1012,2 +1006 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        if (guiScreenIn instanceof GuiMainMenu || guiScreenIn instanceof GuiMultiplayer)
-        {
+        if (guiScreenIn instanceof GuiMainMenu || guiScreenIn instanceof GuiMultiplayer) {
@@ -1018 +1011 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        this.currentScreen = (GuiScreen)guiScreenIn;
+        this.currentScreen = guiScreenIn;
@@ -1020,2 +1013 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-        if (guiScreenIn != null)
-        {
+        if (guiScreenIn != null) {
@@ -1025,10 +1016,0 @@ public class Minecraft implements IThreadListener, ISnooperInfo
-            while (Mouse.next())
-            {
-                ;
