+ Added dehydrator recipes for denser ore types.

$ Fixed Ore Blocks not generating as intended.
% Improved Ore Generator.

1 files changed, 90 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index d9e67c16f6..928cc82302 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -2,9 +2,10 @@ package gtPlusPlus.xmod.gregtech.loaders;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -43,7 +44,7 @@ public class RecipeGen_Ore implements Runnable{
 				bonusA = material.getComposites().get(0).getStackMaterial();
 			}
 			else {
-				return ;
+				return;
 			}
 			if (material.getComposites().size() >= 1 && material.getComposites().get(1) != null){
 				bonusB = material.getComposites().get(1).getStackMaterial();
@@ -52,7 +53,8 @@ public class RecipeGen_Ore implements Runnable{
 				bonusB = material.getComposites().get(0).getStackMaterial();
 			}
 			else {
-				return;
+				//Ultra Bonus
+				bonusB = ELEMENT.getInstance().GALLIUM;
 			}
 			
 			AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>();
@@ -88,7 +90,7 @@ public class RecipeGen_Ore implements Runnable{
 			 */		
 			//Wash into Purified Crushed
 			if (GT_Values.RA.addOreWasherRecipe(material.getCrushed(1), material.getCrushedPurified(1), bonusA.getTinyDust(1), dustStone, FluidUtils.getWater(1000), 25*20, 16)){
-				Logger.MATERIALS("[OreWasher] Added Recipe: 'Wash Crushed oer into Purified Crushed ore'");
+				Logger.MATERIALS("[OreWasher] Added Recipe: 'Wash Crushed ore into Purified Crushed ore'");
 			}
 
 			/**
@@ -237,8 +239,90 @@ public class RecipeGen_Ore implements Runnable{
 					t.printStackTrace();
 				}
 			}
-			else if (componentMap.size() > 6){
-				Logger.MATERIALS("[Issue][Electrolyzer] "+material.getLocalizedName()+" is composed of over 6 materials, so a recipe for processing cannot be generated.");
+			else if (componentMap.size() > 6 && componentMap.size() <= 9){
+				Logger.MATERIALS("[Issue][Electrolyzer] "+material.getLocalizedName()+" is composed of over 6 materials, so an electrolyzer recipe for processing cannot be generated. Trying to create one for the Dehydrator instead.");
+				
+				ItemStack mInternalOutputs[] = new ItemStack[9];
+				int mChances[] = new int[9];
+				int mCellCount = 0;
+				
+				int mTotalCount = 0;
+				
+				int mCounter = 0;
+				for (Pair<Integer, Material> f : componentMap){
+					if (f.getValue().getState() != MaterialState.SOLID){
+						Logger.MATERIALS("[Dehydrator] Found Fluid Component, adding "+f.getKey()+" cells of "+f.getValue().getLocalizedName()+".");
+						mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey());
+						mCellCount += f.getKey();
+						mTotalCount += f.getKey();
+						Logger.MATERIALS("[Dehydrator] In total, adding "+mCellCount+" cells for "+material.getLocalizedName()+" processing.");
+					}
+					else {
+						Logger.MATERIALS("[Dehydrator] Found Solid Component, adding "+f.getKey()+" dusts of "+f.getValue().getLocalizedName()+".");
+						mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey());
+						mTotalCount += f.getKey();
+					}
+				}				
+				
+				//Build Output Array
+				for (int g=0;g<mInternalOutputs.length;g++){
+					Logger.MATERIALS("[Dehydrator] Is output["+g+"] valid with a chance? "+(mInternalOutputs[g] != null ? 10000 : 0));
+					mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0);
+				}
+				
+				ItemStack emptyCell = null;
+				if (mCellCount > 0){
+					emptyCell = ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", mCellCount);
+					Logger.MATERIALS("[Dehydrator] Recipe now requires "+mCellCount+" empty cells as input.");
+				}
+				
+				ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing);
+				if (mainDust != null){
+					Logger.MATERIALS("[Dehydrator] Recipe now requires "+material.smallestStackSizeWhenProcessing+"x "+mainDust.getDisplayName()+" as input.");					
+				}
+				else {
+					mainDust = material.getDust(mTotalCount);
+					Logger.MATERIALS("[Dehydrator] Could not find valid input dust, trying alternative.");	
+					if (mainDust != null){
+						Logger.MATERIALS("[Dehydrator] Recipe now requires "+mTotalCount+"x "+mainDust.getDisplayName()+" as input.");					
+					}
+					else {
+						Logger.MATERIALS("[Dehydrator] Could not find valid input dust, exiting.");					
+					}
+				}
+				
+				for (int j=0;j<mInternalOutputs.length;j++){
+					if (mInternalOutputs[j] == null){
+						mInternalOutputs[j] = GT_Values.NI;
+						Logger.MATERIALS("[Dehydrator] Set slot "+j+"  to null.");
+					}
+					else {
+						Logger.MATERIALS("[Dehydrator] Set slot "+j+" to "+mInternalOutputs[j].getDisplayName()+".");						
+					}
+				}
+				
+				try{		
+					
+					
+				if (CORE.RA.addDehydratorRecipe(
+						new ItemStack[]{mainDust, emptyCell},
+						null,
+						null,
+						mInternalOutputs,
+						mChances,
+						20*1*(tVoltageMultiplier/10),
+						tVoltageMultiplier)){
+					Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for "+material.getDust(1).getDisplayName());
+				}
+				else {
+					Logger.MATERIALS("[Dehydrator] Failed to generate Dehydrator recipe for "+material.getDust(1).getDisplayName());					
+				}
+				}
+				catch(Throwable t){
+					t.printStackTrace();
+				}
+			
+			
 			}