From e708d3e6b281066e6ebae8f15f6572bbc1c08b6f Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Tue, 11 Feb 2025 01:17:34 +0700
Subject: [PATCH] There is no need for "greedy" strategy when searching for
 extra cable paths

---
 .../mc/otm/block/entity/cable/EnergyCableGraph.kt   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 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 2e5dbd9c0..c00d7d159 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
@@ -10,6 +10,9 @@ 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
 import ru.dbotthepony.mc.otm.core.shuffle
@@ -168,6 +171,11 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
 			private set
 
 		val availableThroughput: Decimal get() {
+			if (lastTick != UNIVERSE_TICKS) {
+				transferredLastTick = Decimal.ZERO
+				lastTick = UNIVERSE_TICKS
+			}
+
 			checkThroughput()
 			return throughput - transferredLastTick
 		}
@@ -485,16 +493,17 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
 		val maxSearches = CablesConfig.SEARCHES_PER_TICK
 
 		if (!list.saturated && lastTickSearches <= maxSearches) {
-			var maxThroughput = list.paths.maxOfOrNull { it.availableThroughput } ?: Decimal.ZERO
+			var maxThroughput = list.paths.iterator().map { it.availableThroughput }.reduce(Decimal.ZERO, Decimal::plus)
 
 			while (maxThroughput < energyToTransfer && !list.saturated && ++lastTickSearches <= maxSearches) {
+				// TODO: Heuristics here is wrong
 				val find = findPath(a, b, list.paths, maxThroughput)
 
 				if (find == null || find in list.paths) {
 					list.saturated = true
 				} else {
 					list.paths.add(find)
-					maxThroughput = maxOf(maxThroughput, find.availableThroughput)
+					maxThroughput += find.availableThroughput
 				}
 			}
 		}