From 07aab732b745883bd6ff012ab480922edcbe9bbc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 23 Feb 2018 13:59:21 -0500
Subject: [PATCH] Better tunnel debugging, improved keybind dialog controller
 info

---
 build.gradle                                  |  2 +-
 core/assets/ui/uiskin.json                    |  2 +-
 core/assets/version.properties                |  4 +--
 .../mindustry/ui/fragments/DebugFragment.java |  4 +++
 .../blocks/types/distribution/Junction.java   |  1 +
 .../types/distribution/TunnelConveyor.java    | 25 +++++++++++++++++++
 6 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 07a590ff7c..d1d219b811 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         aiVersion = '1.8.1'
-        uCoreVersion = 'b4757b5'
+        uCoreVersion = 'f484468'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json
index 5a83f28256..3dc8e615f4 100644
--- a/core/assets/ui/uiskin.json
+++ b/core/assets/ui/uiskin.json
@@ -83,7 +83,7 @@ io.anuke.ucore.scene.ui.Window$WindowStyle: {
 	dialog: {stageBackground: dialogDim, titleFont: default-font, background: window-empty, titleFontColor: accent }
 },
 io.anuke.ucore.scene.ui.KeybindDialog$KeybindDialogStyle: {
-	default: {keyColor: accent, keyNameColor: white, paneStyle: clear},
+	default: {keyColor: accent, keyNameColor: white, controllerColor: menuitem, paneStyle: clear},
 },
 io.anuke.ucore.scene.ui.Slider$SliderStyle: {
 	default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down},
diff --git a/core/assets/version.properties b/core/assets/version.properties
index 119ee80449..44e6da5af2 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Wed Feb 21 19:47:18 EST 2018
+#Fri Feb 23 13:58:57 EST 2018
 version=release
-androidBuildCode=262
+androidBuildCode=265
 name=Mindustry
 code=3.3
 build=custom build
diff --git a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
index 4e680e25bf..6a13644caf 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
@@ -59,6 +59,10 @@ public class DebugFragment implements Fragment {
                row();
                new button("wave", () -> state.wavetime = 0f);
                row();
+               new button("time 0", () -> Timers.resetTime(0f));
+               row();
+               new button("time max", () -> Timers.resetTime(1080000 - 60*10));
+               row();
                new button("clear", () -> {
                    enemyGroup.clear();
                    state.enemies = 0;
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java
index 177203884d..bfaa422cd0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java
@@ -84,6 +84,7 @@ public class Junction extends Block{
 		return new JunctionEntity();
 	}
 
+	@Override
 	public Array<Object> getDebugInfo(Tile tile){
 		JunctionEntity entity = tile.entity();
 		Array<Object> arr = super.getDebugInfo(tile);
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 c6864b138b..7106a5174a 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,5 +1,6 @@
 package io.anuke.mindustry.world.blocks.types.distribution;
 
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.NumberUtils;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.resource.Item;
@@ -90,6 +91,30 @@ public class TunnelConveyor extends Block{
 		return new TunnelEntity();
 	}
 
+	@Override
+	public Array<Object> getDebugInfo(Tile tile){
+		TunnelEntity entity = tile.entity();
+		Array<Object> arr = super.getDebugInfo(tile);
+		for(int i = 0; i < 4; i ++){
+			arr.add("nearby." + i);
+			arr.add(tile.getNearby(i));
+		}
+
+		arr.add("buffer");
+		arr.add(entity.index);
+
+		for(int i = 0; i < entity.index; i++){
+			long l = entity.items[i];
+			float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l));
+			Item item = Item.getByID(Bits.getRightInt(l));
+			Tile dest = getDestTunnel(tile, item);
+			arr.add("  buffer.item");
+			arr.add(time + " | " + item.name + " | " + dest.block() + ":" + dest.floor());
+		}
+
+		return arr;
+	}
+
 	Tile getDestTunnel(Tile tile, Item item){
 		Tile dest = tile;
 		int rel = (tile.getRotation() + 2)%4;