Merged in AlkWork (pull request #4)

AlkWork

2 files changed, 57 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index b5922dde53..7d49a8d635 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -24,6 +24,7 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 import net.minecraft.block.Block;
@@ -890,6 +891,9 @@ public class Material {
 	public final ItemStack getDustImpure(final int stacksize){
 		return getComponentByPrefix(OrePrefixes.dustImpure, stacksize);
 	}
+	public final ItemStack getMilled(final int stacksize){
+		return getComponentByPrefix(CustomOrePrefix.milled.get(), stacksize);
+	}
 	
 	public final boolean hasSolidForm() {		
 		if (ItemUtils.checkForInvalidItems(new ItemStack[] {getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1)})) {
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index d2e24b04a1..73751ac49d 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -70,8 +70,60 @@ public final class NUCLIDE {
 					new MaterialStack(ELEMENT.getInstance().URANIUM235, 14)
 			});
 
+	// Secondary material is molten metal
+	public static final Material NAQ_FUEL_T1 = new Material(
+			"Naquadah Fuel",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2),
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
+			});
+
+	// Secondary material is a plasma
+	public static final Material NAQ_FUEL_T2 = new Material(
+			"Enriched Naquadah Fuel",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 3)
+			});
+	
+	// Secondary material is a plasma
+	public static final Material NAQ_FUEL_T3 = new Material(
+			"Naquadria Fuel",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2),
+					new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3)
+			});
+	
+
 
 	private static final NUCLIDE INSTANCE = new NUCLIDE();
-	public static NUCLIDE getInstance(){return INSTANCE;}
+	
+	public static NUCLIDE getInstance(){
+		return INSTANCE;
+		}
 
 }