From 075706790f74323a3a532321c3e39e49ed6e31d2 Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Sat, 9 Sep 2017 16:36:36 +1000
Subject: $ Fixed Quantum not having a recipe. - Removed a lot of logging
 during start-up.

---
 src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java  |  2 +-
 .../gregtech/loaders/RecipeGen_BlastSmelter.java   | 64 ++++++++++++----------
 .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 34 ++++++------
 3 files changed, 52 insertions(+), 48 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index a206dafd59..5dfb9ebd2b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -64,7 +64,7 @@ public class HANDLER_GT {
 
 	public static void postInit(){
 		//Register some custom recipe maps for any enabled multiblocks.
-		MultiblockRecipeMapHandler.run();
+		//MultiblockRecipeMapHandler.run();
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index fee6fbc63c..d66649850a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -74,7 +74,6 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 				duration = 40*M.vTier*20;
 			}
 
-
 			int mMaterialListSize=0;
 			if (M.getComposites() != null){
 				for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){
@@ -87,7 +86,12 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 				mMaterialListSize = 1;
 			}
 
-			Utils.LOG_WARNING("Size: "+mMaterialListSize);
+			if (duration <= 0){
+				int second = 20;
+				duration = 14*second*mMaterialListSize;
+			}
+			
+			Utils.LOG_WARNING("[BAS] Size: "+mMaterialListSize);
 
 
 			//Make a simple one Material Materialstack[] and log it for validity.
@@ -95,10 +99,10 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 			final ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, tStack};
 			inputStackCount = 1;
 			fluidAmount = 144*inputStackCount;
-			Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal.");
+			Utils.LOG_WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal.");
 			for (int das=0;das<tItemStackTest.length;das++){
 				if (tItemStackTest[das] != null) {
-					Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
+					Utils.LOG_WARNING("[BAS] tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
 				}
 			}
 
@@ -108,50 +112,50 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 			if (hasMoreInputThanACircuit){
 				if (M.requiresBlastFurnace()) {
 					if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
-						Utils.LOG_WARNING("Success.");
-						Utils.LOG_WARNING("Success, Also added a Fluid solidifier recipe.");
+						Utils.LOG_WARNING("[BAS] Success.");
+						Utils.LOG_WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}
 						if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}						
 					}
 				}
 				else {
-					Utils.LOG_WARNING("Failed.");
+					Utils.LOG_WARNING("[BAS] Failed.");
 				}
 			}
 			else {
 				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, 120)){
-					Utils.LOG_WARNING("Success.");
+					Utils.LOG_WARNING("[BAS] Success.");
 					if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){
-						Utils.LOG_WARNING("Success, Also added a Fluid solidifier recipe.");
+						Utils.LOG_WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}
 						final ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1);
 						if (tempitem != null){
 							if (GT_Values.RA.addFluidExtractionRecipe(tempitem, null, M.getFluid(16), 100, duration/2/9, 60)){
-								Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+								Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 							}
 						}
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/2/9, 60)){
-							Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+							Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
 						}
 					}
 				}
 				else {
-					Utils.LOG_WARNING("Failed.");
+					Utils.LOG_WARNING("[BAS] Failed.");
 				}
 			}
 
@@ -174,8 +178,8 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 						for (final gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){
 							if (xMaterial != null){
 								if (xMaterial.getStackMaterial() != null){
-									Utils.LOG_WARNING("FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
-									Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
+									Utils.LOG_WARNING("[BAS] FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
+									Utils.LOG_WARNING("[BAS] ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
 								}
 								tempStack[ooo] = xMaterial;
 							}
@@ -207,45 +211,45 @@ public class RecipeGen_BlastSmelter  implements Runnable{
 									components[fr] = components_NoCircuit[fr-1];
 								}
 							}
-							Utils.LOG_WARNING("Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName());
+							Utils.LOG_WARNING("[BAS] Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName());
 						}
 						else {
-							Utils.LOG_WARNING("Did not add a circuit. mMaterialListSize: "+mMaterialListSize);
+							Utils.LOG_WARNING("[BAS] Did not add a circuit. mMaterialListSize: "+mMaterialListSize);
 						}
 
 						//Set Fluid output
 						fluidAmount = 144*inputStackCount;
 
-						Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
-						Utils.LOG_WARNING("tMaterial.length: "+components.length+".");
+						Utils.LOG_WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
+						Utils.LOG_WARNING("[BAS] tMaterial.length: "+components.length+".");
 						for (int das=0;das<components.length;das++){
 							if (components[das] != null) {
-								Utils.LOG_WARNING("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
+								Utils.LOG_WARNING("[BAS] tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
 							}
 						}
 
 						//Adds Recipe
 						if (M.requiresBlastFurnace()) {
 							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 500)){
-								Utils.LOG_WARNING("Success.");
+								Utils.LOG_WARNING("[BAS] Success.");
 							}
 							else {
-								Utils.LOG_WARNING("Failed.");
+								Utils.LOG_WARNING("[BAS] Failed.");
 							}
 						}
 						else {
 							if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 240)){
-								Utils.LOG_WARNING("Success.");
+								Utils.LOG_WARNING("[BAS] Success.");
 							}
 							else {
-								Utils.LOG_WARNING("Failed.");
+								Utils.LOG_WARNING("[BAS] Failed.");
 							}
 						}
 					}
 				}
 			}
 			else {
-				Utils.LOG_WARNING("doTest: "+doTest+" | tMaterial != null: "+(tMaterial != null));
+				Utils.LOG_WARNING("[BAS] doTest: "+doTest+" | tMaterial != null: "+(tMaterial != null));
 			}
 		}
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 12e7bb9bfc..64ee1152f6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -23,7 +23,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				//RECIPEHANDLER_CokeOven.debug1();
 				if (((aInput1 == null) /*&& (aFluidInput == null)*/) || ((aOutput == null) || (aFluidOutput == null))) {
 					//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
-					Utils.LOG_INFO("Something was null, returning false");
+					Utils.LOG_WARNING("Something was null, returning false");
 					return false;
 				}
 
@@ -32,7 +32,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				//RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
 				if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0)) {
 					//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
-					Utils.LOG_INFO("Something was null, returning false");
+					Utils.LOG_WARNING("Something was null, returning false");
 					return false;
 				}
 
@@ -41,7 +41,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				//RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
 				if ((aFluidOutput == null) || ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
 					//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
-					Utils.LOG_INFO("Something was null, returning false");
+					Utils.LOG_WARNING("Something was null, returning false");
 					return false;
 				}
 
@@ -62,12 +62,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				return true;
 
 			} catch (final NullPointerException e){
-				Utils.LOG_INFO("Something was null, returning false");
+				Utils.LOG_WARNING("Something was null, returning false");
 				return false;
 			}
 		} catch (final Throwable e){
 			Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
-			Utils.LOG_INFO("Failed.");
+			Utils.LOG_WARNING("Failed.");
 			e.getStackTrace();
 			return false;
 		}
@@ -132,7 +132,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	@Override
 	public boolean addFuel(final ItemStack aInput1, final ItemStack aOutput1, final int aEU, final int aType) {
 		if (aInput1 == null) {
-			Utils.LOG_INFO("Fuel Input is Invalid.");
+			Utils.LOG_WARNING("Fuel Input is Invalid.");
 			return false;
 		}
 		//new GregtechRecipe(aInput1, aOutput1, GregTech_API.sRecipeFile.get("fuel_" + aType, aInput1, aEU), aType);
@@ -188,7 +188,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 
 	@Override
 	public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, int aDuration, final int aEUt) {
-		Utils.LOG_INFO("Trying to add a Dehydrator recipe.");
+		Utils.LOG_WARNING("Trying to add a Dehydrator recipe.");
 		try{
 			if ((aInput == null) || (aFluid == null) || (aOutput == null)) {
 				return false;
@@ -199,7 +199,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 			Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutput, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0);
 			//RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null, aOutput, aDuration, aEUt);
 			return true;
-		}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
+		}catch (final NullPointerException e){Utils.LOG_WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
 	}
 
 
@@ -207,18 +207,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 
 	@Override
 	public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final ItemStack[] aOutputItems, final int[] aChances, int aDuration, final int aEUt) throws IndexOutOfBoundsException{
-		Utils.LOG_INFO("Trying to add a Dehydrator recipe.");
+		Utils.LOG_WARNING("Trying to add a Dehydrator recipe.");
 		try{
 			if (aInput[0] != null){
-				Utils.LOG_INFO("Recipe requires input: "+aInput[0].getDisplayName()+" x"+aInput[0].stackSize);
+				Utils.LOG_WARNING("Recipe requires input: "+aInput[0].getDisplayName()+" x"+aInput[0].stackSize);
 			}
 			if (aInput.length > 1){
 				if (aInput[1] != null){
-					Utils.LOG_INFO("Recipe requires input: "+aInput[1].getDisplayName()+" x"+aInput[1].stackSize);
+					Utils.LOG_WARNING("Recipe requires input: "+aInput[1].getDisplayName()+" x"+aInput[1].stackSize);
 				}
 			}
 			if (aFluidInput != null){
-				Utils.LOG_INFO("Recipe requires input: "+aFluidInput.getFluid().getName()+" "+aFluidInput.amount+"mbst");
+				Utils.LOG_WARNING("Recipe requires input: "+aFluidInput.getFluid().getName()+" "+aFluidInput.amount+"mbst");
 			}
 			if (((aInput[0] == null) && (aFluidInput == null)) || ((aOutputItems == null) && (aFluidOutput == null))) {
 				return false;
@@ -227,30 +227,30 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				return false;
 			}
 			if (aOutputItems != null){
-				Utils.LOG_INFO("Recipe will output: "+ItemUtils.getArrayStackNames(aOutputItems));
+				Utils.LOG_WARNING("Recipe will output: "+ItemUtils.getArrayStackNames(aOutputItems));
 			}
 			if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
 				return false;
 			}
 			if (aFluidOutput != null){
-				Utils.LOG_INFO("Recipe will output: "+aFluidOutput.getFluid().getName());
+				Utils.LOG_WARNING("Recipe will output: "+aFluidOutput.getFluid().getName());
 			}
 
 
 
 			if (aInput.length == 1){
-				Utils.LOG_INFO("Dehydrator recipe only has a single input item.");
+				Utils.LOG_WARNING("Dehydrator recipe only has a single input item.");
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
 
 			}
 			else {
-				Utils.LOG_INFO("Dehydrator recipe has two input items.");
+				Utils.LOG_WARNING("Dehydrator recipe has two input items.");
 				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
 
 			}
 
 			return true;
-		}catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
+		}catch (final NullPointerException e){Utils.LOG_WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
 	}
 
 
-- 
cgit