Added more Nuclear fluids/dusts.

Added two new machines.

28 files changed, 274 insertions, 11 deletions

diff --git a/src/Java/gregtech/api/util/GTPP_Recipe.java b/src/Java/gregtech/api/util/GTPP_Recipe.java
index 5bd8580995..f98c35363f 100644
--- a/src/Java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/Java/gregtech/api/util/GTPP_Recipe.java
@@ -348,7 +348,13 @@ public class GTPP_Recipe extends GT_Recipe  implements IComparableRecipe {
 		
 		//Fission Fuel Plant Recipes
     	public static final GTPP_Recipe_Map_Internal sFissionFuelProcessing = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 0, 1, E, 1, E, true, false);
-    	
+
+		//Cold Trap
+		public static final GTPP_Recipe_Map_Internal sColdTrapRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.coldtrap", "Cold Trap", null, RES_PATH_GUI + "basicmachines/ChemicalReactor", 1, 1, 0, 0, 1, E, 1, E, true, true);
+
+		//Reactor Processing Unit
+		public static final GTPP_Recipe_Map_Internal sReactorProcessingUnitRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.reactorprocessingunit", "Reactor Processing Unit", null, RES_PATH_GUI + "basicmachines/ChemicalReactor", 1, 1, 0, 0, 1, E, 1, E, true, true);
+
 		//Basic Washer Map
 		public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true);
 
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 85ec564978..4957a2b571 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -234,6 +234,14 @@ public final class ModItems {
 	public static Fluid fluidFLiBeSalt;
 	public static Fluid fluidFLiBeSaltBurnt;
 
+	public static Fluid fluidLftrCore1;
+	public static Fluid fluidLftrCore2;
+	public static Fluid fluidLftrCore3;
+	public static Fluid fluidLftrCore4;
+	public static Fluid fluidLftrBlanket1;
+	public static Fluid fluidLftrBlanket2;
+	public static Fluid fluidLftrBlanket3;
+
 
 	//Possibly missing base items that GT may be missing.
 
@@ -284,6 +292,7 @@ public final class ModItems {
 	public static Item dustNeptunium238;
 	public static Item dustDecayedRadium226;
 	public static Item dustRadium226;
+	public static Item dustProtactinium233;
 	
 	public static ItemGiantEgg itemBigEgg;
 
@@ -718,6 +727,17 @@ public final class ModItems {
 		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 Core Fluid Processing
+		fluidLftrCore1 = FluidUtils.addGTFluidNoPrefix("LiBeF2UF4FP", "LiBeF2UF4FP", new short[]{110, 255, 110, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		fluidLftrCore2 = FluidUtils.addGTFluidNoPrefix("UF6F2FP", "UF6F2FP", new short[]{150, 255, 150, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		fluidLftrCore3 = FluidUtils.addGTFluidNoPrefix("LiFBeF2", "LiFBeF2", new short[]{100, 255, 50, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		fluidLftrCore4 = FluidUtils.addGTFluidNoPrefix("LiFBeF2UF4", "LiFBeF2UF4", new short[]{50, 255, 100, 100}, 0, 800, null, CI.emptyCells(1), 1000, true);
+		// LFTR Blanket Fluid Processing
+		fluidLftrBlanket1 = FluidUtils.addGTFluidNoPrefix("LiFThF4", "LiFThF4", new short[]{50, 150, 255, 50}, 0, 500, null, CI.emptyCells(1), 1000, true);
+		fluidLftrBlanket2 = FluidUtils.addGTFluidNoPrefix("LiFBeF2ThF4", "LiFBeF2ThF4", new short[]{100, 150, 100, 100}, 0, 500, null, CI.emptyCells(1), 1000, true);
+		fluidLftrBlanket3 = FluidUtils.addGTFluidNoPrefix("UF6F2", "UF6F2", new short[]{10, 150, 10, 100}, 0, 500, 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);
 
@@ -941,7 +961,7 @@ public final class ModItems {
 		dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5);
 		dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", "Contains Radon ("+StringUtils.superscript("222Rn")+")", ELEMENT.getInstance().RADIUM.getRgbAsHex())[0];
 		dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5);
-
+		dustProtactinium233 = new DustDecayable("dustProtactinium233", ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, new String[] {""+StringUtils.superscript("233Pa"), "Result: Uranium 233("+StringUtils.superscript("233U")+")"}, ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), 6);
 		dustTechnetium99 = new DustDecayable("dustTechnetium99", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 164500, new String[] {""+StringUtils.superscript("99Mo"), "Result: Ruthenium 99("+StringUtils.superscript("99Ru")+")"}, ELEMENT.getInstance().RUTHENIUM.getDust(1).getItem(), 4);
 		dustTechnetium99M = new DustDecayable("dustTechnetium99M", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 8570, new String[] {""+StringUtils.superscript("99ᵐTc"), "Result: Technicium 99 ("+StringUtils.superscript("99Tc")+")"}, dustTechnetium99, 4);
 		dustMolybdenum99 = new DustDecayable("dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, new String[] {""+StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ ("+StringUtils.superscript("99ᵐTc")+")"}, dustTechnetium99M, 4);
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
index 79a49f92b7..eb066024e0 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
@@ -45,6 +45,7 @@ public class BaseItemTickable extends CoreItem {
 		this.maxTicks = maxTicks;
 		this.twoRenderPasses = twoPass;
 		this.ticksInContainers = containerTick;
+		this.maxStackSize = 1;
 		//setGregtechItemList();
 	}
 
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index bfa08d3c29..5872587872 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.core.material.nuclear;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.Material;
@@ -263,6 +262,21 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
+	
+	public static final Material SODIUM_FLUORIDE = new Material(
+			"Sodium Fluoride", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
+			});
 
 	private static final FLUORIDES INSTANCE = new FLUORIDES();
 	public static FLUORIDES getInstance(){return INSTANCE;}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 7ff40ccc12..30ab7fc19f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -586,9 +586,13 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Machine_ZPM_Component_Maker,
 	Machine_UV_Component_Maker,
 	
-	// Fluid Reactor
-	FluidReactor_LV, FluidReactor_HV,
-	FluidReactor_IV, FluidReactor_ZPM,
+	// Reactor Processing Unit
+	ReactorProcessingUnit_IV, 
+	ReactorProcessingUnit_ZPM,
+	
+	// Cold Trap
+	ColdTrap_IV, 
+	ColdTrap_ZPM,
 	
 	//Breakers
 	BreakerBox_ULV, BreakerBox_LV, BreakerBox_MV,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 945ff7bf0e..34d1290de9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -304,5 +304,9 @@ public interface IGregtech_RecipeAdder {
 
 	public boolean addFuelForRTG(ItemStack aFuelPellet, int aFuelDays, int aVoltage);
 
+	public boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidOutput, int aTime, int aEU);
+	
+	public boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU);
+
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index d4221f064a..6a4a74e4e3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -477,6 +477,21 @@ public class TexturesGtBlock {
 
 	public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE = new CustomIcon("TileEntities/DecayablesChest_bottom");
 	public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon("TileEntities/DecayablesChest_top");
+	
+	// LFTR Single blocks
+	public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_FRONT");
+	public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE");
+	public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_SIDE");
+	public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE");
+	public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_TOP");
+	public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE");
+	
+	public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_FRONT");
+	public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE");
+	public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_SIDE");
+	public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE");
+	public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_TOP");
+	public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE");
 
 
 	//Overlay Arrays
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
new file mode 100644
index 0000000000..58bdba18a5
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
@@ -0,0 +1,67 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_BasicMachine {
+
+	public GregtechMetaTileEntity_ReactorColdTrap(int aID, String aName, String aNameRegional, int aTier) {
+		super(aID, aName, aNameRegional, aTier, 1, 
+				"Just like the Arctic", 1, 1, "ChemicalReactor.png", "",
+				new ITexture[]{
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP)
+		}
+				);
+	}
+
+	public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+		super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip};
+	}
+
+	@Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntity_ReactorColdTrap(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+	}
+
+	@Override
+	public GT_Recipe.GT_Recipe_Map getRecipeList() {
+		return GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes;
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));
+	}
+
+	@Override
+	public boolean isFluidInputAllowed(FluidStack aFluid) {
+		return super.isFluidInputAllowed(aFluid);
+	}
+
+	@Override
+	public int getCapacity() {
+		return 16000 * Math.max(1, this.mTier);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
new file mode 100644
index 0000000000..75259a0b88
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
@@ -0,0 +1,67 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEntity_BasicMachine {
+
+	public GregtechMetaTileEntity_ReactorProcessingUnit(int aID, String aName, String aNameRegional, int aTier) {
+		super(aID, aName, aNameRegional, aTier, 1, 
+				"Processes Nuclear things", 1, 1, "ChemicalReactor.png", "",
+				new ITexture[]{
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+						new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP)
+		}
+				);
+	}
+
+	public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+		super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{this.mDescription, CORE.GT_Tooltip};
+	}
+
+	@Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntity_ReactorProcessingUnit(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+	}
+
+	@Override
+	public GT_Recipe.GT_Recipe_Map getRecipeList() {
+		return GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes;
+	}
+
+	@Override
+	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));
+	}
+
+	@Override
+	public boolean isFluidInputAllowed(FluidStack aFluid) {
+		return super.isFluidInputAllowed(aFluid);
+	}
+
+	@Override
+	public int getCapacity() {
+		return 8000 * Math.max(1, this.mTier);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 4128c228b3..1397ddc1eb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -28,7 +28,7 @@ public class RecipeLoader_Nuclear {
 	public static void generate() {
 		createRecipes();
 		RecipeLoader_LFTR.generate();
-		RecipeLoader_FFPP.generate();	
+		RecipeLoader_NuclearFuelProcessing.generate();	
 	}
 
 	private static void createRecipes() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_FFPP.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
index d1d800cebc..764d7cffdd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_FFPP.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -11,7 +11,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import net.minecraftforge.fluids.FluidStack;
 
-public class RecipeLoader_FFPP {	
+public class RecipeLoader_NuclearFuelProcessing {	
 
 	public static void generate() {
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index afb0303470..2b5b2b3097 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -12,6 +12,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.util.*;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -1755,6 +1756,46 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	}
 
 
+	@Override
+	public boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidOutput, int aTime, int aEU) {
+		GTPP_Recipe aRecipe = new GTPP_Recipe(
+				false,
+				new ItemStack[] {CI.getNumberedAdvancedCircuit(aCircuit), aInput},
+				aOutputs,
+				null,
+				new int[] {},
+				new FluidStack[] {aFluidInput},
+				new FluidStack[] {aFluidOutput},
+				aTime,
+				aEU,
+				0);		
+
+		int aSize = GTPP_Recipe_Map.sColdTrapRecipes.mRecipeList.size();
+		GTPP_Recipe_Map.sColdTrapRecipes.add(aRecipe);
+		return GTPP_Recipe_Map.sColdTrapRecipes.mRecipeList.size() > aSize;
+	}
+
+
+	@Override
+	public boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU) {
+		GTPP_Recipe aRecipe = new GTPP_Recipe(
+				false,
+				new ItemStack[] {aInput1, aInput2},
+				aOutputs,
+				null,
+				aChances,
+				new FluidStack[] {aFluidInput},
+				new FluidStack[] {aFluidOutput},
+				aTime,
+				aEU,
+				0);		
+
+		int aSize = GTPP_Recipe_Map.sReactorProcessingUnitRecipes.mRecipeList.size();
+		GTPP_Recipe_Map.sReactorProcessingUnitRecipes.add(aRecipe);
+		return GTPP_Recipe_Map.sReactorProcessingUnitRecipes.mRecipeList.size() > aSize;
+	}
+
+
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
index a9eee53a7c..c2d4422326 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
@@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorColdTrap;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorProcessingUnit;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor;
 
 public class GregtechLFTR {
@@ -19,9 +21,13 @@ public class GregtechLFTR {
 
 	private static void run1() {
 		// LFTR
-		GregtechItemList.ThoriumReactor
-				.set(new GregtechMTE_NuclearReactor(751, "lftr.controller.single", "Thorium Reactor [LFTR]")
-						.getStackForm(1L));
+		GregtechItemList.ThoriumReactor.set(new GregtechMTE_NuclearReactor(751, "lftr.controller.single", "Thorium Reactor [LFTR]").getStackForm(1L));
+		// Reactor Processing Units
+		GregtechItemList.ReactorProcessingUnit_IV.set(new GregtechMetaTileEntity_ReactorProcessingUnit(31031, "rpu.tier.01", "Reactor Processing Unit I", 5).getStackForm(1L));
+		GregtechItemList.ReactorProcessingUnit_ZPM.set(new GregtechMetaTileEntity_ReactorProcessingUnit(31032, "rpu.tier.02", "Reactor Processing Unit II", 7).getStackForm(1L));
+		// Cold Traps
+		GregtechItemList.ColdTrap_IV.set(new GregtechMetaTileEntity_ReactorColdTrap(31033, "coldtrap.tier.01", "Cold Trap I", 5).getStackForm(1L));
+		GregtechItemList.ColdTrap_ZPM.set(new GregtechMetaTileEntity_ReactorColdTrap(31034, "coldtrap.tier.02", "Cold Trap II", 7).getStackForm(1L));
 
 	}
 }
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png
new file mode 100644
index 0000000000..012c63a088
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png
new file mode 100644
index 0000000000..30856a6284
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png
new file mode 100644
index 0000000000..d577f0cbb3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png
new file mode 100644
index 0000000000..e41790f90f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..f4cce85820
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":5,
+    "frames": [0, 1, 2, 3, 2, 1]
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png
new file mode 100644
index 0000000000..e9b20bd486
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png
new file mode 100644
index 0000000000..4469a809e9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png
new file mode 100644
index 0000000000..b7a77be826
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png
new file mode 100644
index 0000000000..8a47157d2b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..1367b80758
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":2,
+    "frames": [0, 0, 1, 1, 2, 2, 3, 3, 3, 2, 2, 1, 1, 0]
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png
new file mode 100644
index 0000000000..671bbd7d97
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png
new file mode 100644
index 0000000000..ae63da7746
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..8447c98f9a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation":{
+    "frametime":2,
+    "frames": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0]
+   }
+}
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png
new file mode 100644
index 0000000000..a9ab34e963
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png
new file mode 100644
index 0000000000..8a5c131623
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png