Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

1 files changed, 36 insertions, 35 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index a346464eeb..24c8eb488f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -38,71 +38,72 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 		this.toGenerate = M;		
 		this.disableOptional = O;
 		mRecipeGenMap.add(this);
-	}
-
-	@Override
-	public void run() {
-		generateRecipes(this.toGenerate, this.disableOptional);
-	}
-
-	private void generateRecipes(final Material material, final boolean disableOptional){
-
-		Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName());
-
-		final ItemStack normalDust = material.getDust(1);
-		final ItemStack smallDust = material.getSmallDust(1);
-		final ItemStack tinyDust = material.getTinyDust(1);
-
-		final ItemStack[] inputStacks = material.getMaterialComposites();
-		final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing);
-
-
-		if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) {
+		final ItemStack normalDust = M.getDust(1);
+		final ItemStack smallDust = M.getSmallDust(1);
+		final ItemStack tinyDust = M.getTinyDust(1);
+		if (tinyDust != null && normalDust != null) {
 			if (RecipeUtils.addShapedRecipe(
-					tinyDust,	tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
 					tinyDust, tinyDust, tinyDust,
 					tinyDust, tinyDust, tinyDust,
 					normalDust)){
-				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Failed");
 			}
 
 			if (RecipeUtils.addShapedRecipe(
 					normalDust, null, null,
 					null, null, null,
 					null, null, null,
-					material.getTinyDust(9))){
-				Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success");
+					M.getTinyDust(9))){
+				Logger.INFO("9 Tiny dust from 1 Recipe: "+M.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("9 Tiny dust from 1 Recipe: "+M.getLocalizedName()+" - Failed");
 			}
 		}
 
-		if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(normalDust)) {
+		if (smallDust != null && normalDust != null) {
 			if (RecipeUtils.addShapedRecipe(
 					smallDust, smallDust, null,
 					smallDust, smallDust, null,
 					null, null, null,
 					normalDust)){
-				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("4 Small dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("4 Small dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Failed");
 			}
 			if (RecipeUtils.addShapedRecipe(
 					null, normalDust, null,
 					null, null, null,
 					null, null, null,
-					material.getSmallDust(4))){
-				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+					M.getSmallDust(4))){
+				Logger.INFO("4 Small dust from 1 Dust Recipe: "+M.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("4 Small dust from 1 Dust Recipe: "+M.getLocalizedName()+" - Failed");
 			}
 		}
+	}
+
+	@Override
+	public void run() {
+		generateRecipes(this.toGenerate, this.disableOptional);
+	}
+
+	private void generateRecipes(final Material material, final boolean disableOptional){
+
+		Logger.INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName());
+
+		final ItemStack normalDust = material.getDust(1);
+		final ItemStack smallDust = material.getSmallDust(1);
+		final ItemStack tinyDust = material.getTinyDust(1);
+
+		final ItemStack[] inputStacks = material.getMaterialComposites();
+		final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing);
 
 		//Macerate blocks back to dusts.
 		final ItemStack materialBlock = material.getBlock(1);
@@ -192,7 +193,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 									if (x.getStackMaterial() != null){
 										if (x.getStackMaterial().getDust(1) == null){
 											if (x.getStackMaterial().getState() != MaterialState.SOLID && x.getStackMaterial().getState() != MaterialState.ORE && x.getStackMaterial().getState() != MaterialState.PLASMA){
-												oxygen = x.getStackMaterial().getFluid(1000);
+												oxygen = x.getStackMaterial().getFluidStack(1000);
 												break;
 											}
 										}
@@ -297,8 +298,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 									if (x.getStackMaterial() != null){
 										if (x.getStackMaterial().getDust(1) == null){
 											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));
+											if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID || f == MaterialState.PURE_GAS){
+												oxygen = x.getStackMaterial().getFluidStack((int) (material.vSmallestRatio[compSlot] * 1000));
 											}
 										}
 									}