From 8544368ab26496b62b09257176906d3e9305db61 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Tue, 11 Feb 2025 10:48:25 +0700
Subject: [PATCH] Update cable heuristics

---
 .../mc/otm/block/entity/cable/EnergyCableGraph.kt   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
index c00d7d159..13edd418c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
@@ -3,15 +3,12 @@ package ru.dbotthepony.mc.otm.block.entity.cable
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.ReferenceArraySet
 import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet
-import net.minecraft.core.BlockPos
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.SERVER_IS_LIVE
 import ru.dbotthepony.mc.otm.UNIVERSE_TICKS
 import ru.dbotthepony.mc.otm.capability.receiveEnergy
 import ru.dbotthepony.mc.otm.config.CablesConfig
-import ru.dbotthepony.mc.otm.core.addAll
 import ru.dbotthepony.mc.otm.core.collect.map
-import ru.dbotthepony.mc.otm.core.collect.max
 import ru.dbotthepony.mc.otm.core.collect.reduce
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.RelativeSide
@@ -493,17 +490,18 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
 		val maxSearches = CablesConfig.SEARCHES_PER_TICK
 
 		if (!list.saturated && lastTickSearches <= maxSearches) {
-			var maxThroughput = list.paths.iterator().map { it.availableThroughput }.reduce(Decimal.ZERO, Decimal::plus)
+			var maxThroughput = list.paths.maxOfOrNull { it.availableThroughput } ?: Decimal.ZERO
+			var combinedThroughput = list.paths.iterator().map { it.availableThroughput }.reduce(Decimal.ZERO, Decimal::plus)
 
-			while (maxThroughput < energyToTransfer && !list.saturated && ++lastTickSearches <= maxSearches) {
-				// TODO: Heuristics here is wrong
+			while (combinedThroughput < energyToTransfer && !list.saturated && ++lastTickSearches <= maxSearches) {
 				val find = findPath(a, b, list.paths, maxThroughput)
 
 				if (find == null || find in list.paths) {
 					list.saturated = true
 				} else {
 					list.paths.add(find)
-					maxThroughput += find.availableThroughput
+					combinedThroughput += find.availableThroughput
+					maxThroughput = maxOf(maxThroughput, find.availableThroughput)
 				}
 			}
 		}
@@ -525,7 +523,6 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
 
 		node.segment.paths.forEach {
 			pathCache.remove(it.a to it.b)
-			pathCache.remove(it.b to it.a)
 		}
 
 		node.segment.paths = ReferenceLinkedOpenHashSet()