Added new generic Nuclear Chem item.

Added ability to set Fluid for a Material.
Moved Nuclear recipe generation to a different phase during init.

7 files changed, 238 insertions, 20 deletions

diff --git a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 334f647b44..493b7d415d 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -4,8 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -105,6 +107,20 @@ public class CommandEnableDebugWhileRunning implements ICommand
 						PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen));
 					}			
 				}*/
+
+		else if (argString[0].toLowerCase().equals("inv")) {
+			final EntityPlayer P = CommandUtils.getPlayer(S);	
+			if (P != null && !P.worldObj.isRemote) {
+				ItemStack[] aInv = P.inventory.mainInventory;
+				for (ItemStack aItem : aInv) {
+					if (aItem != null) {
+						String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId;
+						String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name;
+						Logger.INFO(aModID+":"+aRegistryName);
+					}
+				}
+			}
+		}
 		else if (argString[0].toLowerCase().equals("hand")) {
 			final EntityPlayer P = CommandUtils.getPlayer(S);	
 			if (P != null) {
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 4fda17ee8a..c345863a61 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -43,6 +43,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
+import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
 import net.minecraft.item.ItemStack;
 
@@ -228,7 +229,8 @@ public class COMPAT_HANDLER {
 
 	public static void startLoadingGregAPIBasedRecipes(){
 		//Add hand-made recipes
-		RECIPES_GREGTECH.run();		
+		RECIPES_GREGTECH.run();	
+		RecipeLoader_Nuclear.generate();	
 		//Add autogenerated Recipes from Item Components
 		for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) {
 			for (RunnableWithInfo<Material> r : m) {
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index e95b646f8e..85ec564978 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -717,7 +717,7 @@ public final class ModItems {
 		//fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0);
 		fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Li2BeF4", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
 		fluidFLiBeSaltBurnt = FluidUtils.addGTFluidNoPrefix("Li2BeF2UF4", "Li2BeF2UF4", new short[]{50, 255, 50, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
-
+		
 		//LFTR Control Circuit
 		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
 
@@ -739,7 +739,8 @@ public final class ModItems {
 		//GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
 		//GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
 		fluidZrF4 = FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
-
+		FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4);
+		
 		//Coolant Salt
 		//NaBF4 - NaF - 621C
 		//dustNaBF4NaF = ItemUtils.generateSpecialUseDusts("NaBF4NaF", "NaBF4NaF", Utils.rgbtoHexValue(45, 45, 90))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
index 25beb6d9b5..db41da43b2 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -1,14 +1,15 @@
 package gtPlusPlus.core.item.chemistry;
 
-import net.minecraft.init.Items;
-
-import gregtech.api.enums.GT_Values;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
+import gtPlusPlus.core.item.chemistry.general.ItemNuclearChemBase;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 
 public class NuclearChem extends ItemPackage {
@@ -19,23 +20,39 @@ public class NuclearChem extends ItemPackage {
 	
 	public static Fluid GeneticMutagen;
 	private static boolean generateMutagenRecipe = false;	
+	
+	public static ItemNuclearChemBase mNuclearChemItem1;
+
+	public static ItemStack mResidueUranium;
+	public static ItemStack mResiduePlutonium;
+	public static ItemStack mResidueFluorides;
+	public static ItemStack mResidueNobles;
 
 	@Override
-	public String errorMessage() {
-		return "bad Nuclear Chemistry Recipes.";
+	public void items() {
+
+		mNuclearChemItem1 = new ItemNuclearChemBase();
+		registerItemStacks();
+		registerOreDict();
 	}
 
-	@Override
-	public boolean generateRecipes() {		
-		if (generateMutagenRecipe) {
-			chemReator_CreateMutagen();	
-		}		
-		chemReactor_MutagenWithEggs();
-		return true;
+
+	public void registerItemStacks() {
+
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 0, 1);
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 1, 1);
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 2, 1);
+		mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 3, 1);
+
 	}
 
-	@Override
-	public void items() {
+	public void registerOreDict() {
+
+		ItemUtils.addItemToOreDictionary(mResidueUranium, "dustResidueUranium");
+		ItemUtils.addItemToOreDictionary(mResiduePlutonium, "dustResiduePlutonium");
+		ItemUtils.addItemToOreDictionary(mResidueFluorides, "dustResidueFluoride");
+		ItemUtils.addItemToOreDictionary(mResidueNobles, "dustResidueNoble");
+
 	}
 
 	@Override
@@ -57,6 +74,20 @@ public class NuclearChem extends ItemPackage {
 			GeneticMutagen = FluidUtils.getFluidStack("fluid.Mutagen", 1).getFluid();
 		}
 	}
+
+	@Override
+	public String errorMessage() {
+		return "Bad Nuclear Chemistry Recipes.";
+	}
+
+	@Override
+	public boolean generateRecipes() {		
+		if (generateMutagenRecipe) {
+			chemReator_CreateMutagen();	
+		}		
+		chemReactor_MutagenWithEggs();
+		return true;
+	}
 	
 	private static void chemReator_CreateMutagen() {
 		CORE.RA.addChemicalRecipe(
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
new file mode 100644
index 0000000000..cfd3fd6259
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
@@ -0,0 +1,152 @@
+package gtPlusPlus.core.item.chemistry.general;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemNuclearChemBase extends Item {
+
+	final protected IIcon base[];
+	
+	final private int aMetaSize = 4;
+	
+	/*
+	 * 0 - Uranium Residue
+	 * 1 - Plutonium Residue
+	 * 2 - Fluoride Reside
+	 * 3 - Noble Gas Residue
+	 */
+	
+	public ItemNuclearChemBase() {
+		this.setHasSubtypes(true);
+		this.setNoRepair();
+		this.setMaxStackSize(64);
+		this.setMaxDamage(0);		
+		base = new IIcon[aMetaSize];		
+		this.setUnlocalizedName("BasicNuclearChemItem");
+		GameRegistry.registerItem(this, this.getUnlocalizedName());
+	}
+	
+	@Override
+	public int getItemStackLimit(ItemStack stack) {	
+		return super.getItemStackLimit(stack);
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public boolean shouldRotateAroundWhenRendering() {
+		return super.shouldRotateAroundWhenRendering();
+	}
+
+	@Override
+	public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+		super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack aStack) {
+		return super.getItemStackDisplayName(aStack);
+	}
+
+	@Override
+	public EnumRarity getRarity(ItemStack p_77613_1_) {
+		return EnumRarity.common;
+	}
+
+	@Override
+	public boolean requiresMultipleRenderPasses() {
+		return false;
+	}
+
+	@Override
+	public void getSubItems(Item aItem, CreativeTabs p_150895_2_, List aList) {
+		for (int i=0;i<aMetaSize;i++) {			
+			aList.add(ItemUtils.simpleMetaStack(aItem, i, 1));			
+		}
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isRepairable() {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return stack.getItemDamage();
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister u) {
+		for (int i=0;i<this.aMetaSize;i++) {
+			String aPath = CORE.MODID + ":" + "science/nuclear/MetaItem1/"+i;
+			this.base[i] = u.registerIcon(aPath);										
+		}
+	}	
+	
+	
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+		return this.base[damage];		
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int damage) {
+		return this.base[damage];	
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+		return this.base[stack.getItemDamage()];
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return this.base[stack.getItemDamage()];	
+	}
+
+	@Override
+    public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName() + "." + stack.getItemDamage();
+    }
+
+	@Override
+	public void addInformation(ItemStack aStack, EntityPlayer player, List list, boolean bool) {
+		super.addInformation(aStack, player, list, bool);
+	}	
+
+}
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 720e039383..98c49352f7 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -293,13 +293,21 @@ public class CORE {
 		Logger.INFO("This should only happy in a development environment or when something really bad happens.");
 		Logger.INFO("Reason: "+aReason);
 		Logger.INFO("==========================================================");
-		Logger.INFO("Called from: "+ReflectionUtils.getMethodName(0));
-		Logger.INFO(ReflectionUtils.getMethodName(1));
+		Logger.INFO("Called from: "+ReflectionUtils.getMethodName(1));
 		Logger.INFO(ReflectionUtils.getMethodName(2));
 		Logger.INFO(ReflectionUtils.getMethodName(3));
 		Logger.INFO(ReflectionUtils.getMethodName(4));
 		Logger.INFO(ReflectionUtils.getMethodName(5));
-		Logger.INFO(ReflectionUtils.getMethodName(6));		
+		Logger.INFO(ReflectionUtils.getMethodName(6));	
+		Logger.INFO(ReflectionUtils.getMethodName(7));	
+		Logger.INFO(ReflectionUtils.getMethodName(8));	
+		Logger.INFO(ReflectionUtils.getMethodName(9));	
+		Logger.INFO(ReflectionUtils.getMethodName(10));	
+		Logger.INFO(ReflectionUtils.getMethodName(11));	
+		Logger.INFO(ReflectionUtils.getMethodName(12));	
+		Logger.INFO(ReflectionUtils.getMethodName(13));	
+		Logger.INFO(ReflectionUtils.getMethodName(14));	
+		Logger.INFO(ReflectionUtils.getMethodName(15));		
 		FMLCommonHandler.instance().exitJava(0, true);
 	}
 	
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index c4131d99e7..81c16efa2c 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -1242,6 +1242,14 @@ public class Material {
 		final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount);
 		return moltenFluid;
 	}
+	
+	final public boolean setFluid(Fluid aFluid) {
+		if (this.vMoltenFluid == null){
+			this.vMoltenFluid = aFluid;
+			return true;
+		}
+		return false;
+	}
 
 
 	final public int calculateMeltingPoint(){