Better usability for the elements

SlimeKnights · Apr 10, 2016 · 91be353 · 91be353
1 parent e3abffa
commit 91be353
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
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
@@ -1,13 +1,16 @@
 package slimeknights.mantle.client.gui.book.element;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import java.util.Collection;
+
 import slimeknights.mantle.client.book.action.StringActionProcessor;
 
 @SideOnly(Side.CLIENT)
@@ -35,7 +38,15 @@ public ElementItem(int x, int y, float scale, ItemStack item) {
     this(x, y, scale, new ItemStack[]{item});
   }
 
-  public ElementItem(int x, int y, float scale, ItemStack[] itemCycle) {
+  public ElementItem(int x, int y, float scale, Collection<ItemStack> itemCycle) {
+    this(x, y, scale, itemCycle.toArray(new ItemStack[itemCycle.size()]));
+  }
+
+  public ElementItem(int x, int y, float scale, Collection<ItemStack> itemCycle, String action) {
+    this(x, y, scale, itemCycle.toArray(new ItemStack[itemCycle.size()]), action);
+  }
+
+  public ElementItem(int x, int y, float scale, ItemStack... itemCycle) {
     this(x, y, scale, itemCycle, null);
   }
 
@@ -48,7 +59,7 @@ public ElementItem(int x, int y, float scale, ItemStack[] itemCycle, String acti
   }
 
   @Override
-  public void draw(int mouseX, int mouseY, float partialTicks) {
+  public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
     renderTick++;
 
     if(renderTick > ITEM_SWITCH_TICKS) {
@@ -73,7 +84,7 @@ public void draw(int mouseX, int mouseY, float partialTicks) {
   }
 
   @Override
-  public void drawOverlay(int mouseX, int mouseY, float partialTicks) {
+  public void drawOverlay(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) {
     if(mouseX >= x && mouseY >= y && mouseX <= x + ITEM_SIZE_HARDCODED * scale && mouseY <= y + ITEM_SIZE_HARDCODED * scale && currentItem < itemCycle.length) {
       renderToolTip(fontRenderer, itemCycle[currentItem], mouseX, mouseY);
     }

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
@@ -4,6 +4,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import java.util.Collection;
+
 import slimeknights.mantle.client.book.action.StringActionProcessor;
 import slimeknights.mantle.client.book.data.element.TextData;
 import slimeknights.mantle.client.gui.book.TextDataRenderer;
@@ -16,10 +18,14 @@ public class ElementText extends SizedBookElement {
   private boolean doAction = false;
 
   public ElementText(int x, int y, int width, int height, String text) {
-    this(x, y, width, height, new TextData[]{new TextData(text)});
+    this(x, y, width, height, new TextData(text));
+  }
+
+  public ElementText(int x, int y, int width, int height, Collection<TextData> text) {
+    this(x, y, width, height, text.toArray(new TextData[text.size()]));
   }
 
-  public ElementText(int x, int y, int width, int height, TextData[] text) {
+  public ElementText(int x, int y, int width, int height, TextData... text) {
     super(x, y, width, height);
 
     this.text = text;