 -            this.bakedModelStore.put(entry.getKey(), this.modelManager.getModel((ModelResourceLocation)entry.getValue()));
 +            IBakedModel model = this.modelManager.getModel((ModelResourceLocation)entry.getValue());
 +            this.bakedModelStore.put(entry.getKey(), model);
+diff --git a/minecraft/client/renderer/BlockRendererDispatcher.java b/minecraft/client/renderer/BlockRendererDispatcher.java
+index 8febef5..46ce65a 100644
+--- a/minecraft/client/renderer/BlockRendererDispatcher.java
++++ b/minecraft/client/renderer/BlockRendererDispatcher.java
+@@ -146,0 +147,4 @@ public class BlockRendererDispatcher implements IResourceManagerReloadListener
++
++    public BlockFluidRenderer getFluidRenderer() {
++        return fluidRenderer;
++    }
 diff --git a/minecraft/client/renderer/EntityRenderer.java b/minecraft/client/renderer/EntityRenderer.java
 index 25e1fb8..141f265 100644
 --- a/minecraft/client/renderer/EntityRenderer.java

@@ -88 +88 @@ public class BannerTextures
-                    Minecraft.getMinecraft().getTextureManager().deleteTexture(bannertextures$cacheentry.textureLocation);
+                    Minecraft.getMinecraft().getRenderEngine().deleteTexture(bannertextures$cacheentry.textureLocation);
diff --git a/minecraft/client/renderer/BlockModelShapes.java b/minecraft/client/renderer/BlockModelShapes.java
index f5d5c85..7c86bd1 100644
--- a/minecraft/client/renderer/BlockModelShapes.java

@@ -20 +20 @@ public class VboRenderList extends ChunkRenderContainer
-                vertexbuffer.drawArrays(7);
+                buffer.drawArrays(7);
diff --git a/minecraft/client/renderer/VertexBuffer.java b/minecraft/client/renderer/VertexBuffer.java
index 2b645c1..6cca300 100644
--- a/minecraft/client/renderer/VertexBuffer.java
+++ b/minecraft/client/renderer/VertexBuffer.java
@@ -25 +25 @@ public class VertexBuffer
-    private int vertexCount;
+    protected int vertexCount;
diff --git a/minecraft/client/renderer/ViewFrustum.java b/minecraft/client/renderer/ViewFrustum.java
index 5437581..cac4763 100644
--- a/minecraft/client/renderer/ViewFrustum.java
