+ Added new processing chain for Rare Earth. 3 different processing chains can be used to obtain various resources. Closes #530.

% Adjusted some auto-generated recipe processing times for Ore materials.
% Adjusted some material components of a few Ore materials.
$ Added some placeholder names for unnamed blocks from other mods.

2 files changed, 17 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index 1cb999241a..52f7ab24f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -55,9 +55,6 @@ public class RecipeGen_Ore extends RecipeGen_Base {
 		//if (material.getMaterialComposites().length > 1){
 		Logger.MATERIALS("[Recipe Generator Debug] ["+material.getLocalizedName()+"]");
 		int tVoltageMultiplier = MaterialUtils.getVoltageForTier(material.vTier);
-		if (tVoltageMultiplier < 120) {
-			tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 480 : 120;
-		}
 
 		final ItemStack dustStone = ItemUtils.getItemStackOfAmountFromOreDict("dustStone", 1);
 		Material bonusA = null; //Ni
@@ -362,7 +359,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
 						mInternalOutputs[4],
 						mInternalOutputs[5],
 						mChances, 
-						20*1*(tVoltageMultiplier/10), 
+						(int) Math.max(material.getMass() * 3L * 1, 1), 
 						tVoltageMultiplier)){
 					Logger.MATERIALS("[Electrolyzer] Generated Electrolyzer recipe for "+matDust.getDisplayName());
 				}
@@ -445,7 +442,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
 						null,
 						mInternalOutputs,
 						mChances,
-						20*1*(tVoltageMultiplier/10),
+						(int) Math.max(material.getMass() * 4L * 1, 1),
 						tVoltageMultiplier)){
 					Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for "+matDust.getDisplayName());
 				}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
index 06373c9e1d..35714aee26 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.xmod.gregtech.recipes;
 
-import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
@@ -28,7 +28,7 @@ public class RecipesToRemove {
 			Logger.INFO("Removed vanilla GT Rare Earth processing.");			
 			//Set the Chemical Symbol for Rare Earth now that we are giving it custom outputs
 			//Best not to set this unless the original recipe is removed.
-			Materials.RareEarth.mChemicalFormula = "("
+			/*Materials.RareEarth.mChemicalFormula = "("
 					+ELEMENT.getInstance().YTTRIUM.vChemicalSymbol
 					+ELEMENT.getInstance().NEODYMIUM.vChemicalSymbol
 					+ELEMENT.getInstance().LANTHANUM.vChemicalSymbol
@@ -38,7 +38,18 @@ public class RecipesToRemove {
 					+ELEMENT.getInstance().YTTERBIUM.vChemicalSymbol
 					+ELEMENT.getInstance().SAMARIUM.vChemicalSymbol
 					+ELEMENT.getInstance().GADOLINIUM.vChemicalSymbol+
-					")";	
+					")";*/
+			
+			Material[] aLowTierOutputMaterials = new Material[] {
+					ORES.GREENOCKITE
+			};
+			
+			
+			
+			
+			
+			
+			
 		}
 		
 	}