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

Add a Highlighting, Not Highlighted and Default State + Fix Panning and Hovering Positioning

Browse Source
This commit is contained in:
Kam committed 2025-02-03 20:22:16 -05:00
1 parent 64b033da65
commit d84092eeaf
2 files changed
+57 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/global/GuiMagicMap.java
+13 -13
View File
@@ -60,35 +60,35 @@ public class GuiMagicMap extends GuiNPCDiagram {
}
@Override
protected void renderIcon(DiagramIcon icon, int posX, int posY, boolean highlighted) {
// Cast to our custom wrapper class.
protected void renderIcon(DiagramIcon icon, int posX, int posY, IconRenderState state) {
Magic magic = ((MagicIcon) icon).magic;
Minecraft mc = Minecraft.getMinecraft();
FontRenderer fontRenderer = mc.fontRenderer;
int iconSize = this.iconSize;
int iconX = posX - iconSize / 2;
int iconY = posY - iconSize / 2;
int size = this.iconSize;
int iconX = posX - size / 2;
int iconY = posY - size / 2;
if (!highlighted) {
GL11.glColor4f(0.4f, 0.4f, 0.4f, 1f);
}
// Use standard item lighting.
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()) {
mc.getTextureManager().bindTexture(new ResourceLocation(magic.iconTexture));
this.drawTexturedModalRect(iconX, iconY, 0, 0, iconSize, iconSize);
this.drawTexturedModalRect(iconX, iconY, 0, 0, size, size);
} else {
ItemStack sword = new ItemStack(Items.iron_sword);
renderItem.renderItemAndEffectIntoGUI(fontRenderer, mc.getTextureManager(), sword, iconX, iconY);
}
RenderHelper.disableStandardItemLighting();
if (!highlighted) {
GL11.glColor4f(1f, 1f, 1f, 1f);
// If not highlighted, overlay a translucent black rectangle to simulate dimming.
if (state == IconRenderState.NOT_HIGHLIGHTED) {
drawRect(iconX, iconY, iconX + size, iconY + size, 0x80202020);
}
// Reset color.
GL11.glColor4f(1f, 1f, 1f, 1f);
}
@Override
src/main/java/noppes/npcs/client/gui/global/GuiNPCDiagram.java
+44 -24
View File
@@ -103,7 +103,7 @@ public abstract class GuiNPCDiagram extends Gui {
// ---------------
protected abstract List<DiagramIcon> getIcons();
protected abstract List<DiagramConnection> getConnections();
protected abstract void renderIcon(DiagramIcon icon, int posX, int posY, boolean highlighted);
protected abstract void renderIcon(DiagramIcon icon, int posX, int posY, IconRenderState state);
protected List<String> getIconTooltip(DiagramIcon icon) { return null; }
protected List<String> getConnectionTooltip(DiagramConnection conn) {
List<String> tooltip = new ArrayList<>();
@@ -331,28 +331,35 @@ public abstract class GuiNPCDiagram extends Gui {
// Main Draw Method
// ---------------
public void drawDiagram(int mouseX, int mouseY) {
// Update zoom based on mouse scroll.
handleMouseScroll(Mouse.getDWheel());
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int factor = sr.getScaleFactor();
// Retrieve (cached) positions.
Map<Integer, Point> positions = calculatePositions();
int centerX = x + width / 2, centerY = y + height / 2;
int tMouseX = centerX + (int)((mouseX - centerX) / zoom);
int tMouseY = centerY + (int)((mouseY - centerY) / zoom);
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<Integer> selectedIconIds = new HashSet<>();
// Check for icon hover using effective coordinates.
for (DiagramIcon icon : getIcons()) {
Point pos = positions.get(icon.id);
if (pos == null) continue;
int slotX = pos.x + (int)panX - slotSize / 2;
int slotY = pos.y + (int)panY - slotSize / 2;
if (tMouseX >= slotX && tMouseX < slotX + slotSize &&
tMouseY >= slotY && tMouseY < slotY + slotSize) {
int slotX = pos.x - slotSize / 2;
int slotY = pos.y - slotSize / 2;
if (effectiveMouseX >= slotX && effectiveMouseX < slotX + slotSize &&
effectiveMouseY >= slotY && effectiveMouseY < slotY + slotSize) {
hoveredIconId = icon.id;
selectedIconIds.add(icon.id);
break;
@@ -366,14 +373,14 @@ public abstract class GuiNPCDiagram extends Gui {
}
}
} else {
// If no icon is hovered, check for connection hover.
final double threshold = 5.0;
outer:
for (DiagramConnection conn : getConnections()) {
Point pFrom = positions.get(conn.idFrom);
Point pTo = positions.get(conn.idTo);
if (pFrom == null || pTo == null) continue;
double dist = pointLineDistance(tMouseX, tMouseY,
pFrom.x + panX, pFrom.y + panY, pTo.x + panX, pTo.y + panY);
double dist = pointLineDistance(effectiveMouseX, effectiveMouseY, pFrom.x, pFrom.y, pTo.x, pTo.y);
if (dist < threshold) {
hoveredConnFrom = conn.idFrom;
hoveredConnTo = conn.idTo;
@@ -388,48 +395,53 @@ 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, centerY, 0);
GL11.glTranslatef(centerX + panX, centerY + panY, 0);
GL11.glScalef(zoom, zoom, 1.0f);
GL11.glTranslatef(-centerX, -centerY, 0);
// Draw connections (arrows).
for (DiagramConnection conn : getConnections()) {
Point pFrom = positions.get(conn.idFrom);
Point pTo = positions.get(conn.idTo);
if (pFrom == null || pTo == null) continue;
int ax = pFrom.x + (int)panX;
int ay = pFrom.y + (int)panY;
int bx = pTo.x + (int)panX;
int by = pTo.y + (int)panY;
int ax = pFrom.x;
int ay = pFrom.y;
int bx = pTo.x;
int by = pTo.y;
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()) {
Point pos = positions.get(icon.id);
if (pos == null) continue;
int slotX = pos.x + (int)panX - slotSize / 2;
int slotY = pos.y + (int)panY - slotSize / 2;
boolean highlighted = !selectedIconIds.isEmpty() && selectedIconIds.contains(icon.id);
int slotX = pos.x - slotSize / 2;
int slotY = pos.y - slotSize / 2;
boolean highlighted = selectedIconIds.isEmpty() || selectedIconIds.contains(icon.id);
drawIconBox(slotX, slotY, slotSize, highlighted);
renderIcon(icon, pos.x + (int)panX, pos.y + (int)panY, highlighted);
IconRenderState state = highlighted ? IconRenderState.HIGHLIGHTED : IconRenderState.NOT_HIGHLIGHTED;
renderIcon(icon, pos.x, pos.y, state);
}
GL11.glPopMatrix();
// Draw arrow heads.
if (showArrowHeads) {
GL11.glPushMatrix();
GL11.glTranslatef(centerX, centerY, 0);
GL11.glTranslatef(centerX + panX, centerY + panY, 0);
GL11.glScalef(zoom, zoom, 1.0f);
GL11.glTranslatef(-centerX, -centerY, 0);
for (DiagramConnection conn : getConnections()) {
Point pFrom = positions.get(conn.idFrom);
Point pTo = positions.get(conn.idTo);
if (pFrom == null || pTo == null) continue;
int ax = pFrom.x + (int)panX;
int ay = pFrom.y + (int)panY;
int bx = pTo.x + (int)panX;
int by = pTo.y + (int)panY;
int ax = pFrom.x;
int ay = pFrom.y;
int bx = pTo.x;
int by = pTo.y;
boolean dim = !selectedIconIds.isEmpty() &&
!(selectedIconIds.contains(conn.idFrom) && selectedIconIds.contains(conn.idTo));
drawArrowHead(ax, ay, bx, by, conn, dim);
@@ -438,6 +450,7 @@ public abstract class GuiNPCDiagram extends Gui {
}
GL11.glDisable(GL11.GL_SCISSOR_TEST);
// Use original mouseX and mouseY (screen coordinates) for tooltips.
if (hoveredIconId != null) {
DiagramIcon icon = getIconById(hoveredIconId);
List<String> tooltip = getIconTooltip(icon);
@@ -453,6 +466,7 @@ public abstract class GuiNPCDiagram extends Gui {
}
}
protected DiagramIcon getIconById(int id) {
for (DiagramIcon icon : getIcons()) {
if (icon.id == id)
@@ -610,6 +624,12 @@ public abstract class GuiNPCDiagram extends Gui {
this.useColorScaling = useColorScaling;
}
public enum IconRenderState {
DEFAULT,
HIGHLIGHTED,
NOT_HIGHLIGHTED;
}
// ---------------
// Inner Classes for Data Wrapping
// ---------------