From 5e537bd3ee7002850d5c8ed1091743449f191ce2 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 25 Apr 2016 13:03:12 +0200 Subject: [PATCH] Add a parameter that indicates whether the page is a left or right side --- .../mantle/client/book/data/content/ContentBlank.java | 2 +- .../client/book/data/content/ContentBlockInteraction.java | 2 +- .../mantle/client/book/data/content/ContentCrafting.java | 2 +- .../mantle/client/book/data/content/ContentDummy.java | 2 +- .../mantle/client/book/data/content/ContentError.java | 2 +- .../mantle/client/book/data/content/ContentImage.java | 2 +- .../mantle/client/book/data/content/ContentImageText.java | 2 +- .../mantle/client/book/data/content/ContentSectionList.java | 2 +- .../mantle/client/book/data/content/ContentSmelting.java | 2 +- .../mantle/client/book/data/content/ContentSmithing.java | 2 +- .../mantle/client/book/data/content/ContentStructure.java | 2 +- .../client/book/data/content/ContentTableOfContents.java | 2 +- .../mantle/client/book/data/content/ContentText.java | 2 +- .../mantle/client/book/data/content/ContentTextImage.java | 2 +- .../client/book/data/content/ContentTextLeftImage.java | 2 +- .../client/book/data/content/ContentTextRightImage.java | 2 +- .../mantle/client/book/data/content/PageContent.java | 2 +- .../java/slimeknights/mantle/client/gui/book/GuiBook.java | 6 +++--- 18 files changed, 20 insertions(+), 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 index 53e73e5..be15034 100644 --- 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 @@ import slimeknights.mantle.client.gui.book.element.BookElement; public class ContentBlank extends PageContent { @Override - public void build(BookData book, ArrayList list) { + public void build(BookData book, ArrayList 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 index b629981..20e6f26 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index c4057e8..158eeca 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index c0143f8..b92d0e3 100644 --- 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 @@ import slimeknights.mantle.client.gui.book.element.BookElement; public class ContentDummy extends PageContent { @Override - public void build(BookData book, ArrayList list) { + public void build(BookData book, ArrayList 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 index 04b971d..ca3d76a 100644 --- 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 class ContentError extends PageContent { } @Override - public void build(BookData book, ArrayList list) { + public void build(BookData book, ArrayList 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 index 8db0308..0b5fe47 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index f8ab626..93ebe69 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index 0c7c32b..3616c39 100644 --- 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 class ContentSectionList extends PageContent { } @Override - public void build(BookData book, ArrayList list) { + public void build(BookData book, ArrayList 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 index 075e264..cc0ad89 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index 39c971b..88149d5 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index 5159100..21d644f 100644 --- 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 class ContentStructure extends PageContent { } @Override - public void build(BookData book, ArrayList list) { + public void build(BookData book, ArrayList 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 index 427853e..9459060 100644 --- 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 class ContentTableOfContents extends PageContent { } @Override - public void build(BookData book, ArrayList list) { + public void build(BookData book, ArrayList 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 index 0721f09..21e4a7b 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index aca5eba..5dfe008 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index 4a12843..4125d6a 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index ff07f79..790b573 100644 --- 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 list) { + public void build(BookData book, ArrayList 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 index 48c7078..f34f321 100644 --- 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 list); + public abstract void build(BookData book, ArrayList list, boolean rightSide); public void addTitle(ArrayList 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 index 65bdc01..8bc9db5 100644 --- 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 @@ public class GuiBook extends GuiScreen implements IProgressMeter { 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); } }