From 4490f3d8cf98eb4054791edc142111a91361016a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 21:29:56 +0000 Subject: [PATCH] Fixed lexicon bookmarks being weird if you do multiple in the same entry. Closes #1572 --- .../core/handler/PersistentVariableHelper.java | 4 +++- .../botania/client/gui/lexicon/GuiLexicon.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index e00303637..49c0bd42b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -85,8 +85,10 @@ public final class PersistentVariableHelper { for(int i = 0; i < count; i++) { NBTTagCompound bookmarkCmp = bookmarksCmp.getCompoundTag(TAG_BOOKMARK_PREFIX + i); GuiLexicon gui = GuiLexicon.create(bookmarkCmp); - if(gui != null) + if(gui != null) { GuiLexicon.bookmarks.add(gui); + GuiLexicon.bookmarkKeys.add(gui.getNotesKey()); + } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index e569972b6..7d50c00ef 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -78,6 +78,7 @@ public class GuiLexicon extends GuiScreen { public static final int NOTES_BUTTON_ID = 1336; // random button tho public static final int MAX_BOOKMARK_COUNT = 8; public static List bookmarks = new ArrayList(); + public static List bookmarkKeys = new ArrayList(); boolean bookmarksNeedPopulation = false; public static Queue tutorial = new ArrayDeque(); @@ -392,19 +393,24 @@ public class GuiLexicon extends GuiScreen { public void handleBookmark(GuiButton par1GuiButton) { boolean modified = false; int i = par1GuiButton.id - BOOKMARK_START; + String key = getNotesKey(); if(i == bookmarks.size()) { - if(!bookmarks.contains(this)) { - bookmarks.add(this); + if(!bookmarkKeys.contains(key)) { + bookmarks.add(this.copy()); + bookmarkKeys.add(key); modified = true; } } else { if(isShiftKeyDown()) { - bookmarks.remove(i); + int index = bookmarkKeys.indexOf(key); + bookmarks.remove(index); + bookmarkKeys.remove(index); + modified = true; } else { GuiLexicon bookmark = bookmarks.get(i).copy(); - Minecraft.getMinecraft().displayGuiScreen(bookmark); if(!bookmark.getTitle().equals(getTitle())) { + Minecraft.getMinecraft().displayGuiScreen(bookmark); if(bookmark instanceof IParented) ((IParented) bookmark).setParent(this); ClientTickHandler.notifyPageChange();