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

Merge branch 'dev' of https://github.com/KAMKEEL/CustomNPC-Plus into dev

Browse Source
This commit is contained in:
Kam committed 2024-03-20 01:41:55 -04:00
2 parents 679f9be77b e759916c01
commit 2b494400c9
2 files changed
+1 -26
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
+1 -8
View File
@@ -511,14 +511,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
if (dialog.alignment == 1) {
int i = totalRows - lineBlocks.get(lineBlocks.size() - 1).lines.size() - 1;
height = count - totalRows + lineOffset - i + 1;
screenPos = ClientProxy.Font.height() * (totalRows - lineOffset);// 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;
screenPos = ClientProxy.Font.height() * (totalRows - lineOffset);
y = (height * ClientProxy.Font.height()) + screenPos + scrollY;
}
src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java
-18
View File
@@ -43,22 +43,4 @@ public class ScriptGuiItemSlot extends ScriptGuiComponent implements IItemSlot {
public int getType() {
return 5;
}
public NBTTagCompound toNBT(NBTTagCompound nbt) {
super.toNBT(nbt);
if (this.hasStack()) {
nbt.setTag("stack", this.stack.getItemNbt().getMCNBT());
}
return nbt;
}
public ScriptGuiComponent fromNBT(NBTTagCompound nbt) {
super.fromNBT(nbt);
if (nbt.hasKey("stack")) {
this.setStack(NpcAPI.Instance().getIItemStack(ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("stack"))));
}
return this;
}
}