From c04fdd4432d9686d888cdce26c6a2d5afb88f84e Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 8 Aug 2014 00:13:17 -0400 Subject: [PATCH] Started work on PathfinderCache - this will store paths that have been already calculated for later use. When a path becomes possibly invalidated, it is removed from the cache. --- src/main/java/mekanism/common/Mekanism.java | 5 +- .../common/transporter/PathfinderCache.java | 66 +++++++++++++++++++ .../transporter/TransporterManager.java | 5 ++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 src/main/java/mekanism/common/transporter/PathfinderCache.java diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index afac76deb..f9996eccd 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -61,6 +61,7 @@ import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntitySalinationBlock; import mekanism.common.tile.TileEntitySalinationValve; +import mekanism.common.transporter.PathfinderCache; import mekanism.common.transporter.TransporterManager; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -983,8 +984,10 @@ public class Mekanism activeVibrators.clear(); worldTickHandler.resetRegenChunks(); + //Reset consistent managers MultiblockManager.reset(); - TransporterManager.flowingStacks.clear(); + TransporterManager.reset(); + PathfinderCache.reset(); } @EventHandler diff --git a/src/main/java/mekanism/common/transporter/PathfinderCache.java b/src/main/java/mekanism/common/transporter/PathfinderCache.java new file mode 100644 index 000000000..e3e2e7457 --- /dev/null +++ b/src/main/java/mekanism/common/transporter/PathfinderCache.java @@ -0,0 +1,66 @@ +package mekanism.common.transporter; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import mekanism.api.Coord4D; + +public class PathfinderCache +{ + public static Map> cachedPaths = new HashMap>(); + + public static void onChanged(Coord4D location) + { + Set toKill = new HashSet(); + + for(Map.Entry> entry : cachedPaths.entrySet()) + { + if(entry.getValue().contains(entry)) + { + toKill.add(entry.getKey()); + } + } + + for(PathData path : toKill) + { + cachedPaths.remove(path); + } + } + + public static void reset() + { + cachedPaths.clear(); + } + + public static class PathData + { + public Coord4D start; + public Coord4D end; + + public PathData(Coord4D s, Coord4D e) + { + start = s; + end = e; + } + + @Override + public boolean equals(Object obj) + { + return obj instanceof PathData && + ((PathData)obj).start.equals(start) && + ((PathData)obj).end.equals(end); + } + + @Override + public int hashCode() + { + int code = 1; + code = 31 * code + start.hashCode(); + code = 31 * code + end.hashCode(); + return code; + } + } +} diff --git a/src/main/java/mekanism/common/transporter/TransporterManager.java b/src/main/java/mekanism/common/transporter/TransporterManager.java index 291859282..e1f2d4917 100644 --- a/src/main/java/mekanism/common/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/transporter/TransporterManager.java @@ -24,6 +24,11 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class TransporterManager { public static Set flowingStacks = new HashSet(); + + public static void reset() + { + flowingStacks.clear(); + } public static void add(TransporterStack stack) {