DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when inserting new line anywhere but at the end

Browse Source
This commit is contained in:
johni0702
2015-08-16 11:33:52 +02:00
parent 7808f37c5e
commit 8d7bc1b8d6
2 changed files with 113 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiTextArea.java
View File

@@ -252,7 +252,7 @@ public abstract class AbstractGuiTextArea<T extends AbstractGuiTextArea<T>>
newText[cursorY + 1] = text[cursorY].substring(cursorX); newText[cursorY + 1] = text[cursorY].substring(cursorX);
if (cursorY + 1 < text.length) { if (cursorY + 1 < text.length) {
System.arraycopy(text, cursorY + 1, newText, cursorY + 1, text.length - cursorY - 1); System.arraycopy(text, cursorY + 1, newText, cursorY + 2, text.length - cursorY - 1);
} }
text = newText; text = newText;
selectionX = cursorX = 0; selectionX = cursorX = 0;

215
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java
View File

@@ -250,7 +250,7 @@ public class GuiTextArea extends Gui implements GuiElement, GuiOutsideClickableE
newText[cursorY + 1] = text[cursorY].substring(cursorX); newText[cursorY + 1] = text[cursorY].substring(cursorX);
if (cursorY + 1 < text.length) { if (cursorY + 1 < text.length) {
System.arraycopy(text, cursorY + 1, newText, cursorY + 1, text.length - cursorY - 1); System.arraycopy(text, cursorY + 1, newText, cursorY + 2, text.length - cursorY - 1);
} }
text = newText; text = newText;
selectionX = cursorX = 0; selectionX = cursorX = 0;
@@ -510,118 +510,127 @@ public class GuiTextArea extends Gui implements GuiElement, GuiOutsideClickableE
return; return;
} }
if (GuiScreen.isCtrlKeyDown()) { try {
if (GuiScreen.isCtrlKeyDown()) {
switch (keyCode) {
case Keyboard.KEY_A: // Select all
cursorX = cursorY = 0;
selectionY = text.length - 1;
selectionX = text[selectionY].length();
updateCurrentXOffset();
updateCurrentYOffset();
return;
case Keyboard.KEY_C: // Copy
GuiScreen.setClipboardString(getSelectedText());
return;
case Keyboard.KEY_V: // Paste
if (enabled) {
writeText(GuiScreen.getClipboardString());
}
return;
case Keyboard.KEY_X: // Cut
if (enabled) {
GuiScreen.setClipboardString(cutSelectedText());
}
return;
}
}
boolean words = GuiScreen.isCtrlKeyDown();
boolean select = GuiScreen.isShiftKeyDown();
switch (keyCode) { switch (keyCode) {
case Keyboard.KEY_A: // Select all case Keyboard.KEY_HOME:
cursorX = cursorY = 0; cursorX = 0;
selectionY = text.length - 1; break;
selectionX = text[selectionY].length(); case Keyboard.KEY_END:
updateCurrentXOffset(); cursorX = text[cursorY].length();
updateCurrentYOffset(); break;
return; case Keyboard.KEY_LEFT:
case Keyboard.KEY_C: // Copy if (cursorX == 0) {
GuiScreen.setClipboardString(getSelectedText()); if (cursorY > 0) {
return; cursorY--;
case Keyboard.KEY_V: // Paste cursorX = text[cursorY].length();
}
} else {
if (words) {
cursorX -= getPreviousWordLength();
} else {
cursorX--;
}
}
break;
case Keyboard.KEY_RIGHT:
if (cursorX == text[cursorY].length()) {
if (cursorY < text.length - 1) {
cursorY++;
cursorX = 0;
}
} else {
if (words) {
cursorX += getNextWordLength();
} else {
cursorX++;
}
}
break;
case Keyboard.KEY_UP:
if (cursorY > 0) {
cursorY--;
cursorX = Math.min(cursorX, text[cursorY].length());
}
break;
case Keyboard.KEY_DOWN:
if (cursorY + 1 < text.length) {
cursorY++;
cursorX = Math.min(cursorX, text[cursorY].length());
}
break;
case Keyboard.KEY_BACK:
if (enabled) { if (enabled) {
writeText(GuiScreen.getClipboardString()); if (getSelectedText().length() > 0) {
deleteSelectedText();
} else if (words) {
deletePreviousWord();
} else {
deletePreviousChar();
}
} }
return; return;
case Keyboard.KEY_X: // Cut case Keyboard.KEY_DELETE:
if (enabled) { if (enabled) {
GuiScreen.setClipboardString(cutSelectedText()); if (getSelectedText().length() > 0) {
deleteSelectedText();
} else if (words) {
deleteNextWord();
} else {
deleteNextChar();
}
}
return;
default:
if (enabled) {
if (key == '\r') {
key = '\n';
}
writeChar(key);
} }
return; return;
} }
}
boolean words = GuiScreen.isCtrlKeyDown(); updateCurrentXOffset();
boolean select = GuiScreen.isShiftKeyDown(); updateCurrentYOffset();
switch (keyCode) {
case Keyboard.KEY_HOME:
cursorX = 0;
break;
case Keyboard.KEY_END:
cursorX = text[cursorY].length();
break;
case Keyboard.KEY_LEFT:
if (cursorX == 0) {
if (cursorY > 0) {
cursorY--;
cursorX = text[cursorY].length();
}
} else {
if (words) {
cursorX -= getPreviousWordLength();
} else {
cursorX--;
}
}
break;
case Keyboard.KEY_RIGHT:
if (cursorX == text[cursorY].length()) {
if (cursorY < text.length - 1) {
cursorY++;
cursorX = 0;
}
} else {
if (words) {
cursorX += getNextWordLength();
} else {
cursorX++;
}
}
break;
case Keyboard.KEY_UP:
if (cursorY > 0) {
cursorY--;
cursorX = Math.min(cursorX, text[cursorY].length());
}
break;
case Keyboard.KEY_DOWN:
if (cursorY + 1 < text.length) {
cursorY++;
cursorX = Math.min(cursorX, text[cursorY].length());
}
break;
case Keyboard.KEY_BACK:
if (enabled) {
if (getSelectedText().length() > 0) {
deleteSelectedText();
} else if (words) {
deletePreviousWord();
} else {
deletePreviousChar();
}
}
return;
case Keyboard.KEY_DELETE:
if (enabled) {
if (getSelectedText().length() > 0) {
deleteSelectedText();
} else if (words) {
deleteNextWord();
} else {
deleteNextChar();
}
}
return;
default:
if (enabled) {
if (key == '\r') {
key = '\n';
}
writeChar(key);
}
return;
}
updateCurrentXOffset(); if (!select) {
updateCurrentYOffset(); selectionX = cursorX;
selectionY = cursorY;
if (!select) { }
selectionX = cursorX; } finally {
selectionY = cursorY; System.out.println(cursorX + "/" + cursorY);
System.out.println(selectionX + "/" + selectionY);
System.out.println("Lines (" + text.length + "): ");
for (String line : text) {
System.out.println(line);
}
} }
} }