DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 64 Pull Requests Packages Releases Wiki Activity

Store cable side directly, and not relative side, to further improve cable transfer performance

Browse Source
This commit is contained in:
DBotThePony 2025-04-05 09:47:30 +07:00
parent 9a6cc53189
commit 8f9103ca48
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableBlockEntity.kt
View File

@ -115,7 +115,7 @@ abstract class EnergyCableBlockEntity(type: BlockEntityType<*>, blockPos: BlockP
val sides get() = energySides val sides get() = energySides
val currentlyTransferringTo = ObjectArraySet<Pair<Node, RelativeSide>>() val currentlyTransferringTo = ObjectArraySet<Pair<Node, CableSide>>()
override fun onNeighbour(link: Link) { override fun onNeighbour(link: Link) {
if (link is DirectionLink) { if (link is DirectionLink) {

13
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
View File

@ -74,8 +74,8 @@ private class LinkedPriorityQueue<T : Comparable<T>> {
} }
class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableGraph>() { class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableGraph>() {
private val livelyNodes = HashSet<Pair<EnergyCableBlockEntity.Node, RelativeSide>>() private val livelyNodes = HashSet<Pair<EnergyCableBlockEntity.Node, EnergyCableBlockEntity.CableSide>>()
private val livelyNodesList = ArrayList<Pair<EnergyCableBlockEntity.Node, RelativeSide>>() private val livelyNodesList = ArrayList<Pair<EnergyCableBlockEntity.Node, EnergyCableBlockEntity.CableSide>>()
fun addLivelyNode(node: EnergyCableBlockEntity.Node) { fun addLivelyNode(node: EnergyCableBlockEntity.Node) {
when (contains(node)) { when (contains(node)) {
@ -83,7 +83,7 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
ContainsStatus.DOES_NOT_BELONG -> throw IllegalArgumentException("$node does not belong to $this") ContainsStatus.DOES_NOT_BELONG -> throw IllegalArgumentException("$node does not belong to $this")
ContainsStatus.CONTAINS -> { ContainsStatus.CONTAINS -> {
for (dir in RelativeSide.entries) { for (dir in RelativeSide.entries) {
val pair = node to dir val pair = node to node.sides[dir]!!
if (livelyNodes.add(pair)) { if (livelyNodes.add(pair)) {
livelyNodesList.add(pair) livelyNodesList.add(pair)
@ -589,7 +589,7 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
override fun onNodeRemoved(node: EnergyCableBlockEntity.Node) { override fun onNodeRemoved(node: EnergyCableBlockEntity.Node) {
for (dir in RelativeSide.entries) { for (dir in RelativeSide.entries) {
val pair = node to dir val pair = node to node.sides[dir]!!
if (livelyNodes.remove(pair)) { if (livelyNodes.remove(pair)) {
check(livelyNodesList.remove(pair)) check(livelyNodesList.remove(pair))
@ -617,7 +617,7 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
override fun onNodeAdded(node: EnergyCableBlockEntity.Node) { override fun onNodeAdded(node: EnergyCableBlockEntity.Node) {
for (dir in RelativeSide.entries) { for (dir in RelativeSide.entries) {
val pair = node to dir val pair = node to node.sides[dir]!!
check(livelyNodes.add(pair)) check(livelyNodes.add(pair))
livelyNodesList.add(pair) livelyNodesList.add(pair)
} }
@ -649,8 +649,7 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
continue continue
try { try {
val (node, relSide) = pair val (node, side) = pair
val side = node.sides[relSide]!!
if (!side.isEnabled) { if (!side.isEnabled) {
indicesToRemove.add(i) indicesToRemove.add(i)