From 36f0607d5e29dafa2d218fc931fde6723b749c56 Mon Sep 17 00:00:00 2001
From: Ben Spiers <ben.spiers22@gmail.com>
Date: Thu, 9 Apr 2015 02:02:38 +0100
Subject: [PATCH] Prioritise faster paths, by making cost inversely
 proportional to speed.

---
 .../mekanism/common/base/ILogisticalTransporter.java  |  2 +-
 .../content/transporter/TransporterPathfinder.java    | 11 +++--------
 .../common/multipart/MultipartTransporter.java        |  2 +-
 .../common/multipart/PartLogisticalTransporter.java   |  4 ++--
 .../common/multipart/PartRestrictiveTransporter.java  |  2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java
index e7a680eb7..e0dcae5a7 100644
--- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java
+++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java
@@ -29,5 +29,5 @@ public interface ILogisticalTransporter extends IGridTransmitter<IInventory, Inv
 
 	public boolean canReceiveFrom(TileEntity tileEntity, ForgeDirection side);
 
-	public int getCost();
+	public double getCost();
 }
diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
index 78e603ff4..b75f82d56 100644
--- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
+++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
@@ -415,17 +415,14 @@ public final class TransporterPathfinder
 				openSet.remove(currentNode);
 				closedSet.add(currentNode);
 
-				for(int i = 0; i < 6; i++)
+				for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
 				{
-					ForgeDirection direction = ForgeDirection.getOrientation(i);
 					Coord4D neighbor = currentNode.getFromSide(direction);
 
 					if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction))
 					{
 						TileEntity tile = neighbor.getTileEntity(worldObj);
-						double tentativeG = gScore.get(currentNode) + currentNode.distanceTo(neighbor);
-
-						tentativeG += ((ITransporterTile)tile).getTransmitter().getCost();
+						double tentativeG = gScore.get(currentNode) + ((ITransporterTile)tile).getTransmitter().getCost();
 
 						if(closedSet.contains(neighbor))
 						{
@@ -435,8 +432,6 @@ public final class TransporterPathfinder
 							}
 						}
 
-						TileEntity currTile = currentNode.getTileEntity(worldObj);
-
 						if(!openSet.contains(neighbor) || tentativeG < gScore.get(neighbor))
 						{
 							navMap.put(neighbor, currentNode);
@@ -445,7 +440,7 @@ public final class TransporterPathfinder
 							openSet.add(neighbor);
 						}
 					}
-					else if(neighbor.equals(finalNode) && destChecker.isValid(transportStack, i, neighbor.getTileEntity(worldObj)))
+					else if(neighbor.equals(finalNode) && destChecker.isValid(transportStack, direction.ordinal(), neighbor.getTileEntity(worldObj)))
 					{
 						side = direction;
 						results = reconstructPath(navMap, currentNode);
diff --git a/src/main/java/mekanism/common/multipart/MultipartTransporter.java b/src/main/java/mekanism/common/multipart/MultipartTransporter.java
index 95a2ca5f5..3aa394164 100644
--- a/src/main/java/mekanism/common/multipart/MultipartTransporter.java
+++ b/src/main/java/mekanism/common/multipart/MultipartTransporter.java
@@ -373,7 +373,7 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
 	}
 
 	@Override
-	public int getCost()
+	public double getCost()
 	{
 		return getPart().getCost();
 	}
diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
index cf0da9b03..b182e75c9 100644
--- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
+++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
@@ -444,8 +444,8 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
 		return (MultipartTransporter)transmitterDelegate;
 	}
 
-	public int getCost()
+	public double getCost()
 	{
-		return 1;
+		return 5.D / tier.speed;
 	}
 }
diff --git a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java
index e71630105..45cc74fd3 100644
--- a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java
+++ b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java
@@ -38,7 +38,7 @@ public class PartRestrictiveTransporter extends PartLogisticalTransporter
 	}
 
 	@Override
-	public int getCost()
+	public double getCost()
 	{
 		return 1000;
 	}