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

RenameRefactor bug fixes and QoL adjustments + improved code

Browse Source 
formatting
This commit is contained in:
bigguy345 committed 2025-12-21 12:11:46 +02:00
1 parent e75e87dd43
commit 06c0a364a9
3 files changed
+209 -89
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
+13 -6
View File
@@ -652,12 +652,17 @@ public class GuiScriptTextArea extends GuiNpcTextField {
List<int[]> renameOccurrences = renameHandler.getOccurrences();
for (int[] occ : renameOccurrences) {
// Check if occurrence overlaps with this line
if (occ[1] > data.start && occ[0] < data.end) {
if (occ[1] >= data.start && occ[0] <= data.end) {
int occStart = Math.max(occ[0] - data.start, 0);
int occEnd = Math.min(occ[1] - data.start, line.length());
if (occStart < occEnd) {
// Handle empty word case - draw 1 pixel wide box
boolean isEmpty = (occ[0] == occ[1]);
if (occStart <= occEnd) { // Changed from < to <= to handle empty case
int s = ClientProxy.Font.width(line.substring(0, occStart));
int e = ClientProxy.Font.width(line.substring(0, occEnd)) + 1;
int e = isEmpty ? s + 2 : ClientProxy.Font.width(
line.substring(0, occEnd)) + 1; // 2px wide for empty
int occX = x + LINE_NUMBER_GUTTER_WIDTH + 1 + s;
int occEndX = x + LINE_NUMBER_GUTTER_WIDTH + 1 + e;
boolean isPrimary = renameHandler.isPrimaryOccurrence(occ[0]);
@@ -687,8 +692,8 @@ public class GuiScriptTextArea extends GuiNpcTextField {
String beforeCursor = currentWord.substring(0,
Math.min(cursorInWord, currentWord.length()));
int cursorX = occX + ClientProxy.Font.width(beforeCursor);
drawRect(cursorX, posY + 1, cursorX + 1, posY + container.lineHeight - 1,
0xFFFFFFFF);
// drawRect(cursorX, posY + 1, cursorX + 1, posY + container.lineHeight - 1,
// 0xFFFFFFFF);
}
}
}
@@ -1115,8 +1120,10 @@ public class GuiScriptTextArea extends GuiNpcTextField {
if (!e.isPress() || !openBoxes.get())
return;
unfocusAll();
if (!renameHandler.isActive()) {
unfocusAll();
active = true;
renameHandler.startRename();
}
});