Change composition of Ancient Granite & Lepersonnite to make obtaining Ytterbium possible.

Fix Recipe for Wood's Glass lens.

2 files changed, 28 insertions, 26 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 3d0e6aebfd..f8c923fc7a 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -93,6 +93,7 @@ public class RECIPES_GREGTECH {
 		fluidheaterRecipes();
 		chemplantRecipes();
 		packagerRecipes();
+		alloySmelterRecipes();
 
 
 		/**
@@ -109,7 +110,17 @@ public class RECIPES_GREGTECH {
 		addFuels();
 	}
 
+	private static void alloySmelterRecipes() {
+		
+		//Wood's Glass Laser Lens
+		GT_Values.RA.addAlloySmelterRecipe(
+				MISC_MATERIALS.WOODS_GLASS.getDust(5),
+				ItemList.Shape_Mold_Ball.get(0),
+				GregtechItemList.Laser_Lens_WoodsGlass.get(1),
+				20 * 300, 
+				MaterialUtils.getVoltageForTier(3));
 
+	}
 
 	private static void packagerRecipes() {
 		
@@ -1122,29 +1133,6 @@ public class RECIPES_GREGTECH {
 				20 * 120,
 				480*4);
 
-
-		//Wood's Glass Laser Lens
-		CORE.RA.addBlastSmelterRecipe(
-				new ItemStack[] { 
-						ItemUtils.getGregtechCircuit(5),
-						ItemList.Shape_Mold_Ball.get(0),
-						ELEMENT.getInstance().BARIUM.getDust(1),
-						ELEMENT.getInstance().SODIUM.getDust(1),
-						ELEMENT.getInstance().SILICON.getDust(2),
-						ELEMENT.getInstance().NICKEL.getDust(1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustGlass", 5)
-				},
-				FluidUtils.getUUM(1000),
-				null,
-				new ItemStack[] { 
-						GregtechItemList.Laser_Lens_WoodsGlass.get(1)
-				},
-				new int[] {10000},
-				20 * 300,
-				(int) GT_Values.V[3]);
-
-
-
 	}
 
 	private static void fluidcannerRecipes() {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
index 864d0bcca8..860a87deae 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
@@ -13,6 +13,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.MISC_MATERIALS;
@@ -118,12 +119,25 @@ public class RECIPES_RareEarthProcessing {
 				null,
 				new int[] {10000, 10000, 10000},
 				20 * 30,
-				(int) GT_Values.V[2]);
+				120);
 
 		// Generate Special Laser Recipe
+		CORE.RA.addMixerRecipe(
+				CI.getNumberedBioCircuit(2),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1),
+				null, 
+				null,
+				null,
+				ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2), 
+				null, 
+				null, 
+				null, 
+				20 * 10,
+				480);
+		
 		CORE.RA.addUvLaserRecipe(
-				ELEMENT.getInstance().CHLORINE.getCell(2),
-				ELEMENT.getInstance().HYDROGEN.getCell(2),
+				ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 4),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 4),
 				20 * 30,
 				480);