Utterly broken 60fps rendering

core/src/io/anuke/mindustry/graphics/BlockRenderer.java

@@ -23,7 +23,7 @@ public class BlockRenderer{
     private final static int initialRequests = 32 * 32;
     private final static int expandr = 4;
 
-    private FloorRenderer floorRenderer;
+    public final FloorRenderer floor = new FloorRenderer();
 
     private Array<BlockRequest> requests = new Array<>(true, initialRequests, BlockRequest.class);
     private IntSet teamChecks = new IntSet();
@@ -34,7 +34,6 @@ public class BlockRenderer{
     private Surface shadows = Graphics.createSurface().setSize(2, 2);
 
     public BlockRenderer(){
-        floorRenderer = new FloorRenderer();
 
         for(int i = 0; i < requests.size; i++){
             requests.set(i, new BlockRequest());
@@ -222,18 +221,6 @@ public class BlockRenderer{
         }
     }
 
-    public void beginFloor(){
-        floorRenderer.beginDraw();
-    }
-
-    public void endFloor(){
-        floorRenderer.endDraw();
-    }
-
-    public void drawFloor(){
-        floorRenderer.drawFloor();
-    }
-
     private void layerBegins(Layer layer){
     }
 

core/src/io/anuke/mindustry/graphics/CacheLayer.java

@@ -65,15 +65,16 @@ public enum CacheLayer{
 
     protected void beginShader(){
         //renderer.getBlocks().endFloor();
-        renderer.effectSurface.getBuffer().bind();
+        renderer.effectSurface.getBuffer().begin();
         Graphics.clear(Color.CLEAR);
         //renderer.getBlocks().beginFloor();
     }
 
     public void endShader(Shader shader){
-        renderer.blocks.endFloor();
+        renderer.blocks.floor.endDraw();
 
-        renderer.pixelSurface.getBuffer().bind();
+        renderer.effectSurface.getBuffer().end();
+        //renderer.pixelSurface.getBuffer().bind();
 
         Graphics.shader(shader);
         Graphics.begin();
@@ -81,6 +82,6 @@ public enum CacheLayer{
                 Core.camera.viewportWidth * Core.camera.zoom, -Core.camera.viewportHeight * Core.camera.zoom);
         Graphics.end();
         Graphics.shader();
-        renderer.blocks.beginFloor();
+        renderer.blocks.floor.beginDraw();
     }
 }

core/src/io/anuke/mindustry/graphics/FloorRenderer.java

@@ -85,7 +85,7 @@ public class FloorRenderer{
 
         drawnLayers.sort();
 
-        Graphics.end();
+        //Graphics.end();
         beginDraw();
 
         for(int i = 0; i < drawnLayers.size; i++){