From 779dfd06cd8b1ca70846ae7691f128631f051bef Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 26 Jan 2016 21:44:44 +1100 Subject: [PATCH] Remove author tags, add @SideOnlyies, reformat code for books --- .../mantle/client/book/BookLoader.java | 11 +++++++---- .../mantle/client/book/ResourceHelper.java | 3 --- .../mantle/client/book/data/BookData.java | 3 --- .../mantle/client/book/data/CoverData.java | 7 ++++--- .../mantle/client/book/data/IDataItem.java | 3 --- .../mantle/client/book/data/PageData.java | 9 +++------ .../mantle/client/book/data/SectionData.java | 3 --- .../client/book/data/content/ContentBlank.java | 8 ++++---- .../client/book/data/content/ContentDummy.java | 6 +++--- .../client/book/data/content/ContentError.java | 6 ------ .../client/book/data/content/ContentImage.java | 10 +++++----- .../book/data/content/ContentImageText.java | 10 +++++----- .../client/book/data/content/ContentText.java | 6 ++---- .../book/data/content/ContentTextImage.java | 10 +++++----- .../data/content/ContentTextLeftImage.java | 12 ++++++------ .../data/content/ContentTextRightImage.java | 12 ++++++------ .../client/book/data/content/PageContent.java | 3 --- .../client/book/data/element/CriteriaData.java | 3 --- .../client/book/data/element/ImageData.java | 5 +---- .../client/book/data/element/TextData.java | 4 +--- .../mantle/client/gui/book/GuiArrow.java | 3 --- .../mantle/client/gui/book/GuiBook.java | 3 --- .../client/gui/book/TextDataRenderer.java | 3 --- .../client/gui/book/element/BookElement.java | 3 --- .../client/gui/book/element/ElementImage.java | 18 +++++++++--------- .../client/gui/book/element/ElementItem.java | 10 +++++----- .../client/gui/book/element/ElementText.java | 3 --- .../gui/book/element/SizedBookElement.java | 3 --- 28 files changed, 66 insertions(+), 114 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java index a552599..7c0742b 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookLoader.java +++ b/src/main/java/slimeknights/mantle/client/book/BookLoader.java @@ -10,15 +10,18 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.BookData; +import slimeknights.mantle.client.book.data.content.ContentBlank; import slimeknights.mantle.client.book.data.content.ContentError; -import slimeknights.mantle.client.book.data.content.*; +import slimeknights.mantle.client.book.data.content.ContentImage; +import slimeknights.mantle.client.book.data.content.ContentImageText; +import slimeknights.mantle.client.book.data.content.ContentText; +import slimeknights.mantle.client.book.data.content.ContentTextImage; +import slimeknights.mantle.client.book.data.content.ContentTextLeftImage; +import slimeknights.mantle.client.book.data.content.ContentTextRightImage; import slimeknights.mantle.client.book.data.content.PageContent; import slimeknights.mantle.client.gui.book.GuiBook; import static slimeknights.mantle.client.book.ResourceHelper.setBookRoot; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class BookLoader implements IResourceManagerReloadListener { diff --git a/src/main/java/slimeknights/mantle/client/book/ResourceHelper.java b/src/main/java/slimeknights/mantle/client/book/ResourceHelper.java index bb3df35..c453b27 100644 --- a/src/main/java/slimeknights/mantle/client/book/ResourceHelper.java +++ b/src/main/java/slimeknights/mantle/client/book/ResourceHelper.java @@ -10,9 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class ResourceHelper { diff --git a/src/main/java/slimeknights/mantle/client/book/data/BookData.java b/src/main/java/slimeknights/mantle/client/book/data/BookData.java index 36e879c..bb84eaf 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/BookData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/BookData.java @@ -12,9 +12,6 @@ import static slimeknights.mantle.client.book.ResourceHelper.getResourceLocation import static slimeknights.mantle.client.book.ResourceHelper.resourceExists; import static slimeknights.mantle.client.book.ResourceHelper.resourceToString; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class BookData implements IDataItem { diff --git a/src/main/java/slimeknights/mantle/client/book/data/CoverData.java b/src/main/java/slimeknights/mantle/client/book/data/CoverData.java index 739d7e0..f6850a4 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/CoverData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/CoverData.java @@ -1,8 +1,9 @@ package slimeknights.mantle.client.book.data; -/** - * @author fuj1n - */ +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) public class CoverData implements IDataItem { public int color = 0x8B4631; diff --git a/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java b/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java index 0dbe054..e06926f 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java +++ b/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java @@ -3,9 +3,6 @@ package slimeknights.mantle.client.book.data; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public interface IDataItem { diff --git a/src/main/java/slimeknights/mantle/client/book/data/PageData.java b/src/main/java/slimeknights/mantle/client/book/data/PageData.java index 6bd9f36..402057e 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/PageData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/PageData.java @@ -12,9 +12,6 @@ import static slimeknights.mantle.client.book.ResourceHelper.getResource; import static slimeknights.mantle.client.book.ResourceHelper.getResourceLocation; import static slimeknights.mantle.client.book.ResourceHelper.resourceToString; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class PageData implements IDataItem { @@ -40,11 +37,11 @@ public class PageData implements IDataItem { e.printStackTrace(); } - for(Field f : content.getClass().getFields()){ - if(f.getType().isAssignableFrom(ImageData.class)) + for (Field f : content.getClass().getFields()) { + if (f.getType().isAssignableFrom(ImageData.class)) try { f.setAccessible(true); - ImageData d = (ImageData)f.get(content); + ImageData d = (ImageData) f.get(content); d.location = getResourceLocation(d.file); } catch (IllegalAccessException e) { e.printStackTrace(); diff --git a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java index ae35127..9f52b21 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java @@ -13,9 +13,6 @@ import static slimeknights.mantle.client.book.ResourceHelper.getResource; import static slimeknights.mantle.client.book.ResourceHelper.getResourceLocation; import static slimeknights.mantle.client.book.ResourceHelper.resourceToString; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class SectionData implements IDataItem { 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 85c7b6b..10fdb05 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 @@ -1,12 +1,12 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.gui.book.element.BookElement; -/** - * @author fuj1n - */ -public class ContentBlank extends PageContent{ +@SideOnly(Side.CLIENT) +public class ContentBlank extends PageContent { @Override public void build(ArrayList list) { 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 2380747..a497b58 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 @@ -1,11 +1,11 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.gui.book.element.BookElement; -/** - * @author fuj1n - */ +@SideOnly(Side.CLIENT) public class ContentDummy extends PageContent { @Override 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 ea0076c..95d3784 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 @@ -1,19 +1,13 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; -import slimeknights.mantle.client.gui.book.element.ElementItem; import slimeknights.mantle.client.gui.book.element.ElementText; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class ContentError extends PageContent { 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 6e35933..76af882 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 @@ -1,21 +1,21 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; -/** - * @author fuj1n - */ -public class ContentImage extends PageContent{ +@SideOnly(Side.CLIENT) +public class ContentImage extends PageContent { public ImageData image; @Override public void build(ArrayList list) { - if(image != null && image.location != null) + if (image != null && image.location != null) list.add(new ElementImage(15, 15, GuiBook.PAGE_WIDTH - 30, GuiBook.PAGE_HEIGHT - 30, image)); else list.add(new ElementImage(image)); 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 7e3be28..7be3a52 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 @@ -1,6 +1,8 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.GuiBook; @@ -8,9 +10,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -/** - * @author fuj1n - */ +@SideOnly(Side.CLIENT) public class ContentImageText extends PageContent { public ImageData image; @@ -18,12 +18,12 @@ public class ContentImageText extends PageContent { @Override public void build(ArrayList list) { - if(image != null && image.location != null) + if (image != null && image.location != null) list.add(new ElementImage(15, 15, GuiBook.PAGE_WIDTH - 30, 70, image)); else list.add(new ElementImage(15, 15, 32, 32, ImageData.MISSING)); - if(text != null && text.length > 0) + if (text != null && text.length > 0) list.add(new ElementText(15, 90, GuiBook.PAGE_WIDTH - 30, GuiBook.PAGE_HEIGHT - 90, text)); } } 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 002505a..f981b7c 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 @@ -8,16 +8,14 @@ import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementText; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class ContentText extends PageContent { + public TextData[] text; @Override public void build(ArrayList list) { - if(text != null && text.length > 0) + if (text != null && text.length > 0) list.add(new ElementText(15, 15, GuiBook.PAGE_WIDTH - 30, GuiBook.PAGE_HEIGHT - 30, text)); } } 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 67c038a..9e852b6 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 @@ -1,6 +1,8 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.GuiBook; @@ -8,9 +10,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -/** - * @author fuj1n - */ +@SideOnly(Side.CLIENT) public class ContentTextImage extends PageContent { public TextData[] text; @@ -18,10 +18,10 @@ public class ContentTextImage extends PageContent { @Override public void build(ArrayList list) { - if(text != null && text.length > 0) + if (text != null && text.length > 0) list.add(new ElementText(15, 15, GuiBook.PAGE_WIDTH - 30, GuiBook.PAGE_HEIGHT - 95, text)); - if(image != null && image.location != null) + if (image != null && image.location != null) list.add(new ElementImage(15, 110, GuiBook.PAGE_WIDTH - 30, 70, image)); else list.add(new ElementImage(ImageData.MISSING)); 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 01498e1..6ef8ca2 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 @@ -1,6 +1,8 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.GuiBook; @@ -8,9 +10,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -/** - * @author fuj1n - */ +@SideOnly(Side.CLIENT) public class ContentTextLeftImage extends PageContent { public ImageData image; @@ -19,15 +19,15 @@ public class ContentTextLeftImage extends PageContent { @Override public void build(ArrayList list) { - if(image != null && image.location != null) + if (image != null && image.location != null) list.add(new ElementImage(15, 15, 50, 50, image)); else list.add(new ElementImage(15, 15, 50, 50, ImageData.MISSING)); - if(text1 != null && text1.length > 0) + if (text1 != null && text1.length > 0) list.add(new ElementText(67, 15, GuiBook.PAGE_WIDTH - 82, 50, text1)); - if(text2 != null && text2.length > 0) + if (text2 != null && text2.length > 0) list.add(new ElementText(15, 70, GuiBook.PAGE_WIDTH - 30, GuiBook.PAGE_HEIGHT - 70, text2)); } } 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 2f550bb..44d011a 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 @@ -1,6 +1,8 @@ package slimeknights.mantle.client.book.data.content; import java.util.ArrayList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.GuiBook; @@ -8,9 +10,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -/** - * @author fuj1n - */ +@SideOnly(Side.CLIENT) public class ContentTextRightImage extends PageContent { public TextData[] text1; @@ -19,15 +19,15 @@ public class ContentTextRightImage extends PageContent { @Override public void build(ArrayList list) { - if(text1 != null && text1.length > 0) + if (text1 != null && text1.length > 0) list.add(new ElementText(15, 15, GuiBook.PAGE_WIDTH - 82, 50, text1)); - if(image != null && image.location != null) + if (image != null && image.location != null) list.add(new ElementImage(15 + GuiBook.PAGE_WIDTH - 85, 15, 50, 50, image)); else list.add(new ElementImage(15 + GuiBook.PAGE_WIDTH - 85, 15, 50, 50, ImageData.MISSING)); - if(text2 != null && text2.length > 0) + if (text2 != null && text2.length > 0) list.add(new ElementText(15, 70, GuiBook.PAGE_WIDTH - 30, GuiBook.PAGE_HEIGHT - 70, text2)); } } 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 2fa1617..5855ffa 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 @@ -5,9 +5,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.gui.book.element.BookElement; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public abstract class PageContent { diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/CriteriaData.java b/src/main/java/slimeknights/mantle/client/book/data/element/CriteriaData.java index 7243244..39eba91 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/CriteriaData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/CriteriaData.java @@ -3,9 +3,6 @@ package slimeknights.mantle.client.book.data.element; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class CriteriaData { // TODO criteria parsing diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java b/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java index d51d73f..de29f16 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java @@ -4,9 +4,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class ImageData { @@ -26,7 +23,7 @@ public class ImageData { public transient ResourceLocation location; - static{ + static { MISSING.location = new ResourceLocation("mantle:textures/gui/missingno.png"); MISSING.texWidth = 32; MISSING.texHeight = 32; diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java b/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java index 74c382f..e669425 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java @@ -3,9 +3,7 @@ package slimeknights.mantle.client.book.data.element; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ + @SideOnly(Side.CLIENT) public class TextData { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiArrow.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiArrow.java index c16a112..03e7539 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/GuiArrow.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/GuiArrow.java @@ -8,9 +8,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class GuiArrow extends GuiButton { 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 edfef87..a4f3982 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java @@ -16,9 +16,6 @@ import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.book.data.PageData; import slimeknights.mantle.client.gui.book.element.BookElement; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class GuiBook extends GuiScreen { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java b/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java index 0cdce08..d84d13e 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java @@ -11,9 +11,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.TextData; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class TextDataRenderer { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java b/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java index 4125011..9a2e105 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java @@ -4,9 +4,6 @@ import net.minecraft.client.gui.Gui; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public abstract class BookElement extends Gui { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java index 9b5aeea..9dfa0af 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java @@ -1,16 +1,16 @@ package slimeknights.mantle.client.gui.book.element; import net.minecraft.client.Minecraft; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.ImageData; -/** - * @author fuj1n - */ -public class ElementImage extends SizedBookElement{ +@SideOnly(Side.CLIENT) +public class ElementImage extends SizedBookElement { public ImageData image; - public ElementImage(ImageData image){ + public ElementImage(ImageData image) { this(image.x, image.y, image.width, image.height, image); } @@ -19,13 +19,13 @@ public class ElementImage extends SizedBookElement{ this.image = image; - if(image.x != -1) + if (image.x != -1) x = image.x; - if(image.y != -1) + if (image.y != -1) y = image.y; - if(image.width != -1) + if (image.width != -1) width = image.width; - if(image.height != -1) + if (image.height != -1) height = image.height; } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java index c2599ec..3ed14f5 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java @@ -4,19 +4,19 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ +@SideOnly(Side.CLIENT) public class ElementItem extends BookElement { public ItemStack item; - public ElementItem(int x, int y, Item item){ + public ElementItem(int x, int y, Item item) { this(x, y, new ItemStack(item)); } - public ElementItem(int x, int y, Block item){ + public ElementItem(int x, int y, Block item) { this(x, y, new ItemStack(item)); } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java index 2a8ee49..170ffde 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java @@ -5,9 +5,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.TextDataRenderer; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public class ElementText extends SizedBookElement { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java b/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java index d636910..27964ef 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java @@ -3,9 +3,6 @@ package slimeknights.mantle.client.gui.book.element; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -/** - * @author fuj1n - */ @SideOnly(Side.CLIENT) public abstract class SizedBookElement extends BookElement {