Un-nest PersistentData inner classes. It was a bit silly.

Tagnum-Mods · Jun 22, 2022 · 4640df3 · 4640df3
1 parent e3865d8
commit 4640df3
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 38 deletions.
diff --git a/Xplat/src/main/java/vazkii/patchouli/client/base/PersistentData.java b/Xplat/src/main/java/vazkii/patchouli/client/base/PersistentData.java
@@ -34,48 +34,41 @@ public static void save() {
 	}
 
 	public static final class DataHolder {
-
 		public int bookGuiScale = 0;
 		public boolean clickedVisualize = false;
 
-		Map<String, BookData> bookData = new HashMap<>();
+		Map<String, PersistentData.BookData> bookData = new HashMap<>();
 
-		public BookData getBookData(Book book) {
+		public PersistentData.BookData getBookData(Book book) {
 			String res = book.id.toString();
 			if (!bookData.containsKey(res)) {
-				bookData.put(res, new BookData());
+				bookData.put(res, new PersistentData.BookData());
 			}
 
 			return bookData.get(res);
 		}
+	}
 
-		public static final class BookData {
-
-			public List<String> viewedEntries = new ArrayList<>();
-			public List<Bookmark> bookmarks = new ArrayList<>();
-			public List<String> history = new ArrayList<>();
-			public List<String> completedManualQuests = new ArrayList<>();
-
-			public static final class Bookmark {
-
-				public String entry;
-				// Serialized as page for legacy reasons
-				@SerializedName("page") public int spread;
-
-				public Bookmark(String entry, int spread) {
-					this.entry = entry;
-					this.spread = spread;
-				}
-
-				public BookEntry getEntry(Book book) {
-					ResourceLocation res = new ResourceLocation(entry);
-					return book.getContents().entries.get(res);
-				}
-
-			}
+	public static final class Bookmark {
+		public String entry;
+		// Serialized as page for legacy reasons
+		@SerializedName("page") public int spread;
 
+		public Bookmark(String entry, int spread) {
+			this.entry = entry;
+			this.spread = spread;
 		}
 
+		public BookEntry getEntry(Book book) {
+			ResourceLocation res = new ResourceLocation(entry);
+			return book.getContents().entries.get(res);
+		}
 	}
 
+	public static final class BookData {
+		public List<String> viewedEntries = new ArrayList<>();
+		public List<Bookmark> bookmarks = new ArrayList<>();
+		public List<String> history = new ArrayList<>();
+		public List<String> completedManualQuests = new ArrayList<>();
+	}
 }
diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/BookEntry.java b/Xplat/src/main/java/vazkii/patchouli/client/book/BookEntry.java
@@ -14,7 +14,7 @@
 import vazkii.patchouli.api.PatchouliAPI;
 import vazkii.patchouli.client.base.ClientAdvancements;
 import vazkii.patchouli.client.base.PersistentData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData;
+import vazkii.patchouli.client.base.PersistentData.BookData;
 import vazkii.patchouli.client.book.page.PageEmpty;
 import vazkii.patchouli.client.book.page.PageQuest;
 import vazkii.patchouli.common.base.PatchouliConfig;

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBook.java b/Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBook.java
@@ -27,7 +27,7 @@
 
 import vazkii.patchouli.client.base.ClientTicker;
 import vazkii.patchouli.client.base.PersistentData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData.Bookmark;
+import vazkii.patchouli.client.base.PersistentData.Bookmark;
 import vazkii.patchouli.client.book.*;
 import vazkii.patchouli.client.book.gui.button.*;
 import vazkii.patchouli.client.handler.MultiblockVisualizationHandler;

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBookEntry.java b/Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBookEntry.java
@@ -16,8 +16,8 @@
 import vazkii.patchouli.api.IComponentRenderContext;
 import vazkii.patchouli.client.RenderHelper;
 import vazkii.patchouli.client.base.PersistentData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData.Bookmark;
+import vazkii.patchouli.client.base.PersistentData.BookData;
+import vazkii.patchouli.client.base.PersistentData.Bookmark;
 import vazkii.patchouli.client.book.BookEntry;
 import vazkii.patchouli.client.book.BookPage;
 import vazkii.patchouli.common.book.Book;

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBookHistory.java b/Xplat/src/main/java/vazkii/patchouli/client/book/gui/GuiBookHistory.java
@@ -5,7 +5,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 import vazkii.patchouli.client.base.PersistentData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData;
+import vazkii.patchouli.client.base.PersistentData.BookData;
 import vazkii.patchouli.client.book.BookEntry;
 import vazkii.patchouli.common.book.Book;
 

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/gui/button/GuiButtonBookBookmark.java b/Xplat/src/main/java/vazkii/patchouli/client/book/gui/button/GuiButtonBookBookmark.java
@@ -8,7 +8,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData.Bookmark;
+import vazkii.patchouli.client.base.PersistentData.Bookmark;
 import vazkii.patchouli.client.book.BookEntry;
 import vazkii.patchouli.client.book.gui.GuiBook;
 import vazkii.patchouli.common.book.Book;

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/gui/button/GuiButtonBookMarkRead.java b/Xplat/src/main/java/vazkii/patchouli/client/book/gui/button/GuiButtonBookMarkRead.java
@@ -59,7 +59,7 @@ private void markEntry(BookEntry entry) {
 		String key = entry.getId().toString();
 
 		if (!entry.isLocked() && entry.getReadState().equals(EntryDisplayState.UNREAD)) {
-			PersistentData.DataHolder.BookData data = PersistentData.data.getBookData(book);
+			PersistentData.BookData data = PersistentData.data.getBookData(book);
 
 			if (!data.viewedEntries.contains(key)) {
 				data.viewedEntries.add(key);

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/page/PageMultiblock.java b/Xplat/src/main/java/vazkii/patchouli/client/book/page/PageMultiblock.java
@@ -23,7 +23,7 @@
 import vazkii.patchouli.api.PatchouliAPI;
 import vazkii.patchouli.client.base.ClientTicker;
 import vazkii.patchouli.client.base.PersistentData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData.Bookmark;
+import vazkii.patchouli.client.base.PersistentData.Bookmark;
 import vazkii.patchouli.client.book.BookContentsBuilder;
 import vazkii.patchouli.client.book.BookEntry;
 import vazkii.patchouli.client.book.gui.GuiBook;

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/book/page/PageQuest.java b/Xplat/src/main/java/vazkii/patchouli/client/book/page/PageQuest.java
@@ -11,7 +11,7 @@
 
 import vazkii.patchouli.client.base.ClientAdvancements;
 import vazkii.patchouli.client.base.PersistentData;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData;
+import vazkii.patchouli.client.base.PersistentData.BookData;
 import vazkii.patchouli.client.book.BookContentsBuilder;
 import vazkii.patchouli.client.book.BookEntry;
 import vazkii.patchouli.client.book.gui.GuiBook;

diff --git a/Xplat/src/main/java/vazkii/patchouli/client/handler/MultiblockVisualizationHandler.java b/Xplat/src/main/java/vazkii/patchouli/client/handler/MultiblockVisualizationHandler.java
@@ -41,7 +41,7 @@
 import vazkii.patchouli.api.PatchouliAPI;
 import vazkii.patchouli.client.RenderHelper;
 import vazkii.patchouli.client.base.ClientTicker;
-import vazkii.patchouli.client.base.PersistentData.DataHolder.BookData.Bookmark;
+import vazkii.patchouli.client.base.PersistentData.Bookmark;
 import vazkii.patchouli.common.multiblock.StateMatcher;
 import vazkii.patchouli.common.util.RotationUtil;
 import vazkii.patchouli.mixin.client.AccessorMultiBufferSource;