From 7b61511a6443fcf9ac119e51820df3aff36d67b5 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Wed, 20 Mar 2024 00:06:08 -0500 Subject: [PATCH 1/2] removed some unused code --- .../noppes/npcs/client/gui/player/GuiDialogInteract.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 57bf7c6f3..e2aebb814 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -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; } From e759916c01e95eb8efd2a4796beb04f2b9062d62 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Wed, 20 Mar 2024 00:40:05 -0500 Subject: [PATCH 2/2] Fixed duplication glitch with custom gui slots --- .../npcs/scripted/gui/ScriptGuiItemSlot.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java index d7276d1c2..b33e2f204 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGuiItemSlot.java @@ -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; - } }