From 80021dd4c77354edd333a4c38ebefdbbe0d64833 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 20 Aug 2014 15:54:05 -0400 Subject: [PATCH] Work on path caching --- .../mekanism/common/InventoryNetwork.java | 39 ++++++++++++++++--- .../ILogisticalTransporter.java | 3 +- .../content/transporter/PathfinderCache.java | 14 +++---- .../transporter/TransporterPathfinder.java | 12 +++--- .../content/transporter/TransporterStack.java | 1 + .../common/multipart/MultipartMekanism.java | 2 +- .../multipart/PartLogisticalTransporter.java | 2 +- .../mekanism/common/tile/TileEntityBin.java | 2 +- .../common/tile/TileEntityDigitalMiner.java | 2 +- .../tile/TileEntityLogisticalSorter.java | 2 +- .../tile/component/TileComponentEjector.java | 2 +- .../common/util/TransporterUtils.java | 2 +- 12 files changed, 55 insertions(+), 28 deletions(-) rename src/main/java/mekanism/common/{content/transporter => base}/ILogisticalTransporter.java (92%) diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 5292dac4c..0cf568830 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -1,11 +1,12 @@ package mekanism.common; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -14,7 +15,7 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.content.transporter.ILogisticalTransporter; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.util.TransporterUtils; import net.minecraft.inventory.IInventory; @@ -51,9 +52,9 @@ public class InventoryNetwork extends DynamicNetwork calculateAcceptors(ItemStack stack, EnumColor color) + public List calculateAcceptors(ItemStack stack, EnumColor color) { - Map toReturn = new HashMap(); + List toReturn = new ArrayList(); for(Coord4D coord : ((Map)possibleAcceptors.clone()).keySet()) { @@ -65,20 +66,46 @@ public class InventoryNetwork extends DynamicNetwork sides = EnumSet.noneOf(ForgeDirection.class); + + public AcceptorData(Coord4D coord, ItemStack stack, ForgeDirection side) + { + location = coord; + rejected = stack; + sides.add(side); + } + } @Override public void onUpdate() diff --git a/src/main/java/mekanism/common/content/transporter/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java similarity index 92% rename from src/main/java/mekanism/common/content/transporter/ILogisticalTransporter.java rename to src/main/java/mekanism/common/base/ILogisticalTransporter.java index 8df78be32..13d77c0a2 100644 --- a/src/main/java/mekanism/common/content/transporter/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -1,10 +1,11 @@ -package mekanism.common.content.transporter; +package mekanism.common.base; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.InventoryNetwork; +import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 2436833ac..512719d2e 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -38,16 +38,14 @@ public class PathfinderCache public static class PathData { - public Coord4D start; - public ForgeDirection startSide; + public Coord4D startTransporter; public Coord4D end; public ForgeDirection endSide; - public PathData(Coord4D s, ForgeDirection ss, Coord4D e, ForgeDirection es) + public PathData(Coord4D s, Coord4D e, ForgeDirection es) { - start = s; - startSide = ss; + startTransporter = s; end = e; endSide = es; @@ -57,8 +55,7 @@ public class PathfinderCache public boolean equals(Object obj) { return obj instanceof PathData && - ((PathData)obj).start.equals(start) && - ((PathData)obj).startSide.equals(startSide) && + ((PathData)obj).startTransporter.equals(startTransporter) && ((PathData)obj).end.equals(end) && ((PathData)obj).endSide.equals(endSide); } @@ -67,8 +64,7 @@ public class PathfinderCache public int hashCode() { int code = 1; - code = 31 * code + start.hashCode(); - code = 31 * code + startSide.hashCode(); + code = 31 * code + startTransporter.hashCode(); code = 31 * code + end.hashCode(); code = 31 * code + endSide.hashCode(); return code; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 911f212e3..11f7e556b 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -11,6 +11,8 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.InventoryNetwork; +import mekanism.common.InventoryNetwork.AcceptorData; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.DestChecker; import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -214,18 +216,18 @@ public final class TransporterPathfinder }; InventoryNetwork network = start.getTransmitterNetwork(); - Map acceptors = network.calculateAcceptors(stack.itemStack, stack.color); + List acceptors = network.calculateAcceptors(stack.itemStack, stack.color); List paths = new ArrayList(); - for(Map.Entry entry : acceptors.entrySet()) + for(AcceptorData entry : acceptors) { - Pathfinder p = new Pathfinder(checker, start.getTile().getWorldObj(), entry.getKey(), Coord4D.get(start.getTile()), stack); + Pathfinder p = new Pathfinder(checker, start.getTile().getWorldObj(), entry.location, Coord4D.get(start.getTile()), stack); if(p.getPath().size() >= 2) { - if(TransporterManager.getToUse(stack.itemStack, entry.getValue()).stackSize >= min) + if(TransporterManager.getToUse(stack.itemStack, entry.rejected).stackSize >= min) { - paths.add(new Destination(p.getPath(), p.finalScore, false, entry.getValue())); + paths.add(new Destination(p.getPath(), p.finalScore, false, entry.rejected)); } } } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 4ea7ee65a..f8fde49a3 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -7,6 +7,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterPathfinder.Destination; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 391a479a9..bfd93c474 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -33,7 +33,7 @@ public class MultipartMekanism implements IPartFactory MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.ITransmitter"); MultipartGenerator.registerPassThroughInterface("mekanism.api.energy.IStrictEnergyAcceptor"); MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IGridTransmitter"); - MultipartGenerator.registerPassThroughInterface("mekanism.common.transporter.ILogisticalTransporter"); + MultipartGenerator.registerPassThroughInterface("mekanism.common.base.ILogisticalTransporter"); MultipartGenerator.registerPassThroughInterface("buildcraft.api.power.IPowerReceptor"); MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler"); MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable"); diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 2a1e879bd..4adb840d6 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -15,7 +15,7 @@ import mekanism.client.render.RenderPartTransmitter; import mekanism.common.HashList; import mekanism.common.InventoryNetwork; import mekanism.common.Mekanism; -import mekanism.common.content.transporter.ILogisticalTransporter; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index f1a04bc52..5d551844b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -11,7 +11,7 @@ import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IActiveState; -import mekanism.common.content.transporter.ILogisticalTransporter; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.item.ItemBlockBasic; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 6ecd2a377..fc3e99b13 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -20,6 +20,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.IActiveState; import mekanism.common.base.IAdvancedBoundingBlock; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.IUpgradeTile; @@ -29,7 +30,6 @@ import mekanism.common.content.miner.MOreDictFilter; import mekanism.common.content.miner.MinerFilter; import mekanism.common.content.miner.ThreadMinerSearch; import mekanism.common.content.miner.ThreadMinerSearch.State; -import mekanism.common.content.transporter.ILogisticalTransporter; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.inventory.container.ContainerFilter; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 8610ad76d..d9e20d202 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -12,10 +12,10 @@ import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.content.transporter.ILogisticalTransporter; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TransporterFilter; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index fb14eabe8..a3591e098 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -10,8 +10,8 @@ import mekanism.api.EnumColor; import mekanism.common.SideData; import mekanism.common.base.IEjector; import mekanism.common.base.IInvConfiguration; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITileComponent; -import mekanism.common.content.transporter.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 194390457..a8db6716e 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -7,7 +7,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.common.content.transporter.ILogisticalTransporter; +import mekanism.common.base.ILogisticalTransporter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter;