+ All dusts generated now try generate a fluid extraction recipe.

+ Added a new LFTR recipe.
% Changed a Uranium fluid recipe to require U233 instead of U235.
+ Added some form of logic to the LFTR, now it should run and generate much power.

4 files changed, 262 insertions, 30 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 69d5363240..7a7ebd0eb8 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -8,6 +8,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 
@@ -74,6 +75,15 @@ public class BaseItemDust extends Item{
 		}
 		addFurnaceRecipe();
 		addMacerationRecipe();
+		
+		GT_Values.RA.addFluidExtractionRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(materialName), 1), //Input
+				null, //Input 2
+				FluidUtils.getFluidStack("molten."+Utils.sanitizeString(materialName), 144), //Fluid Output
+				0, //Chance
+				1*20, //Duration
+				16 //Eu Tick
+				);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 504a4e9c83..0b7f82cf81 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -273,7 +273,25 @@ public class RECIPES_GREGTECH {
 	}
 	
 	private static void lftrRecipes(){
-		try {			
+		try {		
+			//Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
+			/*CORE.RA.addLFTRRecipe(
+					FluidUtils.getFluidStack("uraniumtetrafluoride", 200), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.li2bef4", 1000), //Fluid output (slot 2)
+					FluidUtils.getFluidStack("molten.uranium233", 500), //Output Array of Items - Upto 9,
+					16000*20, //Time in ticks
+					4000); //EU	*/
+			
+			
+			//Fli2BeF4 + Uranium235 = 1x Uranium233
+			CORE.RA.addLFTRRecipe(
+					FluidUtils.getFluidStack("molten.uranium", 144*64), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.li2bef4", 144*12), //Fluid output (slot 2)
+					FluidUtils.getFluidStack("molten.uranium233", 144), //Output Array of Items - Upto 9,
+					120*60*20, //Time in ticks
+					8000); //EU	
+			
+			//Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
 			CORE.RA.addLFTRRecipe(
 					FluidUtils.getFluidStack("uraniumtetrafluoride", 200), //Fluid input (slot 1)
 					FluidUtils.getFluidStack("molten.li2bef4", 1000), //Fluid output (slot 2)
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index a6a4212351..8a0fa9c2ee 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -131,7 +131,7 @@ public class GregtechFluidHandler {
 			
 			//Mixer Recipes
 			GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
-			GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("uraniumtetrafluoride", 288), null, 3000, 500);
+			GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("uraniumtetrafluoride", 144*3), null, 3000, 500);
 			GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("uraniumtetrafluoride", 720), FluidUtils.getFluidStack("uraniumhexafluoride", 288), null, 5000, 2000);
 
 			
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
index ba00624ace..4e1ac58a6a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
@@ -1,31 +1,33 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
+import gregtech.GT_Mod;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.*;
+import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Config;
+import gregtech.api.util.*;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
-import net.minecraft.block.Block;
+
+import java.util.ArrayList;
+
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
 
 public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase {
 
-	public static int sUUAperUUM = 1;
-	public static int sUUASpeedBonus = 4;
-	public static int sDurationMultiplier = 3215;
-	public static boolean sRequiresUUA = false;
-	private int recipeCounter = 0;
-	private static Block IC2Glass = Block.getBlockFromItem(ItemUtils.getItem("IC2:blockAlloyGlass"));
+	public GT_Recipe mLastRecipe;
+	public int mEUStore;
+
 	//public FluidStack mFluidOut = Materials.UUMatter.getFluid(1L);
 
 	public GregtechMTE_NuclearReactor(int aID, String aName, String aNameRegional) {
@@ -37,6 +39,11 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 	}
 
 	@Override
+	public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) {
+		return aSide != getBaseMetaTileEntity().getFrontFacing();
+	}
+
+	@Override
 	public String[] getDescription() {
 		return new String[]{
 				"Controller Block for the Nuclear Reactor",
@@ -64,11 +71,6 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 	}
 
 	@Override
-	public boolean checkRecipe(ItemStack aStack) {		
-		return false;
-	}
-
-	@Override
 	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
 
 		// Life Lessons from Greg.
@@ -99,10 +101,10 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 
 					// Reactor Floor/Roof inner 5x5
 					if ((i != -3 && i != 3) && (j != -3 && j != 3)) {
-						
+
 						// Reactor Floor & Roof (Inner 5x5) + Mufflers, Dynamos and Fluid outputs.
 						if (h == 0 || h == 3) {
-							
+
 							//If not a hatch, continue, else add hatch and continue.
 							if ((!addMufflerToMachineList(tTileEntity, 70)) && (!addOutputToMachineList(tTileEntity, 70)) && (!addDynamoToMachineList(tTileEntity, 70))) {
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
@@ -121,10 +123,10 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 								}
 							}	
 						} 
-						
+
 						// Inside 2 layers, mostly air
 						else {		
-							
+
 							// Reactor Inner 5x5
 							//if ((i != -1 && i != 1) && (j != -1 && j != 1)) {
 							if (!aBaseMetaTileEntity.getAirOffset(xDir + i, h, zDir + j)) {
@@ -136,11 +138,11 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 										Blocks.melon_block);
 								return false;
 							}
-							
+
 						}
-						
-							//TODO - Add Caron Moderation Rods
-							/*
+
+						//TODO - Add Caron Moderation Rods
+						/*
 							else { //carbon moderation rods are at 1,1 & -1,-1 & 1,-1 & -1,1
 								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
 									Utils.LOG_INFO("Matter Fabricator Casings Missing from one of the top layers inner 3x3.");
@@ -152,12 +154,12 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 									return false;
 								}
 							}*/						
-						
+
 					}
 
 					//Dealt with inner 5x5, now deal with the exterior.
 					else {
-						
+
 						//Deal with all 4 sides (Reactor walls)
 						if (h == 1 || h == 2) {														
 							if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
@@ -170,7 +172,7 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 								return false;
 							}							
 						}
-						
+
 						//Deal with top and Bottom edges (Inner 5x5)
 						else if (h == 0 || h == 3) {
 							if ((!addMaintenanceToMachineList(tTileEntity, 70)) && (!addInputToMachineList(tTileEntity, 70)) && (!addOutputToMachineList(tTileEntity, 70)) && (!addDynamoToMachineList(tTileEntity, 70))) {
@@ -191,12 +193,35 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 				}
 			}
 		}
-		
+
 		if (this.mMufflerHatches.size() != 4){
 			Utils.LOG_INFO("You require EXACTLY 4 muffler hatches on top. FOUR.");
 			return false;
 		}
-		
+		if (this.mEnergyHatches != null) {
+			for (int i = 0; i < this.mEnergyHatches.size(); i++) {
+				if (this.mEnergyHatches.get(i).mTier < 6)
+					return false;
+			}
+		}
+		if (this.mOutputHatches != null) {
+			for (int i = 0; i < this.mOutputHatches.size(); i++) {
+				if (this.mOutputHatches.get(i).mTier < 6)
+					return false;
+			}
+		}
+		if (this.mInputHatches != null) {
+			for (int i = 0; i < this.mInputHatches.size(); i++) {
+				if (this.mInputHatches.get(i).mTier < 6)
+					return false;
+			}
+		}
+		mWrench = true;
+		mScrewdriver = true;
+		mSoftHammer = true;
+		mHardHammer = true;
+		mSolderingTool = true;
+		mCrowbar = true;		
 		Utils.LOG_INFO("Multiblock Formed.");
 		return true;
 	}
@@ -236,4 +261,183 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 		return new GregtechMTE_NuclearReactor(this.mName);
 	}
 
+	public static int overclock(int mStartEnergy) {	        
+		return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1;
+	}
+
+	public boolean turnCasingActive(boolean status) {
+		if (this.mEnergyHatches != null) {
+			for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) {
+				hatch.mMachineBlock = status ? (byte) 52 : (byte) 53;
+			}
+		}
+		if (this.mOutputHatches != null) {
+			for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
+				hatch.mMachineBlock = status ? (byte) 52 : (byte) 53;
+			}
+		}
+		if (this.mInputHatches != null) {
+			for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
+				hatch.mMachineBlock = status ? (byte) 52 : (byte) 53;
+			}
+		}
+		return true;
+	}
+
+
+
+	@Override
+	public boolean checkRecipe(ItemStack aStack) {
+		ArrayList<FluidStack> tFluidList = getStoredFluids();
+		for (int i = 0; i < tFluidList.size() - 1; i++) {
+			for (int j = i + 1; j < tFluidList.size(); j++) {
+				if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) {
+					if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) {
+						tFluidList.remove(j--);
+					} else {
+						tFluidList.remove(i--);
+						break;
+					}
+				}
+			}
+		}
+		if (tFluidList.size() > 1) {
+			FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
+			GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[8], tFluids, new ItemStack[]{});
+			if (tRecipe == null && !mRunningOnLoad) {
+				turnCasingActive(false);
+				this.mLastRecipe = null;
+				return false;
+			}
+			if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) {
+				this.mLastRecipe = tRecipe;
+				this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue));
+				this.mMaxProgresstime = this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue);
+				this.mEfficiencyIncrease = 10000;
+				this.mOutputFluids = this.mLastRecipe.mFluidOutputs;
+				turnCasingActive(true);
+				mRunningOnLoad = false;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+		if (aBaseMetaTileEntity.isServerSide()) {
+			if (mEfficiency < 0)
+				mEfficiency = 0;
+			if (mRunningOnLoad && checkMachine(aBaseMetaTileEntity, mInventory[1])) {
+				this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
+				checkRecipe(mInventory[1]);
+			}
+			if (--mUpdate == 0 || --mStartUpCheck == 0) {
+				mInputHatches.clear();
+				mInputBusses.clear();
+				mOutputHatches.clear();
+				mOutputBusses.clear();
+				mDynamoHatches.clear();
+				mEnergyHatches.clear();
+				mMufflerHatches.clear();
+				mMaintenanceHatches.clear();
+				mMachine = checkMachine(aBaseMetaTileEntity, mInventory[1]);
+			}
+			if (mStartUpCheck < 0) {
+				if (mMachine) {
+					if (this.mEnergyHatches != null) {
+						for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches)
+							if (isValidMetaTileEntity(tHatch)) {
+								if (aBaseMetaTileEntity.getStoredEU() + (2048 * 4) < maxEUStore()
+										&& tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048 * 4, false)) {
+									aBaseMetaTileEntity.increaseStoredEnergyUnits(2048 * 4, true);
+								}
+							}
+					}
+					if (this.mEUStore <= 0 && mMaxProgresstime > 0) {
+						stopMachine();
+					}
+					if (getRepairStatus() > 0) {
+						if (mMaxProgresstime > 0 && doRandomMaintenanceDamage()) {
+							this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true);
+							if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) {
+								if (mOutputItems != null)
+									for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack);
+								if (mOutputFluids != null)
+									for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack);
+								mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000)));
+								mOutputItems = null;
+								mProgresstime = 0;
+								mMaxProgresstime = 0;
+								mEfficiencyIncrease = 0;
+								if (mOutputFluids != null && mOutputFluids.length > 0) {
+									try {
+										GT_Mod.instance.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]);
+									} catch (Exception e) {
+									}
+								}
+								this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
+								if (aBaseMetaTileEntity.isAllowedToWork())
+									checkRecipe(mInventory[1]);
+							}
+						} else {
+							if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) {
+								turnCasingActive(mMaxProgresstime > 0);
+								if (aBaseMetaTileEntity.isAllowedToWork()) {
+									this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
+									if (checkRecipe(mInventory[1])) {
+										if (this.mEUStore < this.mLastRecipe.mSpecialValue) {
+											mMaxProgresstime = 0;
+											turnCasingActive(false);
+										}
+										aBaseMetaTileEntity.decreaseStoredEnergyUnits(this.mLastRecipe.mSpecialValue, true);
+									}
+								}
+								if (mMaxProgresstime <= 0)
+									mEfficiency = Math.max(0, mEfficiency - 1000);
+							}
+						}
+					} else {
+						this.mLastRecipe = null;
+						stopMachine();
+					}
+				} else {
+					turnCasingActive(false);
+					this.mLastRecipe = null;
+					stopMachine();
+				}
+			}
+			aBaseMetaTileEntity.setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mWrench ? 0 : 1) | (mScrewdriver ? 0 : 2) | (mSoftHammer ? 0 : 4) | (mHardHammer ? 0 : 8)
+					| (mSolderingTool ? 0 : 16) | (mCrowbar ? 0 : 32) | (mMachine ? 0 : 64));
+			aBaseMetaTileEntity.setActive(mMaxProgresstime > 0);
+		}
+	}
+
+	@Override
+	public boolean onRunningTick(ItemStack aStack) {
+		if (mEUt < 0) {
+			if (!drainEnergyInput(((long) -mEUt * 10000) / Math.max(1000, mEfficiency))) {
+				this.mLastRecipe = null;
+				stopMachine();
+				return false;
+			}
+		}
+		if (this.mEUStore <= 0) {
+			this.mLastRecipe = null;
+			stopMachine();
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean drainEnergyInput(long aEU) {
+		return false;
+	}
+
+	@Override
+	public long maxEUStore() {
+		return 640000000L * (Math.min(16, this.mEnergyHatches.size())) / 16L;
+	}
+
 }
\ No newline at end of file