Material stats, fixes, christmas!

1 files changed, 96 insertions, 32 deletions

diff --git a/src/main/java/lance5057/tDefense/util/TDMatHelper.java b/src/main/java/lance5057/tDefense/util/TDMatHelper.java
index c36c4ee..21fd555 100644
--- a/src/main/java/lance5057/tDefense/util/TDMatHelper.java
+++ b/src/main/java/lance5057/tDefense/util/TDMatHelper.java
@@ -1,6 +1,10 @@
 package lance5057.tDefense.util;
 
+import javax.annotation.Nullable;
+
 import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import slimeknights.tconstruct.library.fluid.FluidMolten;
 import slimeknights.tconstruct.library.materials.ArrowShaftMaterialStats;
 import slimeknights.tconstruct.library.materials.BowMaterialStats;
@@ -10,90 +14,150 @@ import slimeknights.tconstruct.library.materials.FletchingMaterialStats;
 import slimeknights.tconstruct.library.materials.HandleMaterialStats;
 import slimeknights.tconstruct.library.materials.HeadMaterialStats;
 
-public class TDMatHelper {
-	public String name;
-	public int color; 
-	public FluidMolten fluid;
-	
+public class TDMatHelper
+{
+	public String		name;
+	public int			color;
+	public FluidMolten	fluid;
+
 	public boolean isGem;
-	
-	public HeadMaterialStats head;
-	public ShieldMaterialStats shield;
-	public BowMaterialStats bow;
-	public ExtraMaterialStats extra;
-	public FletchingMaterialStats fletching;
-	public BowStringMaterialStats bowstring;
-	public HandleMaterialStats handle;
-	public ArrowShaftMaterialStats shaft;
-	
-	public TDMatHelper(String n, int c, FluidMolten f)
+
+	public HeadMaterialStats		head;
+	public ShieldMaterialStats		shield;
+	public BowMaterialStats			bow;
+	public ExtraMaterialStats		extra;
+	public FletchingMaterialStats	fletching;
+	public BowStringMaterialStats	bowstring;
+	public HandleMaterialStats		handle;
+	public ArrowShaftMaterialStats	shaft;
+
+	public ItemStack	gem;
+	public ItemStack	ingot;
+	public ItemStack	dust;
+	public ItemStack	nugget;
+	public ItemStack	grain;
+
+	public boolean createMat = true;
+
+	public TDMatHelper(String n, int c, FluidMolten f, boolean doMat)
 	{
 		name = n;
 		color = c;
 		fluid = f;
+		createMat = doMat;
+	}
+
+	public TDMatHelper(String n, int c, boolean doMat)
+	{
+		init(n, c, null, false, doMat);
 	}
-	
+
+	public TDMatHelper(String n, int c, boolean o, boolean doMat)
+	{
+		init(n, c, null, o, doMat);
+	}
+
+	public TDMatHelper(String n, int c, @Nullable FluidMolten f, boolean o, boolean doMat)
+	{
+		init(n, c, f, o, doMat);
+	}
+
 	public TDMatHelper(String n, int c)
 	{
-		name = n;
-		color = c;
-		fluid = null;
+		init(n, c, null, false, true);
 	}
-	
-	public TDMatHelper(String n, int c, boolean o)
+
+	private void init(String n, int c, @Nullable FluidMolten f, boolean o, boolean doMat)
 	{
 		name = n;
 		color = c;
-		fluid = null;
-		
+		fluid = f;
+
 		isGem = o;
+		createMat = doMat;
 	}
-	
+
 	public TDMatHelper setHead(HeadMaterialStats h)
 	{
 		head = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setHandle(HandleMaterialStats h)
 	{
 		handle = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setShield(ShieldMaterialStats h)
 	{
 		shield = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setExtra(ExtraMaterialStats h)
 	{
 		extra = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setBow(BowMaterialStats h)
 	{
 		bow = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setFletching(FletchingMaterialStats h)
 	{
 		fletching = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setString(BowStringMaterialStats h)
 	{
 		bowstring = h;
 		return this;
 	}
-	
+
 	public TDMatHelper setShaft(ArrowShaftMaterialStats h)
 	{
 		shaft = h;
 		return this;
 	}
+
+	public TDMatHelper setGem(Item i)
+	{
+		gem = new ItemStack(i);
+		return this;
+	}
+
+	public TDMatHelper setGem(ItemStack i)
+	{
+		gem = i;
+		return this;
+	}
+
+	public TDMatHelper setIngot(Item i)
+	{
+		ingot = new ItemStack(i);
+		return this;
+	}
+
+	public TDMatHelper setDust(Item i)
+	{
+		dust = new ItemStack(i);
+		return this;
+	}
+
+	public TDMatHelper setGrain(Item i)
+	{
+		grain = new ItemStack(i);
+		return this;
+	}
+
+	public TDMatHelper setNugget(Item i)
+	{
+		nugget = new ItemStack(i);
+		return this;
+	}
 }