Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-07-01 22:56:35 +02:00
Code Issues Projects Releases Wiki Activity

improve performance of getOrderedNetworkItems

Browse source 
(see #205)
This commit is contained in:
Ell 2024-05-19 10:48:08 +02:00
parent ad981047d7
commit 6b4f86ce1a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java
View file

@ -21,6 +21,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.saveddata.SavedData; import net.minecraft.world.level.saveddata.SavedData;
import net.neoforged.neoforge.items.IItemHandler;
import net.neoforged.neoforge.network.PacketDistributor; import net.neoforged.neoforge.network.PacketDistributor;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.jgrapht.ListenableGraph; import org.jgrapht.ListenableGraph;
@ -339,7 +340,7 @@ public class PipeNetwork extends SavedData implements GraphListener<BlockPos, Ne
if (!this.isNode(node)) if (!this.isNode(node))
return Collections.emptyList(); return Collections.emptyList();
this.startProfile("get_network_items"); this.startProfile("get_network_items");
List<NetworkLocation> info = new ArrayList<>(); var ret = new HashMap<IItemHandler, NetworkLocation>();
for (var dest : this.getOrderedNetworkNodes(node)) { for (var dest : this.getOrderedNetworkNodes(node)) {
if (!this.level.isLoaded(dest)) if (!this.level.isLoaded(dest))
continue; continue;
@ -349,15 +350,15 @@ public class PipeNetwork extends SavedData implements GraphListener<BlockPos, Ne
if (handler == null || !pipe.canNetworkSee(dir, handler)) if (handler == null || !pipe.canNetworkSee(dir, handler))
continue; continue;
// check if this handler already exists (double-connected pipes, double chests etc.) // check if this handler already exists (double-connected pipes, double chests etc.)
if (info.stream().anyMatch(l -> handler.equals(l.getItemHandler(this.level)))) if (ret.containsKey(handler))
continue; continue;
var location = new NetworkLocation(dest, dir); var location = new NetworkLocation(dest, dir);
if (!location.isEmpty(this.level)) if (!location.isEmpty(this.level))
info.add(location); ret.put(handler, location);
} }
} }
this.endProfile(); this.endProfile();
return info; return new ArrayList<>(ret.values());
} }
public void createNetworkLock(NetworkLock lock) { public void createNetworkLock(NetworkLock lock) {