From 9c16eef80e02a8bdf0e4f9fb81b8e833709728f3 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 19 Jun 2016 19:28:48 +0200
Subject: [PATCH] Made booklet save its bookmarks. Were a bit useless without
 this...

---
 .../actuallyadditions/mod/booklet/BookletUtils.java       | 8 ++++----
 .../ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java | 6 +++---
 .../mod/booklet/button/BookmarkButton.java                | 2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
index 5f040b42b..5709c42d7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
@@ -294,7 +294,7 @@ public final class BookletUtils{
             }
         }
 
-        booklet.changedPageSinceOpen = true;
+        booklet.shouldSaveDataNextClose = true;
     }
 
     /**
@@ -351,7 +351,7 @@ public final class BookletUtils{
             chapterButton.visible = false;
         }
 
-        booklet.changedPageSinceOpen = true;
+        booklet.shouldSaveDataNextClose = true;
     }
 
     /**
@@ -417,7 +417,7 @@ public final class BookletUtils{
             }
         }
 
-        booklet.changedPageSinceOpen = true;
+        booklet.shouldSaveDataNextClose = true;
     }
 
     /**
@@ -443,7 +443,7 @@ public final class BookletUtils{
             }
         }
 
-        booklet.changedPageSinceOpen = true;
+        booklet.shouldSaveDataNextClose = true;
     }
 
     public static BookletPage getFirstPageForStack(ItemStack stack){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
index 70b5c63bc..5f47512db 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
@@ -88,7 +88,7 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
     public GuiButton buttonPatreon;
     public GuiButton buttonViewOnline;
     public GuiTextField searchField;
-    public boolean changedPageSinceOpen;
+    public boolean shouldSaveDataNextClose;
     private int ticksElapsed;
     private boolean mousePressed;
     private int hisNameIsAt;
@@ -404,7 +404,7 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
             ItemBooklet.forcedEntry = null;
         }
 
-        this.changedPageSinceOpen = false;
+        this.shouldSaveDataNextClose = false;
     }
 
     @Override
@@ -445,7 +445,7 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
 
     @Override
     public void onGuiClosed(){
-        if(this.saveOnClose && this.changedPageSinceOpen){
+        if(this.saveOnClose && this.shouldSaveDataNextClose){
             NBTTagCompound bookletData = new NBTTagCompound();
             BookletUtils.saveBookPage(this, bookletData);
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
index 9bc03fc12..9bee05685 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
@@ -41,6 +41,7 @@ public class BookmarkButton extends GuiButton{
         if(this.assignedEntry.entry != null){
             if(GuiScreen.isShiftKeyDown()){
                 this.assignedEntry.removeEntry();
+                this.booklet.shouldSaveDataNextClose = true;
             }
             else{
                 BookletUtils.openIndexEntry(this.booklet, this.assignedEntry.entry, this.assignedEntry.pageInIndex, true);
@@ -50,6 +51,7 @@ public class BookmarkButton extends GuiButton{
         else{
             if(this.booklet.currentEntrySet.getCurrentEntry() != null){
                 this.assignedEntry.setEntry(this.booklet.currentEntrySet.getCurrentPage(), this.booklet.currentEntrySet.getCurrentChapter(), this.booklet.currentEntrySet.getCurrentEntry(), this.booklet.currentEntrySet.getPageInIndex());
+                this.booklet.shouldSaveDataNextClose = true;
             }
         }
     }