diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index d43f7240d..dd6f6ddd3 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; -import mekanism.client.ThreadSparkle.INodeChecker; +import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.client.entity.EntityLaser; import mekanism.client.gui.GuiAmbientAccumulator; import mekanism.client.gui.GuiChemicalCrystallizer; @@ -543,19 +543,19 @@ public class ClientProxy extends CommonProxy @Override public void doGenericSparkle(TileEntity tileEntity, INodeChecker checker) { - new ThreadSparkle(tileEntity, checker).start(); + new SparkleAnimation(tileEntity, checker).run(); } @Override public void doMultiblockSparkle(final TileEntityMultiblock tileEntity) { - new ThreadSparkle(tileEntity, new INodeChecker() { + new SparkleAnimation(tileEntity, new INodeChecker() { @Override public boolean isNode(TileEntity tile) { return MultiblockManager.areEqual(tile, tileEntity); } - }).start(); + }).run(); } @Override diff --git a/src/main/java/mekanism/client/ThreadSparkle.java b/src/main/java/mekanism/client/SparkleAnimation.java similarity index 96% rename from src/main/java/mekanism/client/ThreadSparkle.java rename to src/main/java/mekanism/client/SparkleAnimation.java index b19cf707e..8cec7a9f6 100644 --- a/src/main/java/mekanism/client/ThreadSparkle.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ThreadSparkle extends Thread +public class SparkleAnimation { public TileEntity pointer; @@ -23,13 +23,12 @@ public class ThreadSparkle extends Thread public INodeChecker nodeChecker; - public ThreadSparkle(TileEntity tileEntity, INodeChecker checker) + public SparkleAnimation(TileEntity tileEntity, INodeChecker checker) { pointer = tileEntity; nodeChecker = checker; } - @Override public void run() { try { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 6f151d26f..98dfaaca2 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -10,7 +10,7 @@ import mekanism.api.MekanismConfig.usage; import mekanism.api.Pos3D; import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.api.util.UnitDisplayUtils.TempType; -import mekanism.client.ThreadSparkle.INodeChecker; +import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.entity.EntityRobit; 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 path = new ArrayList(); public Path pathType; public ItemStack rejected; + public double score; - public Destination(ArrayList list, boolean inv, ItemStack rejects) + public Destination(ArrayList list, boolean inv, ItemStack rejects, double gScore) { path = (List)list.clone(); @@ -165,6 +166,7 @@ public final class TransporterPathfinder } rejected = rejects; + score = gScore; } public Destination setPathType(Path type) @@ -173,6 +175,20 @@ public final class TransporterPathfinder return this; } + public Destination calculateScore(World world) + { + score = 0; + for(Coord4D location : path) + { + TileEntity tile = location.getTileEntity(world); + if(tile instanceof ITransporterTile) + { + score += ((ITransporterTile)tile).getTransmitter().getCost(); + } + } + return this; + } + @Override public int hashCode() { @@ -190,16 +206,17 @@ public final class TransporterPathfinder @Override public int compareTo(Destination dest) { - if(path.size() < dest.path.size()) + if(score < dest.score) { return -1; } - else if(path.size() > dest.path.size()) + else if(score > dest.score) { return 1; } - else { - return 0; + else + { + return path.size() - dest.path.size(); } } } @@ -240,7 +257,7 @@ public final class TransporterPathfinder if(test != null) { - return new Destination(test, false, rejects); + return new Destination(test, false, rejects, 0).calculateScore(start.world()); } Pathfinder p = new Pathfinder(checker, start.world(), dest, start.coord(), stack); @@ -251,7 +268,7 @@ public final class TransporterPathfinder { PathfinderCache.cachedPaths.put(new PathData(start.coord(), dest, p.side), p.getPath()); - return new Destination(p.getPath(), false, rejects); + return new Destination(p.getPath(), false, rejects, p.finalScore); } } @@ -415,17 +432,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 +449,6 @@ public final class TransporterPathfinder } } - TileEntity currTile = currentNode.getTileEntity(worldObj); - if(!openSet.contains(neighbor) || tentativeG < gScore.get(neighbor)) { navMap.put(neighbor, currentNode); @@ -445,7 +457,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/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 68bee214d..2bb68841b 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -281,17 +281,16 @@ public class TransporterStack return 0; } - public boolean canInsertToTransporter(TileEntity tileEntity, ForgeDirection side) + public boolean canInsertToTransporter(TileEntity tileEntity, ForgeDirection from) { if(!(tileEntity instanceof ITransporterTile)) { return false; } - TileEntity from = Coord4D.get(tileEntity).getFromSide(side.getOpposite()).getTileEntity(tileEntity.getWorldObj()); ILogisticalTransporter transporter = ((ITransporterTile)tileEntity).getTransmitter(); - if(!((ITransporterTile)tileEntity).canConnectMutual(side)) + if(!((ITransporterTile)tileEntity).canConnectMutual(from.getOpposite())) { return false; } 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