+ Added craftingToolSaw to CI.java.

$ Improved handling of Mixer Recipes for alloys.
$ Fixed Rainforest Oak not being craftable into planks.

3 files changed, 42 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 58a9a045d0..3074c3a4fe 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -167,6 +167,7 @@ public class CI {
 	public static String craftingToolFile = "craftingToolFile";
 	public static String craftingToolKnife = "craftingToolKnife";
 	public static String craftingToolCrowbar = "craftingToolCrowbar";
+	public static String craftingToolSaw = "craftingToolSaw";
 	public static String craftingToolWireCutter = "craftingToolWirecutter";
 	public static String craftingToolSolderingIron = "craftingToolSolderingIron";
 
diff --git a/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
index 3ee719be4d..b152be46b1 100644
--- a/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
+++ b/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
@@ -1,6 +1,13 @@
 package gtPlusPlus.xmod.bop;
 
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 
 public class HANDLER_BiomesOPlenty {
@@ -22,7 +29,12 @@ public class HANDLER_BiomesOPlenty {
 
 	public static void postInit(){
 		if (LoadedMods.BiomesOPlenty){
-
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {ItemUtils.getSimpleStack(BOP_Block_Registrator.log_Rainforest)}, ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 2));
+			RecipeUtils.recipeBuilder(
+					CI.craftingToolSaw, null, null,
+					ItemUtils.getSimpleStack(BOP_Block_Registrator.log_Rainforest), null, null,
+					null, null, null,
+					ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4));
 		}
 
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index d2c95a4ba6..056d5a2afd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -232,50 +232,58 @@ public class RecipeGen_DustGeneration  implements Runnable{
 					}
 					else if (inputStacks.length == 2) {
 						input3 = CI.getNumberedCircuit(20);
-						
+
 					}
 					else if (inputStacks.length == 3) {
 						input4 = CI.getNumberedCircuit(20);
-						
+
 					}
-					
-					
+
+
 					//Add mixer Recipe
 
 					FluidStack oxygen = GT_Values.NF;
 					if (material.getComposites() != null){
+						int compSlot = 0;
 						for (final MaterialStack x : material.getComposites()){
 							if (!material.getComposites().isEmpty()){
 								if (x != null){
 									if (x.getStackMaterial() != null){
 										if (x.getStackMaterial().getDust(1) == null){
-											if (x.getStackMaterial().getState() == MaterialState.GAS){
-												oxygen = x.getStackMaterial().getFluid(1000);
+											MaterialState f = x.getStackMaterial().getState();
+											if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID){
+												oxygen = x.getStackMaterial().getFluid((int) (material.vSmallestRatio[compSlot] * 1000));
 											}
 										}
 									}
 								}
 							}
+							compSlot++;
 						}
 
 					}
 
 					//Add mixer Recipe
-					if (GT_Values.RA.addMixerRecipe(
-							input1, input2,
-							input3, input4,
-							oxygen,
-							null,
-							outputStacks,
-							(int) Math.max(material.getMass() * 2L * 1, 1),
-							2 * material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example.
-					{
-						Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
-						return true;
+					try {
+						if (GT_Values.RA.addMixerRecipe(
+								input1, input2,
+								input3, input4,
+								oxygen,
+								null,
+								outputStacks,
+								(int) Math.max(material.getMass() * 2L * 1, 1),
+								2 * material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example.
+						{
+							Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
+							return true;
+						}
+						else {
+							Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed");
+							return false;
+						}
 					}
-					else {
-						Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed");
-						return false;
+					catch (Throwable t) {
+						t.printStackTrace();
 					}
 				}
 				else {