diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCDiagram.java b/src/main/java/noppes/npcs/client/gui/global/GuiDiagram.java similarity index 75% rename from src/main/java/noppes/npcs/client/gui/global/GuiNPCDiagram.java rename to src/main/java/noppes/npcs/client/gui/global/GuiDiagram.java index 2eb91940a..4f1bd7060 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCDiagram.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiDiagram.java @@ -2,12 +2,14 @@ package noppes.npcs.client.gui.global; import java.awt.Point; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.HashMap; import java.util.Random; +import java.util.Set; +import noppes.npcs.client.gui.util.GuiNPCInterface; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -17,19 +19,17 @@ import org.lwjgl.opengl.GL11; /** * Abstract GUI class for drawing diagrams that consist of icons (nodes) and connections (arrows). - * - * This class provides: - * - Multiple layout algorithms for positioning nodes (Circular, Square, Tree, Generated). - * - Panning and zooming functionality. - * - Standard drawing of a node's "box": a background and border that can be customized. - * - Connection drawing (including arrow heads). - * - Highlighting logic: when hovering over an icon, its connections and related icons are highlighted. - * - Tooltip support for nodes and connections. - * - * IMPORTANT: Child classes must implement the data provider methods to supply the list of icons and connections, - * and implement how an icon’s image is rendered (renderIcon). + *

+ * This version adds: + * - A parent GuiNPCInterface (passed in the constructor) so that if the parent has a subgui, no + * mouse interactions are processed. + * - Caching for icons and connections. The abstract methods createIcons() and createConnections() are + * called only once (or when cache is invalidated). + * - DiagramIcon now has fields for enabled and pressable. Disabled icons are not rendered or used in + * connection validation. + * - Basic mouse-event callbacks for pressable icons: click, held and released. */ -public abstract class GuiNPCDiagram extends Gui { +public abstract class GuiDiagram extends Gui { // --------------- // Diagram Area & Controls @@ -68,7 +68,7 @@ public abstract class GuiNPCDiagram extends Gui { /** * Allows setting the desired layout type. - * This will invalidate the cached positions. + * This will invalidate the cached positions and cached icons/connections. */ public void setLayout(DiagramLayout layout) { this.layout = layout; @@ -80,18 +80,29 @@ public abstract class GuiNPCDiagram extends Gui { // --------------- // Cache for positions (computed once for any given icon set & layout). protected Map cachedPositions = null; + // Cache for icons and connections. + protected List iconsCache = null; + protected List connectionsCache = null; /** - * Clears the cached positions. + * Clears all caches: positions, icons, and connections. */ public void invalidateCache() { cachedPositions = null; + iconsCache = null; + connectionsCache = null; } + // --------------- + // Parent Reference + // --------------- + protected GuiNPCInterface parent; + // --------------- // Constructor // --------------- - public GuiNPCDiagram(int x, int y, int width, int height) { + public GuiDiagram(GuiNPCInterface parent, int x, int y, int width, int height) { + this.parent = parent; this.x = x; this.y = y; this.width = width; @@ -99,12 +110,50 @@ public abstract class GuiNPCDiagram extends Gui { } // --------------- - // Data Providers (abstract methods to be implemented by child classes) + // Data Providers (subclasses must implement the creation methods) // --------------- - protected abstract List getIcons(); - protected abstract List getConnections(); + /** + * Subclasses should override this method to create and return the list of DiagramIcons. + * Note: the returned icons will be cached. + */ + protected abstract List createIcons(); + + /** + * Subclasses should override this method to create and return the list of DiagramConnections. + * Note: the returned connections will be cached. + */ + protected abstract List createConnections(); + + /** + * Returns the cached icons. + */ + protected final List getIcons() { + if (iconsCache == null) { + iconsCache = createIcons(); + } + return iconsCache; + } + + /** + * Returns the cached connections. + */ + protected final List getConnections() { + if (connectionsCache == null) { + connectionsCache = createConnections(); + } + return connectionsCache; + } + + /** + * Subclasses must implement how an icon’s image is rendered. + */ protected abstract void renderIcon(DiagramIcon icon, int posX, int posY, IconRenderState state); + + /** + * Return a tooltip for an icon. + */ protected List getIconTooltip(DiagramIcon icon) { return null; } + protected List getConnectionTooltip(DiagramConnection conn) { List tooltip = new ArrayList<>(); DiagramIcon iconFrom = getIconById(conn.idFrom); @@ -120,6 +169,7 @@ public abstract class GuiNPCDiagram extends Gui { } return tooltip; } + protected String getIconName(DiagramIcon icon) { return "Icon " + icon.id; } // --------------- @@ -222,33 +272,28 @@ public abstract class GuiNPCDiagram extends Gui { // Fixed seed for deterministic initial placement. Random rand = new Random(100); - // Initialize nodes at random positions (with margin). for (DiagramIcon icon : icons) { int posX = x + margin + rand.nextInt(Math.max(1, width - 2 * margin)); int posY = y + margin + rand.nextInt(Math.max(1, height - 2 * margin)); positions.put(icon.id, new Point(posX, posY)); } - // Fruchterman–Reingold parameters. double area = width * height; - // Ideal distance between nodes. double k = Math.sqrt(area / (double) count); int iterations = 100; - double temperature = width / 10.0; // initial max displacement + double temperature = width / 10.0; double cooling = temperature / (iterations + 1); - double minDistance = iconSize + slotPadding; // enforce minimal separation + double minDistance = iconSize + slotPadding; - // Get the list of connections (only actual edges). List connections = getConnections(); for (int iter = 0; iter < iterations; iter++) { - // Initialize displacement for each node. Map disp = new HashMap<>(); for (DiagramIcon v : icons) { disp.put(v.id, new double[] {0.0, 0.0}); } - // Repulsive forces: for every pair of nodes. + // Repulsive forces. for (int i = 0; i < icons.size(); i++) { DiagramIcon v = icons.get(i); Point posV = positions.get(v.id); @@ -269,7 +314,7 @@ public abstract class GuiNPCDiagram extends Gui { } } - // Attractive forces: only for nodes that are connected. + // Attractive forces. for (DiagramConnection conn : connections) { Point posV = positions.get(conn.idFrom); Point posU = positions.get(conn.idTo); @@ -286,7 +331,7 @@ public abstract class GuiNPCDiagram extends Gui { dispU[1] += (dy / distance) * attrForce; } - // Update positions based on displacement vectors. + // Update positions. for (DiagramIcon v : icons) { double[] d = disp.get(v.id); double dispLength = Math.sqrt(d[0] * d[0] + d[1] * d[1]); @@ -330,31 +375,32 @@ public abstract class GuiNPCDiagram extends Gui { // --------------- // Main Draw Method // --------------- - public void drawDiagram(int mouseX, int mouseY) { - // Update zoom based on mouse scroll. - if(isWithin(mouseX, mouseY)) + public void drawDiagram(int mouseX, int mouseY, boolean subGui) { + // Only allow mouse interaction if parent's not showing a subgui. + boolean allowInput = (parent == null || !parent.hasSubGui()); + // Update zoom based on mouse scroll if allowed. + if (allowInput && isWithin(mouseX, mouseY) && !subGui) { handleMouseScroll(Mouse.getDWheel()); + } Minecraft mc = Minecraft.getMinecraft(); ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int factor = sr.getScaleFactor(); - // Retrieve (cached) positions. Map positions = calculatePositions(); int centerX = x + width / 2; int centerY = y + height / 2; - // Calculate effective mouse coordinates (in diagram coordinate space) int effectiveMouseX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX); int effectiveMouseY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY); - // Hit testing & selection: Integer hoveredIconId = null; int hoveredConnFrom = -1, hoveredConnTo = -1; - HashSet selectedIconIds = new HashSet<>(); + Set selectedIconIds = new HashSet<>(); - // Check for icon hover using effective coordinates. + // Hit testing for icons (only consider enabled icons) for (DiagramIcon icon : getIcons()) { + if (!icon.enabled) continue; Point pos = positions.get(icon.id); if (pos == null) continue; int slotX = pos.x - slotSize / 2; @@ -368,16 +414,24 @@ public abstract class GuiNPCDiagram extends Gui { } if (hoveredIconId != null) { for (DiagramConnection conn : getConnections()) { + // Validate connection: both endpoints must exist and be enabled. + DiagramIcon iconFrom = getIconById(conn.idFrom); + DiagramIcon iconTo = getIconById(conn.idTo); + if (iconFrom == null || iconTo == null || !iconFrom.enabled || !iconTo.enabled) + continue; if (conn.idFrom == hoveredIconId || conn.idTo == hoveredIconId) { selectedIconIds.add(conn.idFrom); selectedIconIds.add(conn.idTo); } } } else { - // If no icon is hovered, check for connection hover. final double threshold = 5.0; outer: for (DiagramConnection conn : getConnections()) { + 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; @@ -396,14 +450,17 @@ public abstract class GuiNPCDiagram extends Gui { GL11.glScissor(x * factor, (sr.getScaledHeight() - (y + height)) * factor, width * factor, height * factor); drawRect(x, y, x + width, y + height, 0xFF333333); - // Apply the same pan and zoom transformation for both arrows and icons. GL11.glPushMatrix(); GL11.glTranslatef(centerX + panX, centerY + panY, 0); GL11.glScalef(zoom, zoom, 1.0f); GL11.glTranslatef(-centerX, -centerY, 0); - // Draw connections (arrows). + // Draw connections (only for endpoints that are enabled). for (DiagramConnection conn : getConnections()) { + 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; @@ -418,6 +475,7 @@ public abstract class GuiNPCDiagram extends Gui { // Draw icons. for (DiagramIcon icon : getIcons()) { + if (!icon.enabled) continue; Point pos = positions.get(icon.id); if (pos == null) continue; int slotX = pos.x - slotSize / 2; @@ -436,6 +494,10 @@ public abstract class GuiNPCDiagram extends Gui { GL11.glScalef(zoom, zoom, 1.0f); GL11.glTranslatef(-centerX, -centerY, 0); for (DiagramConnection conn : getConnections()) { + 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; @@ -451,7 +513,7 @@ public abstract class GuiNPCDiagram extends Gui { } GL11.glDisable(GL11.GL_SCISSOR_TEST); - // Use original mouseX and mouseY (screen coordinates) for tooltips. + // Tooltips. if (hoveredIconId != null) { DiagramIcon icon = getIconById(hoveredIconId); List tooltip = getIconTooltip(icon); @@ -467,7 +529,6 @@ public abstract class GuiNPCDiagram extends Gui { } } - protected DiagramIcon getIconById(int id) { for (DiagramIcon icon : getIcons()) { if (icon.id == id) @@ -570,31 +631,71 @@ public abstract class GuiNPCDiagram extends Gui { // Mouse Handling // --------------- public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) { - if (mouseButton==0 && isWithin(mouseX, mouseY)) { - dragging = true; - lastDragX = mouseX; - lastDragY = mouseY; - return true; + // Do not process if parent's subgui is active. + if (parent != null && parent.hasSubGui()) return false; + // If left mouse button: + if (mouseButton == 0) { + // First, try to dispatch icon events for pressable icons. + for (DiagramIcon icon : getIcons()) { + if (!icon.enabled || !icon.pressable) + continue; + Point pos = calculatePositions().get(icon.id); + if (pos == null) continue; + int centerX = x + width / 2; + int centerY = y + height / 2; + int effectiveX = (int)(((float)mouseX - (centerX + panX)) / zoom + centerX); + int effectiveY = (int)(((float)mouseY - (centerY + panY)) / zoom + centerY); + int slotX = pos.x - slotSize / 2; + int slotY = pos.y - slotSize / 2; + if (effectiveX >= slotX && effectiveX < slotX + slotSize && + effectiveY >= slotY && effectiveY < slotY + slotSize) { + onIconClick(icon); + // Mark as pressed for held/release events. + currentlyPressedIcon = icon; + return true; + } + } + // Otherwise, start dragging for panning. + if (isWithin(mouseX, mouseY)) { + dragging = true; + lastDragX = mouseX; + lastDragY = mouseY; + return true; + } } return false; } + protected DiagramIcon currentlyPressedIcon = null; + public void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick) { - if(dragging){ - int dx = mouseX-lastDragX; - int dy = mouseY-lastDragY; - panX += dx/zoom*0.7f; - panY += dy/zoom*0.7f; + if (parent != null && parent.hasSubGui()) return; + if (dragging) { + int dx = mouseX - lastDragX; + int dy = mouseY - lastDragY; + panX += dx / zoom * 0.7f; + panY += dy / zoom * 0.7f; lastDragX = mouseX; lastDragY = mouseY; } + // If an icon is pressed, dispatch held event. + if (currentlyPressedIcon != null) { + onIconHeld(currentlyPressedIcon); + } } public void mouseReleased(int mouseX, int mouseY, int state) { + if (parent != null && parent.hasSubGui()) return; + if (currentlyPressedIcon != null) { + onIconRelease(currentlyPressedIcon); + currentlyPressedIcon = null; + } dragging = false; } - protected boolean isWithin(int mouseX, int mouseY) { + public boolean isWithin(int mouseX, int mouseY) { + if(parent.hasSubGui()) + return false; return mouseX >= x && mouseX <= x+width && mouseY >= y && mouseY <= y+height; } @@ -603,8 +704,8 @@ public abstract class GuiNPCDiagram extends Gui { */ public void handleMouseScroll(int scrollDelta) { zoom += scrollDelta * 0.0009f; - if(zoom<0.5f) zoom = 0.5f; - if(zoom>2.0f) zoom = 2.0f; + if(zoom < 0.5f) zoom = 0.5f; + if(zoom > 2.0f) zoom = 2.0f; } /** @@ -636,7 +737,11 @@ public abstract class GuiNPCDiagram extends Gui { // --------------- public static class DiagramIcon { public int id; - public DiagramIcon(int id) { this.id = id; } + public boolean enabled = true; // If false, the icon is not rendered. + public boolean pressable = false; // If true, it will receive mouse events. + public DiagramIcon(int id) { + this.id = id; + } } public static class DiagramConnection { @@ -650,4 +755,24 @@ public abstract class GuiNPCDiagram extends Gui { this.hoverText = hoverText; } } + + // --------------- + // Icon Event Callbacks (override these in subclasses as needed) + // --------------- + protected void onIconClick(DiagramIcon icon) { + // Called when a pressable icon is clicked. + System.out.println("Icon " + icon.id + " clicked."); + } + + protected void onIconHeld(DiagramIcon icon) { + // Called repeatedly if an icon remains pressed. + // (You can add timing logic to fire this only after a threshold.) + // For now, we simply print once. + System.out.println("Icon " + icon.id + " held."); + } + + protected void onIconRelease(DiagramIcon icon) { + // Called when a pressable icon is released. + System.out.println("Icon " + icon.id + " released."); + } } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiMagicMap.java b/src/main/java/noppes/npcs/client/gui/global/GuiMagicMap.java index 063819dad..2176c798d 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiMagicMap.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiMagicMap.java @@ -4,12 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.Magic; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Items; @@ -17,17 +16,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -public class GuiMagicMap extends GuiNPCDiagram { +public class GuiMagicMap extends GuiDiagram { - private GuiScreen parent; private List magics; - // Keep one RenderItem instance. + + // Single RenderItem instance for efficiency. private RenderItem renderItem = new RenderItem(); - public GuiMagicMap(GuiScreen parent, int x, int y, int width, int height) { - super(x, y, width, height); - this.parent = parent; + public GuiMagicMap(GuiNPCInterface parent, int x, int y, int width, int height) { + super(parent, x, y, width, height); magics = new ArrayList<>(); + + // Cache all magics from the MagicController. for (Magic magic : MagicController.getInstance().magics.values()) { magics.add(magic); } @@ -35,20 +35,25 @@ public class GuiMagicMap extends GuiNPCDiagram { } @Override - protected List getIcons() { + protected List createIcons() { List icons = new ArrayList<>(); for (Magic magic : magics) { - icons.add(new MagicIcon(magic)); + MagicIcon icon = new MagicIcon(magic); + // Set your desired flags (for example, enabled and pressable). + icon.enabled = true; + icon.pressable = true; + icons.add(icon); } return icons; } @Override - protected List getConnections() { + protected List createConnections() { List conns = new ArrayList<>(); // For each Magic, generate connections from each weakness (attacker) to this magic. for (Magic magic : magics) { - if (magic.weaknesses == null) continue; + if (magic.weaknesses == null) + continue; for (Map.Entry entry : magic.weaknesses.entrySet()) { int attackerId = entry.getKey(); float percent = entry.getValue(); @@ -70,7 +75,6 @@ public class GuiMagicMap extends GuiNPCDiagram { RenderHelper.enableGUIStandardItemLighting(); - // Render the icon. if (magic.iconItem != null) { renderItem.renderItemAndEffectIntoGUI(fontRenderer, mc.getTextureManager(), magic.iconItem, iconX, iconY); } else if (magic.iconTexture != null && !magic.iconTexture.isEmpty()) { @@ -82,7 +86,7 @@ public class GuiMagicMap extends GuiNPCDiagram { } RenderHelper.disableStandardItemLighting(); - // If not highlighted, overlay a translucent black rectangle to simulate dimming. + // If the icon is not highlighted, draw a translucent overlay. if (state == IconRenderState.NOT_HIGHLIGHTED) { drawRect(iconX, iconY, iconX + size, iconY + size, 0x80202020); } @@ -101,9 +105,7 @@ public class GuiMagicMap extends GuiNPCDiagram { @Override protected void drawHoveringText(List text, int mouseX, int mouseY, FontRenderer fontRenderer) { - if (parent instanceof GuiNPCInterface2) { - ((GuiNPCInterface2) parent).renderHoveringText(text, mouseX, mouseY, fontRenderer); - } + parent.renderHoveringText(text, mouseX, mouseY, fontRenderer); } /** diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java index 911893d8a..720b12d6b 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageMagic.java @@ -19,23 +19,9 @@ public class GuiNPCManageMagic extends GuiNPCInterface2 { int mapY = guiTop + 10; int mapWidth = 210; int mapHeight = 200; + magicMap = new GuiMagicMap(this, mapX, mapY, mapWidth, mapHeight); - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - super.drawScreen(mouseX, mouseY, partialTicks); - if (magicMap != null) { - magicMap.drawDiagram(mouseX, mouseY); - } - } - - @Override - public void mouseClicked(int mouseX, int mouseY, int mouseButton) { - if (magicMap != null && magicMap.mouseClicked(mouseX, mouseY, mouseButton)) { - return; - } - super.mouseClicked(mouseX, mouseY, mouseButton); + addDiagram(0, magicMap); } @Override @@ -59,11 +45,6 @@ public class GuiNPCManageMagic extends GuiNPCInterface2 { // your existing action handling } - @Override - public void keyTyped(char c, int i) { - super.keyTyped(c, i); - } - @Override public void save() { // your save logic diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index 92c4e39b4..67bb96ad1 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -13,6 +13,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.TextBlockClient; +import noppes.npcs.client.gui.global.GuiDiagram; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; @@ -22,6 +23,7 @@ import org.lwjgl.opengl.GL12; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; public abstract class GuiNPCInterface extends GuiScreen { public EntityClientPlayerMP player; @@ -36,6 +38,7 @@ public abstract class GuiNPCInterface extends GuiScreen { protected HashMap sliders = new HashMap(); protected HashMap extra = new HashMap(); protected HashMap scrollWindows = new HashMap<>(); + protected HashMap diagrams = new HashMap<>(); public static boolean resizingActive = false; @@ -90,6 +93,7 @@ public abstract class GuiNPCInterface extends GuiScreen { scrolls.clear(); sliders.clear(); scrollWindows.clear(); + diagrams.clear(); Keyboard.enableRepeatEvents(true); } @@ -106,7 +110,6 @@ public abstract class GuiNPCInterface extends GuiScreen { } } - public void addExtra(GuiHoverText gui) { gui.setWorldAndResolution(mc, 350, 250); extra.put(gui.id, gui); @@ -118,6 +121,19 @@ public abstract class GuiNPCInterface extends GuiScreen { scrollWindows.put(id, gui); } + /** + * Adds a GuiDiagram to the interface. + * The diagram is initialized with the current resolution and cached. + */ + public void addDiagram(int id, GuiDiagram diagram) { + diagram.invalidateCache(); + diagrams.put(id, diagram); + } + + public GuiDiagram getDiagram(int id) { + return diagrams.get(id); + } + public void mouseClicked(int i, int j, int k) { if (subgui != null) subgui.mouseClicked(i, j, k); @@ -136,6 +152,13 @@ public abstract class GuiNPCInterface extends GuiScreen { scroll.mouseClicked(i, j, k); } } + // Process diagram mouse clicks + for (GuiDiagram diagram : diagrams.values()) { + if (diagram.isWithin(i, j)) { + if (diagram.mouseClicked(i, j, k)) + return; + } + } mouseEvent(i, j, k); super.mouseClicked(i, j, k); } @@ -165,7 +188,7 @@ public abstract class GuiNPCInterface extends GuiScreen { guiScrollableComponent.keyTyped(c, i); } - //Fixes closing sub with escape closes all of it's parents + // Fixes closing sub with escape closes all of its parents boolean enoughTimeSinceSubClosed = Minecraft.getSystemTime() - timeClosedSubGui > 50; if (closeOnEsc && enoughTimeSinceSubClosed && (i == 1 || !GuiNpcTextField.isFieldActive() && isInventoryKey(i))) { @@ -275,6 +298,13 @@ public abstract class GuiNPCInterface extends GuiScreen { } for (GuiScreen gui : extra.values()) gui.drawScreen(i, j, f); + // Draw scrollable windows. + for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) { + guiScrollableComponent.drawScreen(i, j, f, !subGui && guiScrollableComponent.isMouseOver(i, j) ? Mouse.getDWheel() : 0); + } + for (GuiDiagram diagram : diagrams.values()) { + diagram.drawDiagram(i, j, subGui); + } super.drawScreen(i, j, f); for (GuiCustomScroll scroll : scrolls.values()) if (scroll.hoverableText) { @@ -286,9 +316,6 @@ public abstract class GuiNPCInterface extends GuiScreen { button.drawHover(i, j, subGui); } } - for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) { - guiScrollableComponent.drawScreen(i, j, f, !subGui && guiScrollableComponent.isMouseOver(i, j) ? Mouse.getDWheel() : 0); - } if (subgui != null) { subgui.drawScreen(i, j, f); @@ -335,7 +362,7 @@ public abstract class GuiNPCInterface extends GuiScreen { } public boolean isInventoryKey(int i) { - return i == mc.gameSettings.keyBindInventory.getKeyCode(); //inventory key + return i == mc.gameSettings.keyBindInventory.getKeyCode(); // inventory key } @Override @@ -432,6 +459,10 @@ public abstract class GuiNPCInterface extends GuiScreen { OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); } + public void renderHoveringText(List textLines, int x, int y, FontRenderer font) { + this.drawHoveringText(textLines, x, y, font); + } + public void openLink(String link) { try { Class oclass = Class.forName("java.awt.Desktop"); diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java index 9e035f830..a987fe826 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java @@ -65,10 +65,6 @@ public abstract class GuiNPCInterface2 extends GuiNPCInterface drawTexturedModalRect(guiLeft + xSize-230, guiTop, 26, 0, 230, 220); } - public void renderHoveringText(List textLines, int x, int y, FontRenderer font) { - this.drawHoveringText(textLines, x, y, font); - } - protected GuiNpcMenu getMenu(){ return this.menu; }