Merge pull request #93 from GTNewHorizons/New-Multis-3

New multis 3

4 files changed, 147 insertions, 27 deletions

diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java
index fd7547970c..ba0963397c 100644
--- a/src/main/java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java
@@ -22,10 +22,10 @@ public final class ALLOY {
 			"Energy Crystal", //Material Name
 			MaterialState.SOLID, //State
 			new short[]{228, 255, 0, 0}, //Material Colour
-			5660, //Melting Point in C
-			7735, //Boiling Point in C
-			150, //Protons
-			80, //Neutrons
+			4660, //Melting Point in C
+			5735, //Boiling Point in C
+			90, //Protons
+			40, //Neutrons
 			true, //Uses Blast furnace?
 			"⬟ ⯂ ⬢ ⬣ ⯃ ⯄",
 			//Material Stacks with Percentage of required elements.
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 2740f49d71..31ad5e466b 100644
--- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -15,11 +15,82 @@ public final class MISC_MATERIALS {
 	 */
 
 	public static void run() {
+		MaterialUtils.generateSpecialDustAndAssignToAMaterial(POTASSIUM_NITRATE, false);
+		MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_NITRATE, false);
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false);
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
 		WATER.registerComponentForMaterial(FluidUtils.getWater(1000));
 	}
 
+	public static final Material POTASSIUM_NITRATE = new Material(
+			"Potassium Nitrate", 
+			MaterialState.SOLID, //State
+			null,
+			null,
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"KNO3",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
+			});
+	public static final Material SODIUM_NITRATE = new Material(
+			"Sodium Nitrate", 
+			MaterialState.SOLID, //State
+			null,
+			null,
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"NaNO3",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
+			});	
+
+	public static final Material SOLAR_SALT_COLD = new Material(
+			"Solar Salt (Cold)",
+			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(POTASSIUM_NITRATE, 4),
+					new MaterialStack(SODIUM_NITRATE, 6)
+			});
+	
+	public static final Material SOLAR_SALT_HOT = new Material(
+			"Solar Salt (Hot)",
+			MaterialState.PURE_LIQUID, //State
+			new short[] {200, 25, 25}, //Material Colour
+			1200, //Melting Point in C
+			3300, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(POTASSIUM_NITRATE, 4),
+					new MaterialStack(SODIUM_NITRATE, 6)
+			});
+	
+	
+	
 	public static final Material STRONTIUM_OXIDE = new Material(
 			"Strontium Oxide", 
 			MaterialState.SOLID, 
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 0e9eb9b376..64b705629e 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -25,6 +25,7 @@ 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.gregtech.registration.gregtech.GregtechConduits;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 import net.minecraft.block.Block;
@@ -50,7 +51,7 @@ public class Material {
 	private TextureSet textureSet;
 
 	private Fluid mFluid;
-	private Fluid vPlasma;
+	private Fluid mPlasma;
 
 	private boolean vGenerateCells;
 
@@ -493,11 +494,14 @@ public class Material {
 						mFluid = generateFluid();						
 					}					
 				}
-				this.vPlasma = this.generatePlasma();
+				// Don't generate plasma for composites
+				if (this.getComposites().isEmpty()) {
+					this.mPlasma = this.generatePlasma();
+				}
 			}
 			else {
 				this.mFluid = null;
-				this.vPlasma = null;
+				this.mPlasma = null;
 			}
 			String ratio = "";
 			if (this.vSmallestRatio != null) {
@@ -869,6 +873,14 @@ public class Material {
 	public final ItemStack getScrew(final int stacksize){
 		return getComponentByPrefix(OrePrefixes.screw, stacksize);
 	}
+	
+	public final ItemStack getFineWire(final int stacksize){
+		return getComponentByPrefix(OrePrefixes.wireFine, stacksize);
+	}
+
+	public final ItemStack getFoil(final int stacksize){
+		return getComponentByPrefix(OrePrefixes.foil, stacksize);
+	}
 
 	public final ItemStack getRing(final int stacksize){
 		return getComponentByPrefix(OrePrefixes.ring, stacksize);
@@ -893,6 +905,59 @@ public class Material {
 	public final ItemStack getNugget(final int stacksize){
 		return getComponentByPrefix(OrePrefixes.nugget, stacksize);
 	}
+	
+	public final ItemStack getWire01(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.wireGt01, stacksize);
+	}
+	
+	public final ItemStack getWire02(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.wireGt02, stacksize);
+	}
+	
+	public final ItemStack getWire04(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.wireGt04, stacksize);
+	}
+	
+	public final ItemStack getWire08(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.wireGt08, stacksize);
+	}
+	
+	public final ItemStack getWire12(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.wireGt12, stacksize);
+	}
+	
+	public final ItemStack getWire16(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.wireGt16, stacksize);
+	}
+	
+	public final ItemStack getCable01(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.cableGt01, stacksize);
+	}
+	
+	public final ItemStack getCable02(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.cableGt02, stacksize);
+	}
+	
+	public final ItemStack getCable04(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.cableGt04, stacksize);
+	}
+	
+	public final ItemStack getCable08(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.cableGt08, stacksize);
+	}
+	
+	public final ItemStack getCable12(final int stacksize) {
+		return getComponentByPrefix(OrePrefixes.cableGt12, stacksize);
+	}
+	
+	public final ItemStack getCable16(final int stacksize) {
+		if (GregtechConduits.cableGt16 != null) {
+			return getComponentByPrefix(GregtechConduits.cableGt16, stacksize);
+		}
+		else {
+			return ItemUtils.getErrorStack(stacksize);
+		}
+	}
 
 	/**
 	 * Ore Components
@@ -1281,6 +1346,10 @@ public class Material {
 	public Fluid getFluid() {
 		return mFluid;
 	}
+	
+	public Fluid getPlasma() {
+		return mPlasma;
+	}
 
 	final public FluidStack getFluidStack(final int fluidAmount) {
 		if (this.mFluid == null){
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
index d1ea784b81..aac3bc3e92 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -67,26 +67,6 @@ public class MaterialGenerator {
 	private static volatile Item temp;
 	@SuppressWarnings("unused")
 	private static volatile Block tempBlock;
-	
-
-	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid) {
-		return addFluidExtractionRecipe(aEmpty, aRemains, aFluid, null, null);
-	}
-	
-	/**
-	 * Called Reflectively from CORE.RA.addFluidExtractionRecipe
-	 * @param aSpecial 
-	 * @return 
-	 */
-	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, Integer aDuration, Integer aEU) {
-		RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
-		if (g != null && g.valid()) {
-			//Logger.INFO("[FIND] Adding Extraction recipe for "+ItemUtils.getItemName(aEmpty)+", "+ItemUtils.getItemName(aRemains)+", "+ItemUtils.getFluidName(aFluid));
-			return true;
-		}
-		Logger.INFO("[ERROR] FAILED adding Extraction recipe for "+ItemUtils.getItemName(aEmpty)+", "+ItemUtils.getItemName(aRemains)+", "+ItemUtils.getFluidName(aFluid));
-		return false;
-	}
 
 
 	public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) {