From a31de252572b06babe281c1f33924af6e6baae01 Mon Sep 17 00:00:00 2001
From: Stone <93405381+SamStone1000@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:35:00 -0500
Subject: [PATCH] Fix 2 cable rendering bugs (#350)

---
 .../java/appeng/client/render/cablebus/CableBuilder.java  | 5 ++++-
 src/main/java/appeng/parts/CableBusContainer.java         | 8 --------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java
index 6287b0408..1ff6a1976 100644
--- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java
+++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java
@@ -331,6 +331,10 @@ class CableBuilder {
         TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels((int) (channels / (AEConfig.instance().getNormalChannelCapacity() / 8)));
         TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels((int) (channels / (AEConfig.instance().getNormalChannelCapacity() / 8)));
 
+        // Thin part of connector, here to prevent the color of the channels
+        // from leaking into it
+        addCoveredCableSizedCube(facing, cubeBuilder);
+
         // For to-machine connections, use a thicker end-cap for the connection
         if (connectionType != AECableType.GLASS && !cableBusAdjacent) {
             this.addBigCoveredCableSizedCube(facing, cubeBuilder);
@@ -351,7 +355,6 @@ class CableBuilder {
             cubeBuilder.setTexture(texture);
         }
 
-        addCoveredCableSizedCube(facing, cubeBuilder);
 
         // Render the channel indicators brightly lit at night
         cubeBuilder.setRenderFullBright(true);
diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java
index 882799487..1806c972f 100644
--- a/src/main/java/appeng/parts/CableBusContainer.java
+++ b/src/main/java/appeng/parts/CableBusContainer.java
@@ -974,14 +974,6 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
                     connectionType = AECableType.min(connectionType, adjacentType);
                 }
 
-                // Check if the adjacent TE is a cable bus or not
-                if (adjacentTe instanceof IPartHost) {
-                    IPartHost host = (IPartHost) adjacentTe;
-                    if (host.getPart(facing) != null) {
-                        renderState.getCableBusAdjacent().add(facing);
-                    }
-                }
-
                 renderState.getConnectionTypes().put(facing, connectionType);
             }