From b48110db3b6a7a35198cd89fe9abbb43dc4b098c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 21 Mar 2019 17:13:46 -0400
Subject: [PATCH] Fixed #431 [item spacing not taken into account]

---
 .../io/anuke/mindustry/content/Blocks.java    | 44 +++++++++----------
 .../mindustry/graphics/BlockRenderer.java     |  6 +--
 .../world/blocks/distribution/Conveyor.java   |  4 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index b58f931a4c..24e2bd5d71 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -136,6 +136,28 @@ public class Blocks implements ContentList{
             cacheLayer = CacheLayer.water;
         }};
 
+        sandWater = new Floor("sand-water"){{
+            liquidColor = Color.valueOf("596ab8");
+            speedMultiplier = 0.8f;
+            variants = 0;
+            status = StatusEffects.wet;
+            statusDuration = 50f;
+            liquidDrop = Liquids.water;
+            isLiquid = true;
+            cacheLayer = CacheLayer.water;
+        }};
+
+        darksandWater = new Floor("darksand-water"){{
+            liquidColor = Color.valueOf("596ab8");
+            speedMultiplier = 0.8f;
+            variants = 0;
+            status = StatusEffects.wet;
+            statusDuration = 50f;
+            liquidDrop = Liquids.water;
+            isLiquid = true;
+            cacheLayer = CacheLayer.water;
+        }};
+
         tar = new Floor("tar"){{
             drownTime = 150f;
             liquidColor = Color.valueOf("292929");
@@ -161,28 +183,6 @@ public class Blocks implements ContentList{
             blendGroup = stone;
         }};
 
-        sandWater = new Floor("sand-water"){{
-            liquidColor = Color.valueOf("596ab8");
-            speedMultiplier = 0.8f;
-            variants = 0;
-            status = StatusEffects.wet;
-            statusDuration = 50f;
-            liquidDrop = Liquids.water;
-            isLiquid = true;
-            cacheLayer = CacheLayer.water;
-        }};
-
-        darksandWater = new Floor("darksand-water"){{
-            liquidColor = Color.valueOf("596ab8");
-            speedMultiplier = 0.8f;
-            variants = 0;
-            status = StatusEffects.wet;
-            statusDuration = 50f;
-            liquidDrop = Liquids.water;
-            isLiquid = true;
-            cacheLayer = CacheLayer.water;
-        }};
-
         sand = new Floor("sand"){{
             itemDrop = Items.sand;
             playerUnmineable = true;
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index a12ccd624d..9384c4352c 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -73,9 +73,9 @@ public class BlockRenderer{
 
         Events.on(TileChangeEvent.class, event -> {
             int avgx = (int)(camera.position.x / tilesize);
-            int avgy = (int)(camera.position. y/ tilesize);
-            int rangex = (int) (camera.width  / tilesize / 2) + 2;
-            int rangey = (int) (camera.height  / tilesize / 2) + 2;
+            int avgy = (int)(camera.position. y / tilesize);
+            int rangex = (int) (camera.width / tilesize / 2) + 2;
+            int rangey = (int) (camera.height / tilesize / 2) + 2;
 
             if(Math.abs(avgx - event.tile.x) <= rangex && Math.abs(avgy - event.tile.y) <= rangey){
                 lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
index 92fd7c65f1..20f30e6197 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 import static io.anuke.mindustry.Vars.*;
 
 public class Conveyor extends Block{
-    private static final float itemSpace = 0.135f * 3f;
+    private static final float itemSpace = 0.4f;
     private static final float minmove = 1f / (Short.MAX_VALUE - 2);
     private static ItemPos drawpos = new ItemPos();
     private static ItemPos pos1 = new ItemPos();
@@ -60,7 +60,7 @@ public class Conveyor extends Block{
     @Override
     public void setStats(){
         super.setStats();
-        stats.add(BlockStat.itemsMoved, speed * 60, StatUnit.itemsSecond);
+        stats.add(BlockStat.itemsMoved, speed * 60 * (1f / itemSpace), StatUnit.itemsSecond);
     }
 
     @Override