From c686bf6149fcfccbdc5852bae09667b651c8cdbc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 2 Apr 2018 14:25:08 -0400
Subject: [PATCH] Changed tunnel buffer system (again)

---
 core/assets/version.properties                         |  4 ++--
 .../blocks/types/distribution/TunnelConveyor.java      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index 7eebac802a..b6508f8d15 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Sun Apr 01 12:07:12 EDT 2018
+#Mon Apr 02 14:23:38 EDT 2018
 version=release
-androidBuildCode=492
+androidBuildCode=493
 name=Mindustry
 code=3.5
 build=custom build
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
index ee6d9ce429..cdf94e909e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
@@ -1,10 +1,12 @@
 package io.anuke.mindustry.world.blocks.types.distribution;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.NumberUtils;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.resource.Item;
 import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.BlockBar;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.util.Bits;
@@ -21,6 +23,7 @@ public class TunnelConveyor extends Block{
 		solid = true;
 		health = 70;
 		instantTransfer = true;
+		bars.add(new BlockBar(Color.GREEN, true, tile -> (float)tile.<TunnelEntity>entity().index/capacity));
 	}
 	
 	@Override
@@ -34,11 +37,6 @@ public class TunnelConveyor extends Block{
 
 		if(entity.index >= entity.buffer.length) return;
 
-		Tile tunnel = getDestTunnel(tile, item);
-		if(tunnel == null) return;
-		Tile to = tunnel.getNearby(tunnel.getRotation());
-		if(to == null) return;
-
 		entity.buffer[entity.index ++] = Bits.packLong(NumberUtils.floatToIntBits(Timers.time()), item.id);
 	}
 
@@ -71,6 +69,8 @@ public class TunnelConveyor extends Block{
 	@Override
 	public boolean acceptItem(Item item, Tile tile, Tile source){
 		TunnelEntity entity = tile.entity();
+		int rot = source.relativeTo(tile.x, tile.y);
+		if(rot != (tile.getRotation() + 2)%4) return false;
 		return entity.index < entity.buffer.length - 1;
 	}