Add a parameter that indicates whether the page is a left or right side

SlimeKnights · Apr 25, 2016 · 5e537bd · 5e537bd
1 parent ffd38cf
commit 5e537bd
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 20 deletions.
diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlank.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlank.java
@@ -12,6 +12,6 @@
 public class ContentBlank extends PageContent {
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
   }
 }
diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlockInteraction.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlockInteraction.java
@@ -33,7 +33,7 @@ public class ContentBlockInteraction extends PageContent {
   public TextData[] description;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int x = GuiBook.PAGE_WIDTH / 2 - IMG_SMITHING.width / 2 - 10;
     int y = TITLE_HEIGHT;
 

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentCrafting.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentCrafting.java
@@ -36,7 +36,7 @@ public class ContentCrafting extends PageContent {
   public TextData[] description;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int x = 0;
     int y = 16;
     int height = 100;

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentDummy.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentDummy.java
@@ -12,7 +12,7 @@
 public class ContentDummy extends PageContent {
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     //TODO load from JSON
   }
 }
diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentError.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentError.java
@@ -27,7 +27,7 @@ public ContentError(String errorStage, Exception e) {
   }
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     addTitle(list, "Error");
 
     TextData[] text = new TextData[1 + (exception != null ? 2 : 0)];

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentImage.java
@@ -18,7 +18,7 @@ public class ContentImage extends PageContent {
   public ImageData image;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
 
     if(title == null || title.isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentImageText.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentImageText.java
@@ -21,7 +21,7 @@ public class ContentImageText extends PageContent {
   public TextData[] text;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
 
     if(title == null || title.isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSectionList.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSectionList.java
@@ -16,7 +16,7 @@ public boolean addSection(SectionData data) {
   }
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int width = (ElementSection.WIDTH + 5) * 3 - 5;
     int height = (ElementSection.HEIGHT + 5) * 3 - 5;
 

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java
@@ -38,7 +38,7 @@ public class ContentSmelting extends PageContent {
   public TextData[] description;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int x = GuiBook.PAGE_WIDTH / 2 - IMG_SMELTING.width / 2;
     int y = TITLE_HEIGHT;
 

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmithing.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmithing.java
@@ -35,7 +35,7 @@ public class ContentSmithing extends PageContent {
   public TextData[] description;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int x = GuiBook.PAGE_WIDTH / 2 - IMG_SMITHING.width / 2;
     int y = TITLE_HEIGHT;
 

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentStructure.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentStructure.java
@@ -42,7 +42,7 @@ public void load() {
   }
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
     if(title == null || title.isEmpty()) {
       y = 0;

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTableOfContents.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTableOfContents.java
@@ -21,7 +21,7 @@ public ContentTableOfContents(String title, TextData... contents) {
   }
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = 0;
 
     if(title != null && !title.trim().isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentText.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentText.java
@@ -18,7 +18,7 @@ public class ContentText extends PageContent {
   public TextData[] text;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
 
     if(title == null || title.isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextImage.java
@@ -21,7 +21,7 @@ public class ContentTextImage extends PageContent {
   public ImageData image;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
 
     if(title == null || title.isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextLeftImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextLeftImage.java
@@ -22,7 +22,7 @@ public class ContentTextLeftImage extends PageContent {
   public TextData[] text2;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
 
     if(title == null || title.isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextRightImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextRightImage.java
@@ -22,7 +22,7 @@ public class ContentTextRightImage extends PageContent {
   public ImageData image;
 
   @Override
-  public void build(BookData book, ArrayList<BookElement> list) {
+  public void build(BookData book, ArrayList<BookElement> list, boolean rightSide) {
     int y = TITLE_HEIGHT;
 
     if(title == null || title.isEmpty()) {

diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/PageContent.java b/src/main/java/slimeknights/mantle/client/book/data/content/PageContent.java
@@ -24,7 +24,7 @@ public abstract class PageContent {
   public void load() {
   }
 
-  public abstract void build(BookData book, ArrayList<BookElement> list);
+  public abstract void build(BookData book, ArrayList<BookElement> list, boolean rightSide);
 
   public void addTitle(ArrayList<BookElement> list, String title) {
     TextData tdTitle = new TextData(title);

diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java
@@ -341,17 +341,17 @@ private void buildPages() {
       PageData page = book.findPage(0, statFile);
 
       if(page != null) {
-        page.content.build(book, rightElements);
+        page.content.build(book, rightElements, false);
       }
     } else {
       PageData leftPage = book.findPage((page - 1) * 2 + 1, statFile);
       PageData rightPage = book.findPage((page - 1) * 2 + 2, statFile);
 
       if(leftPage != null) {
-        leftPage.content.build(book, leftElements);
+        leftPage.content.build(book, leftElements, false);
       }
       if(rightPage != null) {
-        rightPage.content.build(book, rightElements);
+        rightPage.content.build(book, rightElements, true);
       }
     }