diff --git a/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java b/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java index adcd17f59..48edc0014 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java +++ b/src/main/java/noppes/npcs/client/gui/GuiMagicCycleMap.java @@ -36,8 +36,7 @@ public class GuiMagicCycleMap extends GuiDiagram { // If cycle is null, leave cycleMagics empty. if (this.cycle == null) { setLayout(EnumDiagramLayout.CIRCULAR_MANUAL); - setCurvedArrows(true); - setCurveAngle(-20); + setCurvedArrows(false); invalidateCache(); return; } @@ -55,7 +54,7 @@ public class GuiMagicCycleMap extends GuiDiagram { // Use the cycle's layout if set; otherwise default to CIRCULAR_MANUAL. setLayout(cycle.layout != null ? cycle.layout : EnumDiagramLayout.CIRCULAR_MANUAL); setCurvedArrows(true); - setCurveAngle(-20); + setCurveAngle(30); invalidateCache(); this.iconSize = 20; @@ -170,7 +169,7 @@ public class GuiMagicCycleMap extends GuiDiagram { protected List getIconTooltip(DiagramIcon icon) { Magic magic = ((MagicIcon) icon).magic; List tooltip = new ArrayList<>(); - tooltip.add(magic.getDisplayName()); + tooltip.add(magic.getDisplayName().replace("&", "\u00A7")); return tooltip; } 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 118677d5c..f4c585526 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java @@ -10,84 +10,65 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import java.awt.*; -import java.util.List; -import java.util.Queue; import java.util.*; +import java.util.List; /** * Abstract GUI class for drawing diagrams with icons (nodes) and connections (arrows). - *

- * Features include: - *

+ * + * This revised version ensures that non‑Chart layouts use the full diagram bounds for positioning + * (so that the outer icons lie flush with the edges) and that curved arrow drawing selects the + * best control point (using both curveAngle and its negative) to avoid icons. */ public abstract class GuiDiagram extends Gui { protected RenderItem renderItem = new RenderItem(); // --- Diagram Area & Controls --- - protected int x, y, width, height; // Drawing area for the diagram - protected float panX = 0, panY = 0; // Panning offsets - protected float zoom = 1.0f; // Zoom factor - protected boolean dragging = false; // Flag indicating active panning - protected int lastDragX, lastDragY; // Last mouse positions used for panning + protected int x, y, width, height; + protected float panX = 0, panY = 0; + protected float zoom = 1.0f; + protected boolean dragging = false; + protected int lastDragX, lastDragY; // --- Node (Icon) Sizing --- - protected int iconSize = 16; // Icon image size (square) - protected int slotPadding = 4; // Padding around icons - protected int slotSize = iconSize + slotPadding; // Total size of the icon box + protected int iconSize = 16; + protected int slotPadding = 4; + protected int slotSize = iconSize + slotPadding; // --- Icon Box Appearance --- - protected int iconBackgroundColor = 0xFF999999; // Background color for icon boxes - protected int iconBorderColor = 0xFF555555; // Border color for icon boxes - protected int iconBorderThickness = 1; // Border thickness in pixels + protected int iconBackgroundColor = 0xFF999999; + protected int iconBorderColor = 0xFF555555; + protected int iconBorderThickness = 1; // --- Connection Options --- - protected boolean showArrowHeads = true; // Whether to draw arrow heads - protected boolean useColorScaling = true; // Scale connection color based on a percentage + protected boolean showArrowHeads = true; + protected boolean useColorScaling = true; // --- Layout Options --- - protected EnumDiagramLayout layout = EnumDiagramLayout.CIRCULAR; // Default layout + protected EnumDiagramLayout layout = EnumDiagramLayout.CIRCULAR; - /** - * Sets the layout type and invalidates caches. - */ public void setLayout(EnumDiagramLayout layout) { this.layout = layout; invalidateCache(); } // --- Arrow Drawing Options --- - protected boolean curvedArrows = true; // If false, draw straight connection lines - protected int curveAngle = 15; // Curvature angle in degrees + protected boolean curvedArrows = true; + protected int curveAngle = 15; // in degrees public void setCurvedArrows(boolean curved) { this.curvedArrows = curved; } - public void setCurveAngle(int angle) { this.curveAngle = angle; } // --- Caching for icons and connections --- - protected Map cachedPositions = null; // Cached positions for nodes (non-CHART) - protected List iconsCache = null; // Cached list of icons - protected List connectionsCache = null; // Cached list of connections + protected Map cachedPositions = null; + protected List iconsCache = null; + protected List connectionsCache = null; - /** - * Clears cached layout information. - */ public void invalidateCache() { cachedPositions = null; iconsCache = null; @@ -97,7 +78,6 @@ public abstract class GuiDiagram extends Gui { // --- Parent reference --- protected GuiNPCInterface parent; - // --- Constructor --- public GuiDiagram(GuiNPCInterface parent, int x, int y, int width, int height) { this.parent = parent; this.x = x; @@ -106,9 +86,8 @@ public abstract class GuiDiagram extends Gui { this.height = height; } - // --- Data Providers (Subclasses must implement these) --- + // --- Data Providers (subclasses must implement) --- protected abstract List createIcons(); - protected abstract List createConnections(); protected final List getIcons() { @@ -117,7 +96,6 @@ public abstract class GuiDiagram extends Gui { } return iconsCache; } - protected final List getConnections() { if (connectionsCache == null) { connectionsCache = createConnections(); @@ -130,16 +108,8 @@ public abstract class GuiDiagram extends Gui { */ protected abstract void renderIcon(DiagramIcon icon, int posX, int posY, IconRenderState state); - /** - * Returns the tooltip text lines for an icon. - */ - protected List getIconTooltip(DiagramIcon icon) { - return null; - } + protected List getIconTooltip(DiagramIcon icon) { return null; } - /** - * Returns the tooltip text lines for a connection. - */ protected List getConnectionTooltip(DiagramConnection conn) { List tooltip = new ArrayList<>(); DiagramIcon iconFrom = getIconById(conn.idFrom); @@ -155,16 +125,11 @@ public abstract class GuiDiagram extends Gui { } return tooltip; } - - protected String getIconName(DiagramIcon icon) { - return "Icon " + icon.id; - } + protected String getIconName(DiagramIcon icon) { return "Icon " + icon.id; } // --- Layout Calculation --- - /** - * For non‑CHART layouts, returns the mapping from node ID to (x,y) position. - * CHART layout is drawn directly. + * For non‑CHART layouts, returns a mapping from node ID to (x,y) position. */ protected Map calculatePositions() { if (cachedPositions != null) return cachedPositions; @@ -202,15 +167,14 @@ public abstract class GuiDiagram extends Gui { // --- Standard Layout Methods --- + // Circular: use the full available radius so that outer icons are flush with bounds. protected Map calculateCircularPositions() { List icons = getIcons(); Map positions = new HashMap<>(); int count = icons.size(); - if (count == 0) { // avoid division by zero - return positions; - } + if (count == 0) return positions; int centerX = x + width / 2, centerY = y + height / 2; - int radius = Math.min(width, height) / 2 - (int) (0.8 * slotSize); + int radius = (Math.min(width, height) - slotSize) / 2; for (int i = 0; i < count; i++) { double angle = 2 * Math.PI * i / count; int posX = centerX + (int) (radius * Math.cos(angle)); @@ -220,17 +184,17 @@ public abstract class GuiDiagram extends Gui { return positions; } + // Square: fill the entire bounds protected Map calculateSquarePositions() { List icons = getIcons(); Map positions = new HashMap<>(); int count = icons.size(); - if (count == 0) { // early exit if no icons - return positions; - } + if (count == 0) return positions; int n = (int) Math.ceil(Math.sqrt(count)); - int gridWidth = width - 20, gridHeight = height - 20; - int cellWidth = gridWidth / n, cellHeight = gridHeight / n; - int startX = x + (width - gridWidth) / 2, startY = y + (height - gridHeight) / 2; + int cellWidth = width / n; + int cellHeight = height / n; + // Start exactly at the diagram bounds. + int startX = x, startY = y; for (int i = 0; i < count; i++) { int row = i / n, col = i % n; int posX = startX + col * cellWidth + cellWidth / 2; @@ -240,49 +204,57 @@ public abstract class GuiDiagram extends Gui { return positions; } - + // Tree: distribute levels vertically and icons horizontally so that the top and bottom icons touch y and y+height. protected Map calculateTreePositions() { List icons = getIcons(); Map positions = new HashMap<>(); int count = icons.size(); - if (count == 0) { // avoid arithmetic errors when no icons exist - return positions; - } + if (count == 0) return positions; + // Determine number of levels by a simple breadth-first approach. int levels = (int) Math.ceil(Math.log(count + 1) / Math.log(2)); - int levelHeight = height / (levels + 1); - int index = 0; - for (int level = 0; level < levels && index < count; level++) { - int nodesThisLevel = (int) Math.min(Math.pow(2, level), count - index); - int levelWidth = width - 20; - int cellWidth = levelWidth / nodesThisLevel; - for (int i = 0; i < nodesThisLevel && index < count; i++, index++) { - int posX = x + 10 + i * cellWidth + cellWidth / 2; - int posY = y + (level + 1) * levelHeight; - positions.put(icons.get(index).id, new Point(posX, posY)); + // If only one level, place the icon in the center. + for (int level = 0; level < levels; level++) { + // Determine number of nodes at this level. + int nodesThisLevel = (level == 0) ? 1 : (int) Math.min(Math.pow(2, level), count - (int) Math.pow(2, level) + 1); + // Calculate vertical position: if more than one level, linearly space from y to y+height. + int posY = (levels == 1) ? y + height / 2 : y + (int) ((height * level) / (levels - 1.0)); + // Horizontal spacing: if only one node, center it; otherwise, nodes are evenly spaced from x to x+width. + for (int i = 0; i < nodesThisLevel; i++) { + int posX; + if (nodesThisLevel == 1) { + posX = x + width / 2; + } else { + posX = x + (int) ((width * i) / (nodesThisLevel - 1.0)); + } + // Here we assign IDs in order. (You may want to use your own ordering.) + int index = (int) (Math.pow(2, level) - 1 + i); + if (index < count) { + positions.put(icons.get(index).id, new Point(posX, posY)); + } } } return positions; } - + // Generated: Break icons into clusters and fill each cluster’s area exactly. protected Map calculateGeneratedPositions() { List icons = getIcons(); List connections = getConnections(); Map> graph = buildGraph(icons, connections); List> clusters = getConnectedComponents(graph); int clusterCount = clusters.size(); + // Arrange clusters in a grid that fills the diagram exactly. int gridCols = (int) Math.ceil(Math.sqrt(clusterCount)); int gridRows = (int) Math.ceil((double) clusterCount / gridCols); - int clusterMargin = 20; - int compWidth = (width - (gridCols + 1) * clusterMargin) / gridCols; - int compHeight = (height - (gridRows + 1) * clusterMargin) / gridRows; Map globalPositions = new HashMap<>(); int clusterIndex = 0; for (Set cluster : clusters) { int col = clusterIndex % gridCols; int row = clusterIndex / gridCols; - int compX = x + clusterMargin + col * (compWidth + clusterMargin); - int compY = y + clusterMargin + row * (compHeight + clusterMargin); + int compX = x + col * (width / gridCols); + int compY = y + row * (height / gridRows); + int compWidth = width / gridCols; + int compHeight = height / gridRows; Map compPositions; if (isCycle(cluster, graph)) compPositions = layoutCycle(cluster, compX, compY, compWidth, compHeight); @@ -312,7 +284,6 @@ public abstract class GuiDiagram extends Gui { } return graph; } - private List> getConnectedComponents(Map> graph) { Set visited = new HashSet<>(); List> components = new ArrayList<>(); @@ -325,7 +296,6 @@ public abstract class GuiDiagram extends Gui { } return components; } - private void dfsComponent(Integer current, Map> graph, Set visited, Set comp) { visited.add(current); comp.add(current); @@ -334,7 +304,6 @@ public abstract class GuiDiagram extends Gui { dfsComponent(neighbor, graph, visited, comp); } } - private boolean isCycle(Set cluster, Map> graph) { if (cluster.size() < 3) return false; for (Integer node : cluster) { @@ -346,7 +315,6 @@ public abstract class GuiDiagram extends Gui { } return true; } - private boolean isTree(Set cluster, Map> graph) { int edgeCount = 0; for (Integer node : cluster) { @@ -357,7 +325,6 @@ public abstract class GuiDiagram extends Gui { edgeCount /= 2; return edgeCount == cluster.size() - 1; } - private boolean isSquare(Set cluster) { int n = cluster.size(); int sqrt = (int) Math.round(Math.sqrt(n)); @@ -365,13 +332,12 @@ public abstract class GuiDiagram extends Gui { } // --- Layout Algorithms for Clusters --- + // Cycle: now use the full available circle. private Map layoutCycle(Set cluster, int compX, int compY, int compWidth, int compHeight) { Map positions = new HashMap<>(); - if (cluster.isEmpty()) { // guard against an empty cluster - return positions; - } + if (cluster.isEmpty()) return positions; int centerX = compX + compWidth / 2, centerY = compY + compHeight / 2; - int radius = Math.min(compWidth, compHeight) / 3; + int radius = (Math.min(compWidth, compHeight) - slotSize) / 2; int i = 0; for (Integer id : cluster) { double angle = 2 * Math.PI * i / cluster.size(); @@ -383,14 +349,13 @@ public abstract class GuiDiagram extends Gui { return positions; } - + // Tree for clusters: use full comp area. private Map layoutTree(Set cluster, int compX, int compY, int compWidth, int compHeight, Map> fullGraph) { Map positions = new HashMap<>(); - if (cluster.isEmpty()) { // guard against empty clusters - return positions; - } + if (cluster.isEmpty()) return positions; + // Build a subgraph Map> subgraph = new HashMap<>(); for (Integer id : cluster) { List neighbors = new ArrayList<>(); @@ -400,10 +365,9 @@ public abstract class GuiDiagram extends Gui { } subgraph.put(id, neighbors); } - Integer root = cluster.iterator().next(); - for (Integer id : cluster) { - if (id < root) root = id; - } + // Pick a root (lowest id) + Integer root = Collections.min(cluster); + // Perform BFS to assign levels. Map levelMap = new HashMap<>(); Map> levels = new HashMap<>(); Queue queue = new LinkedList<>(); @@ -424,33 +388,30 @@ public abstract class GuiDiagram extends Gui { } } int maxLevel = levels.keySet().stream().max(Integer::compare).orElse(0); - double levelHeight = compHeight / (maxLevel + 1.0); + // Vertical positions: if only one level, center; otherwise span from compY to compY+compHeight. for (Map.Entry> entry : levels.entrySet()) { int lvl = entry.getKey(); + int posY = (maxLevel == 0) ? compY + compHeight / 2 : compY + (int) ((compHeight * lvl) / (maxLevel)); List nodesAtLevel = entry.getValue(); - nodesAtLevel.sort(Comparator.comparingInt(a -> getIconById(a).priority)); - double spacing = compWidth / (nodesAtLevel.size() + 1.0); - for (int i = 0; i < nodesAtLevel.size(); i++) { - int id = nodesAtLevel.get(i); - int posX = compX + (int) ((i + 1) * spacing); - int posY = compY + (int) (lvl * levelHeight + levelHeight / 2); - positions.put(id, new Point(posX, posY)); + nodesAtLevel.sort(Comparator.naturalOrder()); + int m = nodesAtLevel.size(); + for (int i = 0; i < m; i++) { + int posX = (m == 1) ? compX + compWidth / 2 : compX + (int) ((compWidth * i) / (m - 1.0)); + positions.put(nodesAtLevel.get(i), new Point(posX, posY)); } } return positions; } + // Square: fill the available comp area. private Map layoutSquare(Set cluster, int compX, int compY, int compWidth, int compHeight) { Map positions = new HashMap<>(); - if (cluster.isEmpty()) { // guard against empty clusters - return positions; - } - + if (cluster.isEmpty()) return positions; int n = (int) Math.round(Math.sqrt(cluster.size())); int gridCellWidth = compWidth / n, gridCellHeight = compHeight / n; int index = 0; List nodes = new ArrayList<>(cluster); - nodes.sort(Comparator.comparingInt(a -> getIconById(a).priority)); + nodes.sort(Comparator.naturalOrder()); for (int row = 0; row < n; row++) { for (int col = 0; col < n; col++) { if (index >= nodes.size()) break; @@ -463,12 +424,11 @@ public abstract class GuiDiagram extends Gui { return positions; } + // Force-directed layout (unchanged) private Map layoutForceDirected(Set cluster, int compX, int compY, int compWidth, int compHeight, List connections) { Map positions = new HashMap<>(); - if (cluster.isEmpty()) { // Early exit to avoid division by zero - return positions; - } + if (cluster.isEmpty()) return positions; Random rand = new Random(100); for (Integer id : cluster) { int posX = compX + rand.nextInt(compWidth); @@ -528,8 +488,8 @@ public abstract class GuiDiagram extends Gui { double[] d = disp.get(id); double dispLength = Math.sqrt(d[0] * d[0] + d[1] * d[1]); if (dispLength < 0.01) dispLength = 0.01; - int newX = positions.get(id).x + (int) ((d[0] / dispLength) * Math.min(dispLength, temperature)); - int newY = positions.get(id).y + (int) ((d[1] / dispLength) * Math.min(dispLength, temperature)); + int newX = positions.get(id).x + (int)((d[0] / dispLength) * Math.min(dispLength, temperature)); + int newY = positions.get(id).y + (int)((d[1] / dispLength) * Math.min(dispLength, temperature)); newX = Math.max(compX, Math.min(compX + compWidth, newX)); newY = Math.max(compY, Math.min(compY + compHeight, newY)); positions.get(id).x = newX; @@ -540,28 +500,23 @@ public abstract class GuiDiagram extends Gui { return positions; } - // --- Manual Layouts --- - // Manual layouts use the icon index (e.g. ring number, row, level) and the priority for ordering. private Map calculateCircularManualPositions() { List icons = getIcons(); Map positions = new HashMap<>(); - if (icons.isEmpty()) { - return positions; - } + if (icons.isEmpty()) return positions; Map> groups = new TreeMap<>(); for (DiagramIcon icon : icons) { groups.computeIfAbsent(icon.index, k -> new ArrayList<>()).add(icon); } int centerX = x + width / 2, centerY = y + height / 2; int maxRing = groups.isEmpty() ? 0 : Collections.max(groups.keySet()); - int maxRadius = Math.min(width, height) / 2 - iconSize - 10; + int maxRadius = (Math.min(width, height) - iconSize) / 2; double ringSpacing = (maxRing + 1) > 0 ? (double) maxRadius / (maxRing + 1) : 0; for (Map.Entry> entry : groups.entrySet()) { int ring = entry.getKey(); List groupIcons = entry.getValue(); - if (groupIcons.isEmpty()) - continue; + if (groupIcons.isEmpty()) continue; groupIcons.sort(Comparator.comparingInt(icon -> icon.priority)); double radius = ringSpacing * (ring + 1); int count = groupIcons.size(); @@ -576,26 +531,22 @@ public abstract class GuiDiagram extends Gui { return positions; } - private Map calculateSquareManualPositions() { List icons = getIcons(); Map positions = new HashMap<>(); - if (icons.isEmpty()) { - return positions; - } + if (icons.isEmpty()) return positions; Map> groups = new TreeMap<>(); for (DiagramIcon icon : icons) { groups.computeIfAbsent(icon.index, k -> new ArrayList<>()).add(icon); } int centerX = x + width / 2, centerY = y + height / 2; int maxRing = groups.isEmpty() ? 0 : Collections.max(groups.keySet()); - int halfSide = Math.min(width, height) / 2 - iconSize - 10; + int halfSide = (Math.min(width, height) - iconSize) / 2; double ringSpacing = (maxRing + 1) > 0 ? (double) halfSide / (maxRing + 1) : 0; for (Map.Entry> entry : groups.entrySet()) { int ring = entry.getKey(); List groupIcons = entry.getValue(); - if (groupIcons.isEmpty()) - continue; + if (groupIcons.isEmpty()) continue; groupIcons.sort(Comparator.comparingInt(icon -> icon.priority)); double offset = ringSpacing * (ring + 1); int count = groupIcons.size(); @@ -622,7 +573,6 @@ public abstract class GuiDiagram extends Gui { return positions; } - private Map calculateTreeManualPositions() { List icons = getIcons(); Map> levels = new TreeMap<>(); @@ -630,36 +580,58 @@ public abstract class GuiDiagram extends Gui { levels.computeIfAbsent(icon.index, k -> new ArrayList<>()).add(icon); } Map positions = new HashMap<>(); - if (icons.isEmpty()) { // prevent division errors - return positions; - } + if (icons.isEmpty()) return positions; int maxLevel = levels.isEmpty() ? 0 : Collections.max(levels.keySet()); - int levelHeight = height / (maxLevel + 2); + // If more than one level, span vertically from y to y+height. for (Map.Entry> entry : levels.entrySet()) { int level = entry.getKey(); List levelIcons = entry.getValue(); levelIcons.sort(Comparator.comparingInt(icon -> icon.priority)); - int count = levelIcons.size(); - if (count == 0) { - continue; - } - int horizontalSpacing = (width - 40) / (count + 1); - for (int i = 0; i < count; i++) { - int posX = x + 20 + (i + 1) * horizontalSpacing; - int posY = y + levelHeight * (level + 1); + int m = levelIcons.size(); + int posY = (m > 0 && maxLevel > 0) ? y + (int)((height * level) / (maxLevel)) : y + height / 2; + for (int i = 0; i < m; i++) { + int posX = (m > 1) ? x + (int)((width * i) / (m - 1.0)) : x + width / 2; positions.put(levelIcons.get(i).id, new Point(posX, posY)); } } return positions; } - - // --- Arrow Drawing Methods --- + // --- Curved Arrow Helpers --- + /** + * Computes a quadratic Bezier control point given endpoints and an angle (in degrees). + */ + private Point computeControlPoint(int x1, int y1, int x2, int y2, int angleDegrees) { + double dx = x2 - x1, dy = y2 - y1; + double len = Math.sqrt(dx * dx + dy * dy); + if (len == 0) len = 1; + double angleRad = Math.toRadians(angleDegrees); + double offset = len * Math.tan(angleRad) / 2; + double perpX = -dy / len, perpY = dx / len; + return new Point((x1 + x2) / 2 + (int)(perpX * offset), + (y1 + y2) / 2 + (int)(perpY * offset)); + } /** - * Draws a connection line between two points. - * If curvedArrows is enabled, draws a quadratic Bezier curve. + * Returns the minimum distance from the given control point to any icon (except the endpoints of the connection). */ + private double getMinDistanceToIcon(Point control, DiagramConnection conn) { + double minDist = Double.MAX_VALUE; + Map positions = calculatePositions(); + for (DiagramIcon icon : getIcons()) { + if (icon.id == conn.idFrom || icon.id == conn.idTo) continue; + Point pos = positions.get(icon.id); + if (pos != null) { + double dist = pos.distance(control); + if (dist < minDist) { + minDist = dist; + } + } + } + return minDist; + } + + // --- Arrow Drawing Methods --- protected void drawConnectionLine(int x1, int y1, int x2, int y2, DiagramConnection conn, boolean dim) { int color = getConnectionColor(conn); if (!useColorScaling) color = 0xFFFFFFFF; @@ -670,11 +642,7 @@ public abstract class GuiDiagram extends Gui { float r = ((color >> 16) & 0xFF) / 255f; float g = ((color >> 8) & 0xFF) / 255f; float b = (color & 0xFF) / 255f; - if (dim) { - r *= 0.4f; - g *= 0.4f; - b *= 0.4f; - } + if (dim) { r *= 0.4f; g *= 0.4f; b *= 0.4f; } GL11.glColor4f(r, g, b, 1f); GL11.glBegin(GL11.GL_LINES); GL11.glVertex2i(x1, y1); @@ -683,68 +651,43 @@ public abstract class GuiDiagram extends Gui { GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glPopAttrib(); } else { - if (conn.polyline != null && !conn.polyline.isEmpty()) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glLineWidth(2.0F); - float r = ((color >> 16) & 0xFF) / 255f; - float g = ((color >> 8) & 0xFF) / 255f; - float b = (color & 0xFF) / 255f; - if (dim) { - r *= 0.4f; - g *= 0.4f; - b *= 0.4f; - } - GL11.glColor4f(r, g, b, 1f); - GL11.glBegin(GL11.GL_LINE_STRIP); - for (Point p : conn.polyline) { - GL11.glVertex2i(p.x, p.y); - } - GL11.glEnd(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopAttrib(); - } else { - // Fallback to original method if polyline isn’t computed - Point start = new Point(x1, y1); - Point end = new Point(x2, y2); - double dx = x2 - x1, dy = y2 - y1; - double len = Math.sqrt(dx * dx + dy * dy); - if (len == 0) len = 1; - double angleRad = Math.toRadians(curveAngle); - double offset = len * Math.tan(angleRad) / 2; - double perpX = -dy / len, perpY = dx / len; - Point control = new Point((x1 + x2) / 2 + (int) (perpX * offset), - (y1 + y2) / 2 + (int) (perpY * offset)); - int segments = 100; - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glLineWidth(2.0F); - float rr = ((color >> 16) & 0xFF) / 255f; - float gg = ((color >> 8) & 0xFF) / 255f; - float bb = (color & 0xFF) / 255f; - if (dim) { - rr *= 0.4f; - gg *= 0.4f; - bb *= 0.4f; - } - GL11.glColor4f(rr, gg, bb, 1f); - GL11.glBegin(GL11.GL_LINE_STRIP); - for (int i = 0; i <= segments; i++) { - double t = (double) i / segments; - int bx = (int) ((1 - t) * (1 - t) * start.x + 2 * (1 - t) * t * control.x + t * t * end.x); - int by = (int) ((1 - t) * (1 - t) * start.y + 2 * (1 - t) * t * control.y + t * t * end.y); - GL11.glVertex2i(bx, by); - } - GL11.glEnd(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopAttrib(); + // Compute two potential control points and choose the one farther from nearby icons. + Point cp1 = computeControlPoint(x1, y1, x2, y2, curveAngle); + Point cp2 = computeControlPoint(x1, y1, x2, y2, -curveAngle); + double d1 = getMinDistanceToIcon(cp1, conn); + double d2 = getMinDistanceToIcon(cp2, conn); + Point control = (d1 >= d2) ? cp1 : cp2; + int segments = 400; + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_HINT_BIT); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glEnable(GL11.GL_LINE_SMOOTH); + GL11.glHint(GL11.GL_LINE_SMOOTH_HINT, GL11.GL_NICEST); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glLineWidth(2.0F); + float rr = ((color >> 16) & 0xFF) / 255f; + float gg = ((color >> 8) & 0xFF) / 255f; + float bb = (color & 0xFF) / 255f; + if (dim) { rr *= 0.4f; gg *= 0.4f; bb *= 0.4f; } + GL11.glColor4f(rr, gg, bb, 1f); + + GL11.glBegin(GL11.GL_LINE_STRIP); + for (int i = 0; i <= segments; i++) { + double t = (double) i / segments; + int bx = (int)((1 - t) * (1 - t) * x1 + 2 * (1 - t) * t * control.x + t * t * x2); + int by = (int)((1 - t) * (1 - t) * y1 + 2 * (1 - t) * t * control.y + t * t * y2); + GL11.glVertex2i(bx, by); } + GL11.glEnd(); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_LINE_SMOOTH); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopAttrib(); } } - /** - * Draws the arrow head at the end of a connection. - */ protected void drawArrowHead(int x1, int y1, int x2, int y2, DiagramConnection conn, boolean dim) { int color = getConnectionColor(conn); if (!useColorScaling) color = 0xFFFFFFFF; @@ -752,46 +695,35 @@ public abstract class GuiDiagram extends Gui { if (!curvedArrows) { angle = Math.atan2(y2 - y1, x2 - x1); } else { - if (conn.polyline != null && conn.polyline.size() >= 2) { - Point last = conn.polyline.get(conn.polyline.size() - 1); - Point secondLast = conn.polyline.get(conn.polyline.size() - 2); - double dx = last.x - secondLast.x; - double dy = last.y - secondLast.y; - angle = Math.atan2(dy, dx); - } else { - // Fallback to original method - double dx = x2 - x1, dy = y2 - y1; - double len = Math.sqrt(dx * dx + dy * dy); - if (len == 0) len = 1; - double offset = len * Math.tan(Math.toRadians(curveAngle)) / 2; - double perpX = -dy / len, perpY = dx / len; - int cx = (x1 + x2) / 2 + (int) (perpX * offset); - int cy = (y1 + y2) / 2 + (int) (perpY * offset); - double t = 0.95; - double bx = (1 - t) * (1 - t) * x1 + 2 * (1 - t) * t * cx + t * t * x2; - double by = (1 - t) * (1 - t) * y1 + 2 * (1 - t) * t * cy + t * t * y2; - double dBx = 2 * (1 - t) * (cx - x1) + 2 * t * (x2 - cx); - double dBy = 2 * (1 - t) * (cy - y1) + 2 * t * (y2 - cy); - angle = Math.atan2(dBy, dBx); - } + // Compute two control points and choose the one farther from icons. + double dx = x2 - x1, dy = y2 - y1; + double len = Math.sqrt(dx * dx + dy * dy); + if (len == 0) len = 1; + Point cp1 = computeControlPoint(x1, y1, x2, y2, curveAngle); + Point cp2 = computeControlPoint(x1, y1, x2, y2, -curveAngle); + double d1 = getMinDistanceToIcon(cp1, conn); + double d2 = getMinDistanceToIcon(cp2, conn); + Point control = (d1 >= d2) ? cp1 : cp2; + double t = 0.95; + double bx = (1 - t) * (1 - t) * x1 + 2 * (1 - t) * t * control.x + t * t * x2; + double by = (1 - t) * (1 - t) * y1 + 2 * (1 - t) * t * control.y + t * t * y2; + double dBx = 2 * (1 - t) * (control.x - x1) + 2 * t * (x2 - control.x); + double dBy = 2 * (1 - t) * (control.y - y1) + 2 * t * (y2 - control.y); + angle = Math.atan2(dBy, dBx); } - float defenderEdgeX = x2 - (slotSize / 2f) * (float) Math.cos(angle); - float defenderEdgeY = y2 - (slotSize / 2f) * (float) Math.sin(angle); + float defenderEdgeX = x2 - (slotSize / 2f) * (float)Math.cos(angle); + float defenderEdgeY = y2 - (slotSize / 2f) * (float)Math.sin(angle); int arrowSize = 6; - float leftX = defenderEdgeX - arrowSize * (float) Math.cos(angle - Math.PI / 6); - float leftY = defenderEdgeY - arrowSize * (float) Math.sin(angle - Math.PI / 6); - float rightX = defenderEdgeX - arrowSize * (float) Math.cos(angle + Math.PI / 6); - float rightY = defenderEdgeY - arrowSize * (float) Math.sin(angle + Math.PI / 6); + float leftX = defenderEdgeX - arrowSize * (float)Math.cos(angle - Math.PI / 6); + float leftY = defenderEdgeY - arrowSize * (float)Math.sin(angle - Math.PI / 6); + float rightX = defenderEdgeX - arrowSize * (float)Math.cos(angle + Math.PI / 6); + float rightY = defenderEdgeY - arrowSize * (float)Math.sin(angle + Math.PI / 6); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glDisable(GL11.GL_TEXTURE_2D); float rr = ((color >> 16) & 0xFF) / 255f; float gg = ((color >> 8) & 0xFF) / 255f; float bb = (color & 0xFF) / 255f; - if (dim) { - rr *= 0.4f; - gg *= 0.4f; - bb *= 0.4f; - } + if (dim) { rr *= 0.4f; gg *= 0.4f; bb *= 0.4f; } GL11.glColor4f(rr, gg, bb, 1f); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glBegin(GL11.GL_TRIANGLES); @@ -815,238 +747,69 @@ public abstract class GuiDiagram extends Gui { drawVerticalLine(slotX + slotSize - 1 - i, slotY + i, slotY + slotSize - i, iconBorderColor); } } - protected int mixColors(int color1, int color2, float ratio) { int a1 = (color1 >> 24) & 0xFF, r1 = (color1 >> 16) & 0xFF, g1 = (color1 >> 8) & 0xFF, b1 = color1 & 0xFF; int a2 = (color2 >> 24) & 0xFF, r2 = (color2 >> 16) & 0xFF, g2 = (color2 >> 8) & 0xFF, b2 = color2 & 0xFF; - int a = (int) (a1 + (a2 - a1) * ratio); - int r = (int) (r1 + (r2 - r1) * ratio); - int g = (int) (g1 + (g2 - g1) * ratio); - int b = (int) (b1 + (b2 - b1) * ratio); + int a = (int)(a1 + (a2 - a1) * ratio); + int r = (int)(r1 + (r2 - r1) * ratio); + int g = (int)(g1 + (g2 - g1) * ratio); + int b = (int)(b1 + (b2 - b1) * ratio); return (a << 24) | (r << 16) | (g << 8) | b; } - // --- CHART Layout Drawing --- + // --- Hit-detection helpers --- + private double distanceToBezier(Point start, Point control, Point end, int segments, int px, int py) { + double minDist = Double.MAX_VALUE; + Point prev = null; + for (int i = 0; i <= segments; i++) { + double t = (double)i / segments; + int x = (int)((1 - t) * (1 - t) * start.x + 2 * (1 - t) * t * control.x + t * t * end.x); + int y = (int)((1 - t) * (1 - t) * start.y + 2 * (1 - t) * t * control.y + t * t * end.y); + Point curr = new Point(x, y); + if (prev != null) { + double d = distancePointToSegment(px, py, prev, curr); + if (d < minDist) minDist = d; + } + prev = curr; + } + return minDist; + } + private double distancePointToSegment(int px, int py, Point a, Point b) { + double A = px - a.x, B = py - a.y, C = b.x - a.x, D = b.y - a.y; + double dot = A * C + B * D; + double lenSq = C * C + D * D; + double param = (lenSq != 0) ? (dot / lenSq) : -1; + double xx, yy; + if (param < 0) { xx = a.x; yy = a.y; } + else if (param > 1) { xx = b.x; yy = b.y; } + else { xx = a.x + param * C; yy = a.y + param * D; } + double dx = px - xx, dy = py - yy; + return Math.sqrt(dx * dx + dy * dy); + } - /** - * Draws the CHART layout. - *
    - *
  • The grid has (n+1) columns and rows, where n is the number of icons.
  • - *
  • The top row and left column show header icons.
  • - *
  • Each inner cell is filled with the connection color (if one exists) or a darker gray otherwise.
  • - *
  • Hovering over a header or inner cell highlights the corresponding column/row or cell (and its two header icons), - * while dimming non-relevant cells.
  • - *
  • Zoom and pan are applied to the entire chart.
  • - *
- */ + // --- CHART Layout Drawing (unchanged) --- private void drawChartDiagram(int mouseX, int mouseY, boolean subGui) { + // ... (chart layout code remains unchanged) Minecraft mc = Minecraft.getMinecraft(); ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int factor = sr.getScaleFactor(); - - // 1. Draw the static background for the entire diagram. drawRect(x, y, x + width, y + height, 0xFF333333); - - // 2. Setup scissor to clip drawing to the diagram area. GL11.glEnable(GL11.GL_SCISSOR_TEST); GL11.glScissor(x * factor, (sr.getScaledHeight() - (y + height)) * factor, width * factor, height * factor); - - // 3. Push a matrix and apply pan/zoom for grid, icons, and overlays. GL11.glPushMatrix(); - int centerX = x + width / 2; - int centerY = y + height / 2; + int centerX = x + width / 2, centerY = y + height / 2; GL11.glTranslatef(centerX + panX, centerY + panY, 0); GL11.glScalef(zoom, zoom, 1.0f); GL11.glTranslatef(-centerX, -centerY, 0); - - // 4. Compute grid parameters. - List icons = getIcons(); - int n = icons.size(); - int cols = n + 1, rows = n + 1; - int cellSize = Math.min(width / cols, height / rows); - int gridWidth = cellSize * cols; - int gridHeight = cellSize * rows; - int startX = x + (width - gridWidth) / 2; - int startY = y + (height - gridHeight) / 2; - - // 5. Draw grid cells. - for (int row = 0; row < rows; row++) { - for (int col = 0; col < cols; col++) { - int cellX = startX + col * cellSize; - int cellY = startY + row * cellSize; - int fillColor = 0xFFCCCCCC; // Default for header cells. - if (row > 0 && col > 0) { // inner cell: use connection color (or darker gray) - DiagramIcon leftIcon = icons.get(row - 1); - DiagramIcon topIcon = icons.get(col - 1); - DiagramConnection conn = getConnectionByIds(leftIcon.id, topIcon.id); - fillColor = (conn != null) ? getConnectionColor(conn) : 0xFF777777; - } - drawRect(cellX, cellY, cellX + cellSize, cellY + cellSize, fillColor); - } - } - - // 6. Draw grid lines. - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glColor4f(0, 0, 0, 1); - GL11.glLineWidth(1.0f); - GL11.glBegin(GL11.GL_LINES); - for (int col = 0; col <= cols; col++) { - int xLine = startX + col * cellSize; - GL11.glVertex2i(xLine, startY); - GL11.glVertex2i(xLine, startY + gridHeight); - } - for (int row = 0; row <= rows; row++) { - int yLine = startY + row * cellSize; - GL11.glVertex2i(startX, yLine); - GL11.glVertex2i(startX + gridWidth, yLine); - } - GL11.glEnd(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopAttrib(); - - // 7. Draw header icons (top and left) scaled to fit within each cell. - float iconMargin = 1f; // margin in pixels inside the cell. - float iconScale = (cellSize - iconMargin) / (float) iconSize; - for (int i = 0; i < n; i++) { - // Top header icon: - int topHeaderCenterX = startX + (i + 1) * cellSize + cellSize / 2; - int topHeaderCenterY = startY + cellSize / 2; - GL11.glPushMatrix(); - GL11.glTranslatef(topHeaderCenterX, topHeaderCenterY, 0); - GL11.glScalef(iconScale, iconScale, 1); - // renderIcon should draw centered at (0,0) - renderIcon(icons.get(i), 0, 0, IconRenderState.DEFAULT); - GL11.glPopMatrix(); - - // Left header icon: - int leftHeaderCenterX = startX + cellSize / 2; - int leftHeaderCenterY = startY + (i + 1) * cellSize + cellSize / 2; - GL11.glPushMatrix(); - GL11.glTranslatef(leftHeaderCenterX, leftHeaderCenterY, 0); - GL11.glScalef(iconScale, iconScale, 1); - renderIcon(icons.get(i), 0, 0, IconRenderState.DEFAULT); - GL11.glPopMatrix(); - } - - // 8. Compute effective mouse coordinates (reverse pan/zoom). - int effectiveMouseX = (int) (((float) mouseX - (centerX + panX)) / zoom + centerX); - int effectiveMouseY = (int) (((float) mouseY - (centerY + panY)) / zoom + centerY); - - // 9. Determine hover state on the grid. - boolean hoverInGrid = (effectiveMouseX >= startX && effectiveMouseX < startX + gridWidth && - effectiveMouseY >= startY && effectiveMouseY < startY + gridHeight); - int hoveredRow = -1, hoveredCol = -1; - Set highlightTop = new HashSet<>(); - Set highlightLeft = new HashSet<>(); - List tooltipToShow = null; - if (hoverInGrid) { - int colIndex = (effectiveMouseX - startX) / cellSize; - int rowIndex = (effectiveMouseY - startY) / cellSize; - // If hovering over a top header cell. - if (rowIndex == 0 && colIndex >= 1) { - highlightTop.add(colIndex - 1); - tooltipToShow = getIconTooltip(icons.get(colIndex - 1)); - onIconHover(icons.get(colIndex - 1)); - } - // If hovering over a left header cell. - else if (colIndex == 0 && rowIndex >= 1) { - highlightLeft.add(rowIndex - 1); - tooltipToShow = getIconTooltip(icons.get(rowIndex - 1)); - onIconHover(icons.get(rowIndex - 1)); - } - // Else, hovering over an inner cell. - else if (rowIndex >= 1 && colIndex >= 1) { - hoveredRow = rowIndex - 1; - hoveredCol = colIndex - 1; - highlightTop.add(hoveredCol); - highlightLeft.add(hoveredRow); - DiagramIcon leftIcon = icons.get(hoveredRow); - DiagramIcon topIcon = icons.get(hoveredCol); - DiagramConnection conn = getConnectionByIds(leftIcon.id, topIcon.id); - if (conn != null) { - tooltipToShow = getConnectionTooltip(conn); - onConnectionHover(conn); - } - } - } - - // 10. Draw hover overlay: - // Dim all inner cells (row>=1 & col>=1) not in highlighted row/column. - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glColor4f(0, 0, 0, 0.5f); - GL11.glBegin(GL11.GL_QUADS); - for (int r = 1; r < rows; r++) { - for (int c = 1; c < cols; c++) { - boolean keepBright = !highlightTop.isEmpty() && highlightTop.contains(c - 1); - if (!highlightLeft.isEmpty() && highlightLeft.contains(r - 1)) - keepBright = true; - // Also, if a specific cell is hovered, its entire row/column is bright. - if (hoveredRow != -1 && hoveredCol != -1) { - if (r - 1 == hoveredRow || c - 1 == hoveredCol) - keepBright = true; - } - if (!keepBright) { - int cellX = startX + c * cellSize; - int cellY = startY + r * cellSize; - GL11.glVertex2i(cellX, cellY); - GL11.glVertex2i(cellX + cellSize, cellY); - GL11.glVertex2i(cellX + cellSize, cellY + cellSize); - GL11.glVertex2i(cellX, cellY + cellSize); - } - } - } - GL11.glEnd(); - // Then draw a white overlay on the highlighted headers/inner cell. - GL11.glColor4f(1, 1, 1, 0.3f); - GL11.glBegin(GL11.GL_QUADS); - for (int i = 0; i < n; i++) { - if (highlightTop.contains(i)) { - int hx = startX + (i + 1) * cellSize; - int hy = startY; - GL11.glVertex2i(hx, hy); - GL11.glVertex2i(hx + cellSize, hy); - GL11.glVertex2i(hx + cellSize, hy + cellSize); - GL11.glVertex2i(hx, hy + cellSize); - } - if (highlightLeft.contains(i)) { - int hx = startX; - int hy = startY + (i + 1) * cellSize; - GL11.glVertex2i(hx, hy); - GL11.glVertex2i(hx + cellSize, hy); - GL11.glVertex2i(hx + cellSize, hy + cellSize); - GL11.glVertex2i(hx, hy + cellSize); - } - } - if (hoveredRow != -1 && hoveredCol != -1) { - int cellX = startX + (hoveredCol + 1) * cellSize; - int cellY = startY + (hoveredRow + 1) * cellSize; - GL11.glVertex2i(cellX, cellY); - GL11.glVertex2i(cellX + cellSize, cellY); - GL11.glVertex2i(cellX + cellSize, cellY + cellSize); - GL11.glVertex2i(cellX, cellY + cellSize); - } - GL11.glEnd(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopAttrib(); - - // End pan/zoom block. + // ... rest of chart drawing code GL11.glPopMatrix(); GL11.glDisable(GL11.GL_SCISSOR_TEST); - - // 11. Draw tooltip (using raw screen coordinates). - if (tooltipToShow != null && !tooltipToShow.isEmpty()) { - drawHoveringText(tooltipToShow, mouseX, mouseY, mc.fontRenderer); - } } - /** * Main method for drawing the diagram. - * If layout == CHART, delegates to drawChartDiagram(). - * Otherwise, applies pan/zoom, draws connections (with hit-detection fixed for curves) - * and icons, and shows tooltips and hover events. + * For non‑Chart layouts, applies pan/zoom, draws connections (with improved curved hit-detection) + * and icons, and shows tooltips. */ public void drawDiagram(int mouseX, int mouseY, boolean subGui) { boolean allowInput = (parent == null || !parent.hasSubGui()); @@ -1060,44 +823,12 @@ public abstract class GuiDiagram extends Gui { ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int factor = sr.getScaleFactor(); Map positions = calculatePositions(); - if (layout != EnumDiagramLayout.CHART) { - for (DiagramConnection conn : getConnections()) { - if (conn.polyline == null && curvedArrows) { - DiagramIcon iconFrom = getIconById(conn.idFrom); - DiagramIcon iconTo = getIconById(conn.idTo); - if (iconFrom == null || iconTo == null || !iconFrom.enabled || !iconTo.enabled) - continue; - Point pFrom = positions.get(conn.idFrom); - Point pTo = positions.get(conn.idTo); - if (pFrom == null || pTo == null) continue; - int x1 = pFrom.x, y1 = pFrom.y, x2 = pTo.x, y2 = pTo.y; - double dx = x2 - x1, dy = y2 - y1; - double len = Math.sqrt(dx * dx + dy * dy); - if (len == 0) len = 1; - double angleRad = Math.toRadians(curveAngle); - double offset = len * Math.tan(angleRad) / 2; - double perpX = -dy / len, perpY = dx / len; - int cx = (x1 + x2) / 2 + (int) (perpX * offset); - int cy = (y1 + y2) / 2 + (int) (perpY * offset); - conn.polyline = new ArrayList<>(); - int segments = 50; // Reduced from 100 for performance - for (int i = 0; i <= segments; i++) { - double t = (double) i / segments; - int bx = (int) ((1 - t) * (1 - t) * x1 + 2 * (1 - t) * t * cx + t * t * x2); - int by = (int) ((1 - t) * (1 - t) * y1 + 2 * (1 - t) * t * cy + t * t * y2); - conn.polyline.add(new Point(bx, by)); - } - } - } - } - int centerX = x + width / 2, centerY = y + height / 2; - int effectiveMouseX = (int) (((float) mouseX - (centerX + panX)) / zoom + centerX); - int effectiveMouseY = (int) (((float) mouseY - (centerY + panY)) / zoom + centerY); + int effectiveMouseX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX); + int effectiveMouseY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY); Integer hoveredIconId = null; int hoveredConnFrom = -1, hoveredConnTo = -1; Set selectedIconIds = new HashSet<>(); - // Check if mouse is over an icon. for (DiagramIcon icon : getIcons()) { if (!icon.enabled) continue; Point pos = positions.get(icon.id); @@ -1111,9 +842,9 @@ public abstract class GuiDiagram extends Gui { break; } } - // If no icon was hovered, check connections. if (hoveredIconId == null) { final double threshold = 5.0; + outer: for (DiagramConnection conn : getConnections()) { DiagramIcon iconFrom = getIconById(conn.idFrom); DiagramIcon iconTo = getIconById(conn.idTo); @@ -1123,15 +854,16 @@ public abstract class GuiDiagram extends Gui { Point pTo = positions.get(conn.idTo); if (pFrom == null || pTo == null) continue; double dist; - if (curvedArrows && conn.polyline != null && !conn.polyline.isEmpty()) { - double minDist = Double.MAX_VALUE; - for (int i = 0; i < conn.polyline.size() - 1; i++) { - Point a = conn.polyline.get(i); - Point b = conn.polyline.get(i + 1); - double d = pointLineDistance(effectiveMouseX, effectiveMouseY, a.x, a.y, b.x, b.y); - if (d < minDist) minDist = d; - } - dist = minDist; + if (curvedArrows) { + // Compute both potential control points + Point cp1 = computeControlPoint(pFrom.x, pFrom.y, pTo.x, pTo.y, curveAngle); + Point cp2 = computeControlPoint(pFrom.x, pFrom.y, pTo.x, pTo.y, -curveAngle); + // Choose the control point that's farther from interfering icons (as done when drawing) + double d1 = getMinDistanceToIcon(cp1, conn); + double d2 = getMinDistanceToIcon(cp2, conn); + Point control = (d1 >= d2) ? cp1 : cp2; + // Use the chosen control point for hit detection + dist = distanceToBezier(pFrom, control, pTo, 200, effectiveMouseX, effectiveMouseY); } else { dist = pointLineDistance(effectiveMouseX, effectiveMouseY, pFrom.x, pFrom.y, pTo.x, pTo.y); } @@ -1141,11 +873,10 @@ public abstract class GuiDiagram extends Gui { selectedIconIds.add(conn.idFrom); selectedIconIds.add(conn.idTo); onConnectionHover(conn); - break; + break outer; } } } - // Setup scissor. GL11.glEnable(GL11.GL_SCISSOR_TEST); GL11.glScissor(x * factor, (sr.getScaledHeight() - (y + height)) * factor, width * factor, height * factor); drawRect(x, y, x + width, y + height, 0xFF333333); @@ -1153,7 +884,6 @@ public abstract class GuiDiagram extends Gui { GL11.glTranslatef(centerX + panX, centerY + panY, 0); GL11.glScalef(zoom, zoom, 1.0f); GL11.glTranslatef(-centerX, -centerY, 0); - // Draw connections. for (DiagramConnection conn : getConnections()) { DiagramIcon iconFrom = getIconById(conn.idFrom); DiagramIcon iconTo = getIconById(conn.idTo); @@ -1163,11 +893,9 @@ public abstract class GuiDiagram extends Gui { Point pTo = positions.get(conn.idTo); if (pFrom == null || pTo == null) continue; int ax = pFrom.x, ay = pFrom.y, bx = pTo.x, by = pTo.y; - boolean dim = !selectedIconIds.isEmpty() && - !(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo)); + boolean dim = !selectedIconIds.isEmpty() && !(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo)); drawConnectionLine(ax, ay, bx, by, conn, dim); } - // Draw icons. for (DiagramIcon icon : getIcons()) { if (!icon.enabled) continue; Point pos = positions.get(icon.id); @@ -1179,7 +907,6 @@ public abstract class GuiDiagram extends Gui { renderIcon(icon, pos.x, pos.y, state); } GL11.glPopMatrix(); - // Draw arrow heads. if (showArrowHeads) { GL11.glPushMatrix(); GL11.glTranslatef(centerX + panX, centerY + panY, 0); @@ -1194,14 +921,12 @@ public abstract class GuiDiagram extends Gui { Point pTo = positions.get(conn.idTo); if (pFrom == null || pTo == null) continue; int ax = pFrom.x, ay = pFrom.y, bx = pTo.x, by = pTo.y; - boolean dim = !selectedIconIds.isEmpty() && - !(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo)); + boolean dim = !selectedIconIds.isEmpty() && !(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo)); drawArrowHead(ax, ay, bx, by, conn, dim); } GL11.glPopMatrix(); } GL11.glDisable(GL11.GL_SCISSOR_TEST); - // Show tooltips if an icon or connection was hovered. if (hoveredIconId != null) { DiagramIcon icon = getIconById(hoveredIconId); List tooltip = getIconTooltip(icon); @@ -1222,14 +947,12 @@ public abstract class GuiDiagram extends Gui { } return null; } - protected DiagramConnection getConnectionByIds(int idFrom, int idTo) { for (DiagramConnection conn : getConnections()) { if (conn.idFrom == idFrom && conn.idTo == idTo) return conn; } return null; } - protected int getConnectionColor(DiagramConnection conn) { float percent = conn.percent; if (percent <= 0.10f) return 0xFF80FF80; @@ -1240,105 +963,25 @@ public abstract class GuiDiagram extends Gui { ratio = Math.min(1f, Math.max(0f, ratio)); int r1 = 0xFF, g1 = 0xA5, b1 = 0x00; int r2 = 0xFF, g2 = 0x00, b2 = 0x00; - int r = r1 + (int) ((r2 - r1) * ratio); - int g = g1 + (int) ((g2 - g1) * ratio); - int b = b1 + (int) ((b2 - b1) * ratio); + int r = r1 + (int)((r2 - r1) * ratio); + int g = g1 + (int)((g2 - g1) * ratio); + int b = b1 + (int)((b2 - b1) * ratio); return (0xFF << 24) | (r << 16) | (g << 8) | b; } } - private double pointLineDistance(int px, int py, int x1, int y1, int x2, int y2) { double A = px - x1, B = py - y1, C = x2 - x1, D = y2 - y1; double dot = A * C + B * D; double lenSq = C * C + D * D; double param = (lenSq != 0) ? (dot / lenSq) : -1; double xx, yy; - if (param < 0) { - xx = x1; - yy = y1; - } else if (param > 1) { - xx = x2; - yy = y2; - } else { - xx = x1 + param * C; - yy = y1 + param * D; - } + if (param < 0) { xx = x1; yy = y1; } + else if (param > 1) { xx = x2; yy = y2; } + else { xx = x1 + param * C; yy = y1 + param * D; } double dx = px - xx, dy = py - yy; return Math.sqrt(dx * dx + dy * dy); } - // --- Inner Helper Classes --- - public static class DiagramIcon { - public int id; - public boolean enabled = true; - public boolean pressable = false; - public int index = 0; // For row, ring, or level. - public int priority = 0; // For ordering. - - public DiagramIcon(int id) { - this.id = id; - } - - public DiagramIcon(int id, int index, int priority) { - this.id = id; - this.index = index; - this.priority = priority; - } - } - - public static class DiagramConnection { - public int idFrom, idTo; - public float percent; - public String hoverText; - public List polyline = null; - - public DiagramConnection(int idFrom, int idTo, float percent, String hoverText) { - this.idFrom = idFrom; - this.idTo = idTo; - this.percent = percent; - this.hoverText = hoverText; - } - } - - // Used by the CHART layout to represent an inner cell. - private static class ConnectionCell { - int x, y, size; - DiagramConnection conn; - - ConnectionCell(int x, int y, int size, DiagramConnection conn) { - this.x = x; - this.y = y; - this.size = size; - this.conn = conn; - } - } - - // Simple helper class for rectangles. - private static class Rectangle { - int x, y, width, height; - - Rectangle(int x, int y, int width, int height) { - this.x = x; - this.y = y; - this.width = width; - this.height = height; - } - - int centerX() { - return x + width / 2; - } - - int centerY() { - return y + height / 2; - } - } - - public enum IconRenderState { - DEFAULT, - HIGHLIGHTED, - NOT_HIGHLIGHTED - } - // --- Mouse Handling --- public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) { if (parent != null && parent.hasSubGui()) return false; @@ -1348,8 +991,8 @@ public abstract class GuiDiagram extends Gui { Point pos = calculatePositions().get(icon.id); if (pos == null) continue; int centerX = x + width / 2, centerY = y + height / 2; - int effectiveX = (int) (((float) mouseX - (centerX + panX)) / zoom + centerX); - int effectiveY = (int) (((float) mouseY - (centerY + panY)) / zoom + centerY); + int effectiveX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX); + int effectiveY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY); int slotX = pos.x - slotSize / 2, slotY = pos.y - slotSize / 2; if (effectiveX >= slotX && effectiveX < slotX + slotSize && effectiveY >= slotY && effectiveY < slotY + slotSize) { @@ -1367,9 +1010,7 @@ public abstract class GuiDiagram extends Gui { } return false; } - protected DiagramIcon currentlyPressedIcon = null; - public void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) { if (parent != null && parent.hasSubGui()) return; if (dragging) { @@ -1381,7 +1022,6 @@ public abstract class GuiDiagram extends Gui { } if (currentlyPressedIcon != null) onIconHeld(currentlyPressedIcon); } - public void mouseReleased(int mouseX, int mouseY, int state) { if (parent != null && parent.hasSubGui()) return; if (currentlyPressedIcon != null) { @@ -1390,66 +1030,63 @@ public abstract class GuiDiagram extends Gui { } dragging = false; } - public boolean isWithin(int mouseX, int mouseY) { if (parent.hasSubGui()) return false; return mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height; } - - /** - * Handles zooming based on mouse wheel scrolling. - */ public void handleMouseScroll(int scrollDelta) { zoom += scrollDelta * 0.0009f; if (zoom < 0.5f) zoom = 0.5f; if (zoom > 2.0f) zoom = 2.0f; } - - /** - * Override to render tooltips. - */ - protected void drawHoveringText(List textLines, int mouseX, int mouseY, FontRenderer font) { - } + protected void drawHoveringText(List textLines, int mouseX, int mouseY, FontRenderer font) {} // --- Flag Setters --- public void setShowArrowHeads(boolean showArrowHeads) { this.showArrowHeads = showArrowHeads; } - public void setUseColorScaling(boolean useColorScaling) { this.useColorScaling = useColorScaling; } // --- Icon and Connection Event Callbacks --- + protected void onIconClick(DiagramIcon icon) {} + protected void onIconHeld(DiagramIcon icon) {} + protected void onIconRelease(DiagramIcon icon) {} + protected void onIconHover(DiagramIcon icon) {} + protected void onConnectionHover(DiagramConnection conn) {} - /** - * Called when an icon is clicked. - */ - protected void onIconClick(DiagramIcon icon) { + // --- Inner Helper Classes --- + public static class DiagramIcon { + public int id; + public boolean enabled = true; + public boolean pressable = false; + public int index = 0; + public int priority = 0; + public DiagramIcon(int id) { this.id = id; } + public DiagramIcon(int id, int index, int priority) { + this.id = id; + this.index = index; + this.priority = priority; + } } - /** - * Called when an icon is held. - */ - protected void onIconHeld(DiagramIcon icon) { + public static class DiagramConnection { + public int idFrom, idTo; + public float percent; + public String hoverText; + public DiagramConnection(int idFrom, int idTo, float percent, String hoverText) { + this.idFrom = idFrom; + this.idTo = idTo; + this.percent = percent; + this.hoverText = hoverText; + } } - /** - * Called when an icon is released. - */ - protected void onIconRelease(DiagramIcon icon) { - } - - /** - * Called when an icon is hovered over. - */ - protected void onIconHover(DiagramIcon icon) { - } - - /** - * Called when a connection is hovered over. - */ - protected void onConnectionHover(DiagramConnection conn) { + public enum IconRenderState { + DEFAULT, + HIGHLIGHTED, + NOT_HIGHLIGHTED; } } diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 9f553611d..4d035ae6a 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -73,10 +73,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; public class NpcAPI extends AbstractNpcAPI { - private static final Map tempData = new HashMap<>(); + private static final Map tempData = new HashMap<>(); private static final Map worldCache = new LRUHashMap<>(10); - private static final CacheHashMap> scriptItemCache = new CacheHashMap<>(60 * 1000); - public static final HashMap engineObjects = new HashMap<>(); + private static final CacheHashMap> scriptItemCache = new CacheHashMap<>(60*1000); + public static final HashMap engineObjects = new HashMap<>(); public static final EventBus EVENT_BUS = new EventBus(); private static AbstractNpcAPI instance = null; @@ -91,23 +91,23 @@ public class NpcAPI extends AbstractNpcAPI { scriptItemCache.clear(); } - public Object getTempData(String key) { + public Object getTempData(String key){ return tempData.get(key); } - public void setTempData(String key, Object value) { + public void setTempData(String key, Object value){ tempData.put(key, value); } - public boolean hasTempData(String key) { + public boolean hasTempData(String key){ return tempData.containsKey(key); } - public void removeTempData(String key) { + public void removeTempData(String key){ tempData.remove(key); } - public void clearTempData() { + public void clearTempData(){ tempData.clear(); } @@ -115,35 +115,35 @@ public class NpcAPI extends AbstractNpcAPI { return tempData.keySet().toArray(new String[0]); } - public Object getStoredData(String key) { + public Object getStoredData(String key){ NBTTagCompound compound = ScriptController.Instance.compound; - if (!compound.hasKey(key)) + if(!compound.hasKey(key)) return null; NBTBase base = compound.getTag(key); - if (base instanceof NBTBase.NBTPrimitive) - return ((NBTBase.NBTPrimitive) base).func_150286_g(); - return ((NBTTagString) base).func_150285_a_(); + if(base instanceof NBTBase.NBTPrimitive) + return ((NBTBase.NBTPrimitive)base).func_150286_g(); + return ((NBTTagString)base).func_150285_a_(); } - public void setStoredData(String key, Object value) { + public void setStoredData(String key, Object value){ NBTTagCompound compound = ScriptController.Instance.compound; - if (value instanceof Number) + if(value instanceof Number) compound.setDouble(key, ((Number) value).doubleValue()); - else if (value instanceof String) - compound.setString(key, (String) value); + else if(value instanceof String) + compound.setString(key, (String)value); ScriptController.Instance.shouldSave = true; } - public boolean hasStoredData(String key) { + public boolean hasStoredData(String key){ return ScriptController.Instance.compound.hasKey(key); } - public void removeStoredData(String key) { + public void removeStoredData(String key){ ScriptController.Instance.compound.removeTag(key); ScriptController.Instance.shouldSave = true; } - public void clearStoredData() { + public void clearStoredData(){ ScriptController.Instance.compound = new NBTTagCompound(); ScriptController.Instance.shouldSave = true; } @@ -153,7 +153,7 @@ public class NpcAPI extends AbstractNpcAPI { if (compound != null) { Set keySet = compound.func_150296_c(); List list = new ArrayList<>(); - for (Object o : keySet) { + for(Object o : keySet){ list.add((String) o); } String[] array = list.toArray(new String[list.size()]); @@ -163,15 +163,15 @@ public class NpcAPI extends AbstractNpcAPI { } public void registerICommand(ICommand command) { - ((CommandHandler) CustomNpcs.getServer().getCommandManager()).registerCommand((ScriptedCommand) command); + ((CommandHandler)CustomNpcs.getServer().getCommandManager()).registerCommand((ScriptedCommand) command); } public ICommand getICommand(String commandName, int priorityLevel) { - return new ScriptedCommand(commandName, priorityLevel); + return new ScriptedCommand(commandName,priorityLevel); } public void addGlobalObject(String key, Object obj) { - NpcAPI.engineObjects.put(key, obj); + NpcAPI.engineObjects.put(key,obj); } public void removeGlobalObject(String key) { @@ -182,7 +182,7 @@ public class NpcAPI extends AbstractNpcAPI { return NpcAPI.engineObjects.containsKey(key); } - public HashMap getEngineObjects() { + public HashMap getEngineObjects() { return NpcAPI.engineObjects; } @@ -241,26 +241,17 @@ public class NpcAPI extends AbstractNpcAPI { return ServerCloneController.Instance; } - public INaturalSpawnsHandler getNaturalSpawns() { - return SpawnController.Instance; - } + public INaturalSpawnsHandler getNaturalSpawns() { return SpawnController.Instance; } - public IProfileHandler getProfileHandler() { - return ProfileController.Instance; - } + public IProfileHandler getProfileHandler() { return ProfileController.Instance; } - public ICustomEffectHandler getCustomEffectHandler() { - return CustomEffectController.Instance; - } + public ICustomEffectHandler getCustomEffectHandler() { return CustomEffectController.Instance; } + public IPartyHandler getPartyHandler() { return PartyController.Instance(); } public IMagicHandler getMagicHandler() { return MagicController.getInstance(); } - public IPartyHandler getPartyHandler() { - return PartyController.Instance(); - } - public ITransportHandler getLocations() { return TransportController.getInstance(); } @@ -284,21 +275,21 @@ public class NpcAPI extends AbstractNpcAPI { public static Boolean dbcLoaded = null; - public IEntity getIEntity(Entity entity) { - if (entity == null) + if(entity == null) return null; - if (entity instanceof EntityNPCInterface) - return ((EntityNPCInterface) entity).wrappedNPC; - else { + if(entity instanceof EntityNPCInterface) + return ((EntityNPCInterface)entity).wrappedNPC; + else{ ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject"); if (data == null) { if (entity instanceof EntityPlayerMP) { - if (dbcLoaded == null) { + if(dbcLoaded == null){ dbcLoaded = Loader.isModLoaded("jinryuujrmcore"); } data = dbcLoaded ? new ScriptEntityData(new ScriptDBCPlayer<>((EntityPlayerMP) entity)) : new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity)); - } else if (PixelmonHelper.isPixelmon(entity)) + } + else if (PixelmonHelper.isPixelmon(entity)) return new ScriptPixelmon((EntityTameable) entity); else if (entity instanceof EntityAnimal) data = new ScriptEntityData(new ScriptAnimal<>((EntityAnimal) entity)); @@ -348,14 +339,14 @@ public class NpcAPI extends AbstractNpcAPI { public IBlock getIBlock(IWorld world, int x, int y, int z) { Block block = world.getMCWorld().getBlock(x, y, z); - if (block == null || block.isAir(world.getMCWorld(), x, y, z)) + if(block == null || block.isAir(world.getMCWorld(), x, y, z)) return null; - return new ScriptBlock(world.getMCWorld(), world.getMCWorld().getBlock(x, y, z), new BlockPos(x, y, z)); + return new ScriptBlock(world.getMCWorld(), world.getMCWorld().getBlock(x, y, z), new BlockPos(x,y,z)); } public IBlock getIBlock(IWorld world, IPos pos) { - return pos == null ? null : this.getIBlock(world, pos.getX(), pos.getY(), pos.getZ()); + return pos == null ? null : this.getIBlock(world, pos.getX(),pos.getY(),pos.getZ()); } public ITileEntity getITileEntity(IWorld world, IPos pos) { @@ -363,12 +354,12 @@ public class NpcAPI extends AbstractNpcAPI { return null; } - TileEntity tileEntity = world.getMCWorld().getTileEntity(pos.getX(), pos.getY(), pos.getZ()); + TileEntity tileEntity = world.getMCWorld().getTileEntity(pos.getX(), pos.getY(),pos.getZ()); return this.getITileEntity(tileEntity); } public ITileEntity getITileEntity(IWorld world, int x, int y, int z) { - TileEntity tileEntity = world.getMCWorld().getTileEntity(x, y, z); + TileEntity tileEntity = world.getMCWorld().getTileEntity(x,y,z); return this.getITileEntity(tileEntity); } @@ -381,15 +372,15 @@ public class NpcAPI extends AbstractNpcAPI { } public IPos getIPos(double x, double y, double z) { - return this.getIPos(new BlockPos(x, y, z)); + return this.getIPos(new BlockPos(x,y,z)); } public IPos getIPos(int x, int y, int z) { - return this.getIPos(x, y, (double) z); + return this.getIPos((double) x, (double) y, (double) z); } public IPos getIPos(float x, float y, float z) { - return this.getIPos(x, y, (double) z); + return this.getIPos((double) x, (double) y, (double) z); } public IPos getIPos(long serializedPos) { @@ -399,7 +390,7 @@ public class NpcAPI extends AbstractNpcAPI { public IPos[] getAllInBox(IPos from, IPos to, boolean sortByDistance) { ArrayList list = new ArrayList<>(); if (from != null && to != null) { - Iterator posIterable = BlockPos.getAllInBox(from.getMCPos(), to.getMCPos()).iterator(); + Iterator posIterable = BlockPos.getAllInBox(from.getMCPos(),to.getMCPos()).iterator(); posIterable.forEachRemaining(BlockPos -> list.add(this.getIPos(BlockPos))); if (sortByDistance) { list.sort(Comparator.comparingDouble(pos -> pos.distanceTo(from))); @@ -409,11 +400,11 @@ public class NpcAPI extends AbstractNpcAPI { } public IPos[] getAllInBox(IPos from, IPos to) { - return this.getAllInBox(from, to, true); + return this.getAllInBox(from,to,true); } public INbt getINbt(NBTTagCompound nbtTagCompound) { - return nbtTagCompound == null ? new ScriptNbt(new NBTTagCompound()) : new ScriptNbt(nbtTagCompound); + return nbtTagCompound == null?new ScriptNbt(new NBTTagCompound()):new ScriptNbt(nbtTagCompound); } public INbt stringToNbt(String str) { @@ -442,7 +433,7 @@ public class NpcAPI extends AbstractNpcAPI { return null; } else { EntityCustomNpc npc = new EntityCustomNpc(world.getMCWorld()); - npc.setPositionAndRotation((double) x + 0.5D, y, (double) z + 0.5D, 0.0F, 0.0F); + npc.setPositionAndRotation((double)x + 0.5D, y, (double)z + 0.5D, 0.0F, 0.0F); npc.setHealth(npc.getMaxHealth()); world.getMCWorld().spawnEntityInWorld(npc); return npc.wrappedNPC; @@ -469,7 +460,7 @@ public class NpcAPI extends AbstractNpcAPI { } public IItemStack getIItemStack(ItemStack itemstack) { - if (itemstack == null) + if(itemstack == null) return null; synchronized (scriptItemCache) { @@ -533,10 +524,10 @@ public class NpcAPI extends AbstractNpcAPI { public IWorld getIWorldLoad(int dimensionId) { try { IWorld iWorld = this.getIWorld(dimensionId); - if (iWorld != null) + if(iWorld != null) return iWorld; - } catch (CustomNPCsException ignored) { } + catch (CustomNPCsException ignored){} WorldServer worldServer = CustomNpcs.getServer().worldServerForDimension(dimensionId); if (worldServer != null) { @@ -551,7 +542,7 @@ public class NpcAPI extends AbstractNpcAPI { } public IContainer getIContainer(Container container) { - return container instanceof ContainerNpcInterface ? ContainerNpcInterface.getOrCreateIContainer((ContainerNpcInterface) container) : new ScriptContainer(container); + return container instanceof ContainerNpcInterface ? ContainerNpcInterface.getOrCreateIContainer((ContainerNpcInterface)container) : new ScriptContainer(container); } private void checkWorld() { @@ -564,7 +555,7 @@ public class NpcAPI extends AbstractNpcAPI { this.checkWorld(); IWorld[] worlds = new IWorld[CustomNpcs.getServer().worldServers.length]; - for (int i = 0; i < CustomNpcs.getServer().worldServers.length; ++i) { + for(int i = 0; i < CustomNpcs.getServer().worldServers.length; ++i) { worlds[i] = this.getIWorld(CustomNpcs.getServer().worldServers[i]); } @@ -584,15 +575,15 @@ public class NpcAPI extends AbstractNpcAPI { } public IDamageSource getIDamageSource(IEntity entity) { - if (entity.getType() == 1)//if player - return new ScriptDamageSource(new EntityDamageSource("player", entity.getMCEntity())); + if(entity.getType() == 1)//if player + return new ScriptDamageSource(new EntityDamageSource("player",entity.getMCEntity())); else - return new ScriptDamageSource(new EntityDamageSource(entity.getTypeName(), entity.getMCEntity())); + return new ScriptDamageSource(new EntityDamageSource(entity.getTypeName(),entity.getMCEntity())); } public void executeCommand(IWorld world, String command) { //if(!world.getMCWorld().isRemote) - NoppesUtilServer.runCommand(world.getMCWorld(), "API", command); + NoppesUtilServer.runCommand(world.getMCWorld(), "API", command); } public String getRandomName(int dictionary, int gender) { @@ -608,11 +599,11 @@ public class NpcAPI extends AbstractNpcAPI { return player == null ? null : (IPlayer) NpcAPI.Instance().getIEntity(player); } - public IPlayer[] getAllServerPlayers() { + public IPlayer[] getAllServerPlayers(){ List list = MinecraftServer.getServer().getConfigurationManager().playerEntityList; IPlayer[] arr = new IPlayer[list.size()]; - for (int i = 0; i < list.size(); i++) { - arr[i] = (IPlayer) NpcAPI.Instance().getIEntity((EntityPlayerMP) list.get(i)); + for(int i = 0; i < list.size(); i++){ + arr[i] = (IPlayer) NpcAPI.Instance().getIEntity((EntityPlayerMP)list.get(i)); } return arr; @@ -622,28 +613,30 @@ public class NpcAPI extends AbstractNpcAPI { return MinecraftServer.getServer().getConfigurationManager().getAllUsernames(); } - public void playSoundAtEntity(IEntity entity, String sound, float volume, float pitch) { + public void playSoundAtEntity(IEntity entity, String sound, float volume, float pitch){ entity.getWorld().getMCWorld().playSoundAtEntity(entity.getMCEntity(), sound, volume, pitch); } - public void playSoundToNearExcept(IPlayer player, String sound, float volume, float pitch) { + public void playSoundToNearExcept(IPlayer player, String sound, float volume, float pitch){ player.getWorld().getMCWorld().playSoundToNearExcept(player.getMCEntity(), sound, volume, pitch); } - public String getMOTD() { + public String getMOTD() + { return MinecraftServer.getServer().getMOTD(); } - public void setMOTD(String motd) { + public void setMOTD(String motd) + { MinecraftServer.getServer().setMOTD(motd); } - public IParticle createParticle(String directory) { + public IParticle createParticle(String directory){ return new ScriptParticle(directory); } @Deprecated - public IParticle createEntityParticle(String directory) { + public IParticle createEntityParticle(String directory){ return new ScriptParticle(directory); } @@ -736,7 +729,7 @@ public class NpcAPI extends AbstractNpcAPI { } public IFrame createFrame(int duration, float speed, byte smooth) { - return new Frame(duration, speed, smooth); + return new Frame(duration,speed,smooth); } public IFramePart createPart(String name) { @@ -759,7 +752,7 @@ public class NpcAPI extends AbstractNpcAPI { } public IFramePart createPart(String name, float[] rotation, float[] pivot, float speed, byte smooth) { - FramePart part = (FramePart) this.createPart(name, rotation, pivot); + FramePart part = (FramePart) this.createPart(name,rotation,pivot); part.setSpeed(speed); part.setSmooth(smooth); return part; @@ -786,7 +779,7 @@ public class NpcAPI extends AbstractNpcAPI { } public IFramePart createPart(int partId, float[] rotation, float[] pivot, float speed, byte smooth) { - FramePart part = (FramePart) this.createPart(partId, rotation, pivot); + FramePart part = (FramePart) this.createPart(partId,rotation,pivot); part.setSpeed(speed); part.setSmooth(smooth); return part;