Fixed lexicon bookmarks being weird if you do multiple in the same entry. Closes #1572

This commit is contained in:
Vasco Lavos committed 2015-11-24 21:29:56 +00:00
1 parent cd4936f6c1
commit 4490f3d8cf
2 files changed
+13 -5

No files matched your search

@@ -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());
}
}
}
@@ -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<GuiLexicon> bookmarks = new ArrayList();
public static List<String> bookmarkKeys = new ArrayList();
boolean bookmarksNeedPopulation = false;
public static Queue<LexiconEntry> 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();