Remove author tags, add @SideOnlyies, reformat code for books

This commit is contained in:
Arthur Uzulin committed 2016-01-26 21:44:44 +11:00
1 parent a7699788ac
commit 779dfd06cd
28 files changed
+66 -114

No files matched your search

@@ -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 {
@@ -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 {
@@ -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 {
@@ -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;
@@ -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 {
@@ -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();
@@ -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 {
@@ -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<BookElement> list) {
@@ -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
@@ -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 {
@@ -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<BookElement> 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));
@@ -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<BookElement> 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));
}
}
@@ -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<BookElement> 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));
}
}
@@ -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<BookElement> 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));
@@ -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<BookElement> 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));
}
}
@@ -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<BookElement> 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));
}
}
@@ -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 {
@@ -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
@@ -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;
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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;
}
@@ -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));
}
@@ -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 {
@@ -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 {