upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 15:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Coloring

Browse Source
This commit is contained in:
Kam committed 2025-03-15 17:13:19 -04:00
1 parent dbe49cae10
commit e74e41b594
3 files changed
+8 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java
+1 -1
View File
@@ -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;
}
src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java
+6 -11
View File
@@ -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;
src/main/java/noppes/npcs/controllers/MagicController.java
+1 -1
View File
@@ -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: