From e74e41b594585396b36f194f3237ec4ded9be787 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Sat, 15 Mar 2025 17:13:19 -0400
Subject: [PATCH] Fix Coloring

---
 .../npcs/client/gui/GuiMagicCycleMap.java       |  2 +-
 .../noppes/npcs/client/gui/util/GuiDiagram.java | 17 ++++++-----------
 .../npcs/controllers/MagicController.java       |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java b/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java
index 1c318c2be..814157302 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java
@@ -58,7 +58,7 @@ public class GuiMagicCycleMap extends GuiDiagram {
         setCurveAngle(-20);
         invalidateCache();
 
-        this.allowTwoWay = false;
+        this.allowTwoWay = true;
         this.iconSize = 20;
         this.slotSize = iconSize + slotPadding;
     }
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
index c3989c481..854199ed2 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
@@ -654,17 +654,12 @@ public abstract class GuiDiagram extends Gui {
         // Look up the reverse connection.
         DiagramConnection reverse = getConnectionByIds(conn.idTo, conn.idFrom);
         boolean twoWay = (reverse != null);
-        // Only draw the arrow once (for example, when conn.idFrom is less than conn.idTo).
-        if (twoWay && conn.idFrom > conn.idTo) {
-            return;
-        }
-
         if (!curvedArrows) {
             if (twoWay) {
                 int midX = (x1 + x2) / 2;
                 int midY = (y1 + y2) / 2;
-                int color1 = getConnectionColor(conn);
-                int color2 = getConnectionColor(reverse);
+                int color1 = getConnectionColor(reverse);
+                int color2 = getConnectionColor(conn);
                 if (!useColorScaling) {
                     color1 = color2 = 0xFFFFFFFF;
                 }
@@ -684,10 +679,10 @@ public abstract class GuiDiagram extends Gui {
             double d1 = getMinDistanceToIcon(cp1, conn);
             double d2 = getMinDistanceToIcon(cp2, conn);
             Point control = (d1 >= d2) ? cp1 : cp2;
-            int segments = 400;
+            int segments = 800;
             if (twoWay) {
-                int color1 = getConnectionColor(conn);
-                int color2 = getConnectionColor(reverse);
+                int color1 = getConnectionColor(reverse);
+                int color2 = getConnectionColor(conn);
                 if (!useColorScaling) {
                     color1 = color2 = 0xFFFFFFFF;
                 }
@@ -779,7 +774,7 @@ public abstract class GuiDiagram extends Gui {
 
 
     protected void drawArrowHead(int x1, int y1, int x2, int y2, DiagramConnection conn, boolean dim) {
-        DiagramConnection reverse = getConnectionByIds(conn.idTo, conn.idFrom);
+        DiagramConnection reverse = getConnectionByIds(conn.idFrom, conn.idTo);
         int color = (reverse != null) ? getConnectionColor(reverse) : getConnectionColor(conn);
         if (!useColorScaling)
             color = 0xFFFFFFFF;
diff --git a/src/main/java/noppes/npcs/controllers/MagicController.java b/src/main/java/noppes/npcs/controllers/MagicController.java
index 8e94689ff..e5c6be1a8 100644
--- a/src/main/java/noppes/npcs/controllers/MagicController.java
+++ b/src/main/java/noppes/npcs/controllers/MagicController.java
@@ -164,7 +164,7 @@ public class MagicController implements IMagicHandler {
             defaultCycle.id = getUnusedCycleId();
             defaultCycle.name = "Universal";
             defaultCycle.layout = EnumDiagramLayout.CIRCULAR_MANUAL;
-            defaultCycle.displayName = "Elementa Cycle";
+            defaultCycle.displayName = "&6Elementa Cycle";
             cycles.put(defaultCycle.id, defaultCycle);
 
             // Add magic associations using your old index and priority values: