From b074293f70fec5df93a6d0610d99a5183dd2cbfd Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Thu, 27 Oct 2016 01:47:39 +1000
Subject: % Cleaned up material/Material.java using PMD to a rather decent
 level. > Inadvertently this refactored things in other classes.

% Changed the Blast Smelter Casing Block textures.
---
 .../gregtech/loaders/RecipeGen_BlastSmelter.java   | 19 ++++---
 .../gregtech/loaders/RecipeGen_DustGeneration.java | 61 ++++++++++++++--------
 .../xmod/gregtech/loaders/RecipeGen_Extruder.java  |  2 +-
 .../xmod/gregtech/loaders/RecipeGen_Plates.java    |  2 +-
 4 files changed, 52 insertions(+), 32 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index bca7861d58..54a5614b80 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -11,6 +11,9 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
+
+import java.util.ArrayList;
+
 import net.minecraft.item.ItemStack;
 
 public class RecipeGen_BlastSmelter {
@@ -173,7 +176,7 @@ public class RecipeGen_BlastSmelter {
 
 			//Prepare some Variables
 			ItemStack[] components;
-			gtPlusPlus.core.material.MaterialStack[] tMaterial;
+			ArrayList<gtPlusPlus.core.material.MaterialStack> tMaterial;
 			short counter=0;
 			int inputStackCount=0;
 			int fluidAmount=0;
@@ -186,8 +189,8 @@ public class RecipeGen_BlastSmelter {
 
 			//Set a duration
 			int duration = 0;
-			if (M.getMeltingPoint_K() > 150){
-				duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPoint_K();
+			if (M.getMeltingPointK() > 150){
+				duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPointK();
 			}
 			else {
 				duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;	
@@ -229,7 +232,7 @@ public class RecipeGen_BlastSmelter {
 							if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
-							if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getLocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){
+							if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){
 								Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 							}
 							if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
@@ -253,7 +256,7 @@ public class RecipeGen_BlastSmelter {
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){
 							Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
 						}
-						ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getLocalizedName(), 1);
+						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_INFO("Success, Also added a Fluid Extractor recipe.");
@@ -302,11 +305,11 @@ public class RecipeGen_BlastSmelter {
 						//Builds me an ItemStack[] of the materials. - Without a circuit - this gets a good count for the 144L fluid multiplier
 						components = new ItemStack[9];
 						inputStackCount=0;
-						for (int irc=0;irc<M.getComposites().length;irc++){
-							if (M.getComposites()[irc] != null){
+						for (int irc=0;irc<M.getComposites().size();irc++){
+							if (M.getComposites().get(irc) != null){
 								int r = (int) M.vSmallestRatio[irc];
 								inputStackCount = inputStackCount+r;
-								components[irc] = M.getComposites()[irc].getDustStack(r);
+								components[irc] = M.getComposites().get(irc).getDustStack(r);
 							}						
 						}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index e27a9167ca..4f847d697f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
 public class RecipeGen_DustGeneration {
 
 	public static void generateRecipes(Material material){
-		int tVoltageMultiplier = material.getMeltingPoint_K() >= 2800 ? 64 : 16;
+		int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16;
 
 		Utils.LOG_WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
 		//Ring Recipe
@@ -80,30 +80,47 @@ public class RecipeGen_DustGeneration {
 			Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
 
-
-		if (inputStacks.length > 0 && inputStacks.length <= 4){
-			Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks));
-			long[] inputStackSize = material.vSmallestRatio;
-			if (inputStackSize != null){
-				for (short x=0;x<inputStacks.length;x++){
-					if (inputStacks[x] != null && inputStackSize[x] != 0)
-					inputStacks[x].stackSize = (int) inputStackSize[x];
-				}
-				Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks));			
-				if (GT_Values.RA.addMixerRecipe(
-						inputStacks[0], inputStacks[1],
-						inputStacks[2], inputStacks[3],
-						null, null,
-						outputStacks,
-						(int) Math.max(material.getMass() * 2L * 1, 1),
-						6 * material.vVoltageMultiplier)){
-					Utils.LOG_WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
-				}
-				else {
-					Utils.LOG_WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed");			
+		//Is this a composite?
+		if (inputStacks != null){			
+			//Is this a composite?
+			Utils.LOG_INFO("mixer length: "+inputStacks.length);
+			if (inputStacks.length != 0 && inputStacks.length <= 4){								
+				//Log Input items
+				Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks));
+				long[] inputStackSize = material.vSmallestRatio;
+				Utils.LOG_INFO("mixer is stacksizeVar null? "+(inputStackSize != null));
+				//Is smallest ratio invalid?
+				if (inputStackSize != null){
+					//set stack sizes on an input ItemStack[]
+					for (short x=0;x<inputStacks.length;x++){
+						if (inputStacks[x] != null && inputStackSize[x] != 0)
+							inputStacks[x].stackSize = (int) inputStackSize[x];
+					}
+					//Relog input values, with stack sizes
+					Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks));	
+					//Add mixer Recipe
+					if (GT_Values.RA.addMixerRecipe(
+							inputStacks[0], inputStacks[1],
+							inputStacks[2], inputStacks[3],
+							null, null,
+							outputStacks,
+							(int) Math.max(material.getMass() * 2L * 1, 1),
+							6 * material.vVoltageMultiplier))
+					{
+						Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
+					}
+					else {
+						Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed");			
+					}
 				}
 			}
 		}
+		
+		
+		
+		
+		
+
 	}
 }
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index d6460dc56b..bfe077cc92 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -11,7 +11,7 @@ public class RecipeGen_Extruder {
 
 	public static void generateRecipes(Material material){
 
-		int tVoltageMultiplier = material.getMeltingPoint_K() >= 2800 ? 64 : 16;
+		int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16;
 		ItemStack itemIngot = material.getIngot(1);
 		ItemStack plate_Single = material.getPlate(1);
 		ItemStack itemGear = material.getGear(1);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 16e0c90d07..add6cf41b4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -12,7 +12,7 @@ public class RecipeGen_Plates {
 
 	public static void generateRecipes(Material material){
 
-		int tVoltageMultiplier = material.getMeltingPoint_K() >= 2800 ? 64 : 16;
+		int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 64 : 16;
 		ItemStack ingotStackOne = material.getIngot(1);
 		ItemStack ingotStackTwo = material.getIngot(2);
 		ItemStack shape_Mold = ItemList.Shape_Mold_Plate.get(0);
-- 
cgit