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

Added new top alignment feature for dialogs.

Browse Source
This commit is contained in:
Luis C.M committed 2023-06-07 18:11:26 -05:00
1 parent 5e1fdce39b
commit e0375c251e
2 files changed
+38 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java
+35 -7
View File
@@ -499,13 +499,30 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
private void drawDialogString(String text, int left, int count, boolean mainDialogText, TextBlockClient block){
int lineOffset = dialog.renderGradual ? (currentBlock < lineBlocks.size() ? lineBlocks.get(currentBlock).lines.size() : lineBlocks.get(lineBlocks.size()-1).lines.size()) - currentLine : 0;
int height = count - totalRows + lineOffset;
int screenPos = optionStart;
int y = (height * ClientProxy.Font.height()) + screenPos + scrollY;
if (!dialog.bottomAligned) {
height = count - totalRows + lineOffset + 1;
screenPos = optionStart - dialog.textHeight + ClientProxy.Font.height() + (totalRows - lineOffset);
int scrollToOffset = 0;
if (totalRows * ClientProxy.Font.height() > dialog.textHeight) {
scrollToOffset = totalRows - lineBlocks.get(lineBlocks.size() - 1).lines.size() + (int) Math.floor(lineBlocks.size() / 2f);
}
y = ((count - scrollToOffset) * ClientProxy.Font.height()) + screenPos + scrollY + height;
}
if (block.titlePos == 0 || mainDialogText) {
if (y < screenPos - dialog.textHeight || y > screenPos - ClientProxy.Font.height()) {
return;
if (!dialog.bottomAligned) {
if (y < optionStart - dialog.textHeight || y > optionStart - ClientProxy.Font.height()/2f) {
return;
}
} else {
if (y < screenPos - dialog.textHeight || y > screenPos - ClientProxy.Font.height()) {
return;
}
}
}
@@ -567,11 +584,22 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
textSoundEnabled = !textSoundEnabled;
}
if (i == mc.gameSettings.keyBindBack.getKeyCode() || i == 201 && scrollY < (totalRows - 2) * ClientProxy.Font.height()) {//Page up
scrollY += ClientProxy.Font.height() * 2;
}
if (i == mc.gameSettings.keyBindBack.getKeyCode() || i == 209 && scrollY > 0) {//Page down
scrollY -= ClientProxy.Font.height() * 2;
if (!dialog.bottomAligned && totalRows * ClientProxy.Font.height() > dialog.textHeight) {
if ((i == mc.gameSettings.keyBindBack.getKeyCode() || i == 201) && scrollY < totalRows * ClientProxy.Font.height()) {//Page up
scrollY += ClientProxy.Font.height() * 2;
}
int latestBlockSize = lineBlocks.get(lineBlocks.size() - 1).lines.size();
if ((i == mc.gameSettings.keyBindBack.getKeyCode() || i == 209) && scrollY > -(latestBlockSize - 2) * ClientProxy.Font.height()) {//Page down
scrollY -= ClientProxy.Font.height() * 2;
}
} else {
if ((i == mc.gameSettings.keyBindBack.getKeyCode() || i == 201) && scrollY < (totalRows - 2) * ClientProxy.Font.height()) {//Page up
scrollY += ClientProxy.Font.height() * 2;
}
if ((i == mc.gameSettings.keyBindBack.getKeyCode() || i == 209) && scrollY > 0) {//Page down
scrollY -= ClientProxy.Font.height() * 2;
}
}
if(i == 28){
src/main/java/noppes/npcs/controllers/data/Dialog.java
+3
View File
@@ -38,6 +38,7 @@ public class Dialog implements ICompatibilty, IDialog {
public boolean disableEsc = false;
public boolean darkenScreen = true;
public boolean showOptionLine = true;
public boolean bottomAligned = false;
public boolean renderGradual = false;
public boolean showPreviousBlocks = true;
@@ -96,6 +97,8 @@ public class Dialog implements ICompatibilty, IDialog {
darkenScreen = true;
}
bottomAligned = compound.getBoolean("DialogScrollUpwards");
NBTTagList options = compound.getTagList("Options", 10);
HashMap<Integer,DialogOption> newoptions = new HashMap<Integer,DialogOption>();