Attempting to Rewrite the entire material system for future use (Also makes life easier if I do something similar in 1.10)

1 files changed, 16 insertions, 27 deletions

diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index d68174f7bb..ab8829b7af 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -24,9 +24,12 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.lib.MaterialInfo;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.wrapper.var;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -39,34 +42,9 @@ import cpw.mods.fml.common.registry.GameRegistry;
 
 public class UtilsItems {
 
-	public static ItemStack getItemStackOfItem(Boolean modToCheck, String mod_itemname_meta){
-		if (modToCheck){
-			try{
-				Item em = null;
-
-				Item em1 = getItem(mod_itemname_meta);
-				Utils.LOG_WARNING("Found: "+em1.toString());
-				if (em1 != null){
-					em = em1;
-				}						
-				if (em != null ){
-					ItemStack returnStack = new ItemStack(em,1);				
-					return returnStack;
-				}
-				Utils.LOG_WARNING(mod_itemname_meta+" not found.");
-				return null;
-			} catch (NullPointerException e) {
-				Utils.LOG_ERROR(mod_itemname_meta+" not found. [NULL]");
-				return null;
-			}
-		}
-		return null;
-	}
-
 	public static ItemStack getSimpleStack(Item x){
 		return getSimpleStack(x, 1);
 	}
-
 	public static ItemStack getSimpleStack(Item x, int i){
 		try {
 			ItemStack r = new ItemStack(x, i);
@@ -75,7 +53,6 @@ public class UtilsItems {
 			return null;
 		}
 	}
-	
 	public static ItemStack getSimpleStack(ItemStack x, int i){
 		try {
 			ItemStack r = x.copy();
@@ -252,6 +229,16 @@ public class UtilsItems {
 		Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay).setUnlocalizedName("spawn_egg_"+parSpawnName.toLowerCase()).setTextureName(CORE.MODID+":spawn_egg");
 		GameRegistry.registerItem(itemSpawnEgg, "spawnEgg"+parSpawnName);
 	}
+	
+
+	public static ItemStack[] validItemsForOreDict(String oredictName){
+		List<?> validNames = MaterialUtils.oreDictValuesForEntry(oredictName);
+		ItemStack[] inputs = null;
+		for (int i=0; i<validNames.size();i++){
+			inputs[i] = (ItemStack) validNames.get(i);
+		}
+		return inputs;		
+	}
 
 	public static ItemStack getItemStackOfAmountFromOreDict(String oredictName, int amount){
 		ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
@@ -326,7 +313,9 @@ public class UtilsItems {
 			temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour, materialTier);
 			temp = new BaseItemRotor("itemRotor"+unlocalizedName, materialName, Colour);
 			temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour, materialTier);
-		}
+		}		
+
+		FluidUtils.addAutogeneratedMoltenFluid(materialName, Utils.hex2RgbShort(Colour), 512);
 		
 	}