add thorium-232 processing line

4 files changed, 357 insertions, 1 deletions

diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index 303ab79a18..b10583a8aa 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -105,6 +105,154 @@ public class MyMaterial implements Runnable {
             TextureSet.SET_FLUID
     );
 
+    //Plutonium Based Fuel
+    public static final Werkstoff plutoniumOxideUraniumMixture = new Werkstoff(
+            new short[]{0xd1,0x1f,0x4a},
+            "Plutonium Oxide-Uranium Mixture",
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(),
+            31008,
+            TextureSet.SET_SHINY,
+            new Pair<> (Plutonium,10),
+            new Pair<> (Oxygen,12),
+            new Pair<> (Uranium,2),
+            new Pair<> (Carbon,8)
+    );
+
+    public static final Werkstoff plutoniumBasedLiquidFuel = new Werkstoff(
+            new short[]{0xef,0x15,0x15},
+            "Plutonium Based Liquid Fuel",
+            subscriptNumbers("Pu45Nt8Cs16Am2"),
+            new Werkstoff.Stats().setRadioactive(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31009,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff plutoniumBasedLiquidFuelExcited = new Werkstoff(
+            new short[]{0xef,0x15,0x15},
+            "Plutonium Based Liquid Fuel (Excited State)",
+            subscriptNumbers("*(Pu45Nt8Cs16Am2)*"),
+            new Werkstoff.Stats().setRadioactive(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31010,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff plutoniumBasedLiquidFuelDepleted = new Werkstoff(
+            new short[]{0x67,0x19,0x19},
+            "Plutonium Based Liquid Fuel (Depleted)",
+            subscriptNumbers("Tn?Ce?Au?Kr?"),
+            new Werkstoff.Stats().setToxic(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31011,
+            TextureSet.SET_FLUID
+    );
+
+    //Thorium-233
+    public static final Werkstoff oxalate = new Werkstoff(
+            new short[]{0x79,0xd8,0x55},
+            "Oxalate",
+            Werkstoff.Types.BIOLOGICAL,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31012,
+            TextureSet.SET_FLUID,
+            new Pair<> (Hydrogen,2),
+            new Pair<> (Carbon,2),
+            new Pair<> (Oxygen,4)
+    );
+
+    public static final Werkstoff vanadiumPentoxide = new Werkstoff(
+            new short[]{0xde,0x8d,0x12},
+            "Vanadium Pentoxide",
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            31013,
+            TextureSet.SET_SHINY,
+            new Pair<> (Vanadium,2),
+            new Pair<> (Oxygen,5)
+    );
+
+    public static final Werkstoff thoriumNitrate = new Werkstoff(
+            new short[]{0xba,0xe8,0x26},
+            "Thorium Nitrate",
+            subscriptNumbers("Th(NO3)4"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31014,
+            TextureSet.SET_DULL
+    );
+
+    public static final Werkstoff thoriumOxalate = new Werkstoff(
+            new short[]{0x50,0x63,0x13},
+            "Thorium Oxalate",
+            subscriptNumbers("Th(C2O4)2"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            31015,
+            TextureSet.SET_DULL
+    );
+
+    public static final Werkstoff thoriumHydroxide = new Werkstoff(
+            new short[]{0x92,0xae,0x89},
+            "Thorium Hydroxide",
+            subscriptNumbers("Th(OH)4"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            31016,
+            TextureSet.SET_SHINY
+    );
+
+    public static final Werkstoff sodiumOxalate = new Werkstoff(
+            new short[]{0xe4,0xf8,0x9b},
+            "Sodium Oxalate",
+            subscriptNumbers("Na2C2O4"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            31017,
+            TextureSet.SET_DULL
+    );
+
+    public static final Werkstoff thoriumTetrachloride = new Werkstoff(
+            new short[]{0x13,0x7c,0x16},
+            "thorium Tetrachloride",
+            subscriptNumbers("ThCl4"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31018,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff thoriumTetrafluoride = new Werkstoff(
+            new short[]{0x15,0x6a,0x6a},
+            "Thorium Tetrafluoride",
+            subscriptNumbers("ThF4"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31019,
+            TextureSet.SET_FLUID
+    );
+
+    public static final Werkstoff thorium232Tetrafluoride = new Werkstoff(
+            new short[]{0x15,0x6a,0x6a},
+            "Thorium-232 Tetrafluoride",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures().disable().addCells(),
+            31020,
+            TextureSet.SET_FLUID,
+            new Pair<> (WerkstoffLoader.Thorium232,1),
+            new Pair<> (Fluorine,4)
+    );
     @Override
     public void run() { }
 }
diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
index 7a22b709b5..e4f6d0b2fc 100644
--- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
@@ -10,6 +10,7 @@ public class FuelRecipeLoader {
         MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,100);
         MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),12960,100);
         MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),4320,500);
+        MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),32400,150);
     }
 
 }
diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java
index 873f8f34af..c471314a0c 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -20,6 +20,9 @@ public class Loaders {
     public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot",GoodGenerator.GG);
     public static final Item highDensityThoriumNugget = new MyItems("highDensityThoriumNugget",GoodGenerator.GG);
     public static final Item highDensityThorium = new MyItems("highDensityThorium",GoodGenerator.GG);
+    public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot",GoodGenerator.GG);
+    public static final Item highDensityPlutoniumNugget = new MyItems("highDensityPlutoniumNugget",GoodGenerator.GG);
+    public static final Item highDensityPlutonium = new MyItems("highDensityPlutonium",GoodGenerator.GG);
 
     public static final Block MAR_Casing = new Casing("MAR_Casing",new String[]{
             GoodGenerator.MOD_ID+":MAR_Casing"
@@ -39,6 +42,9 @@ public class Loaders {
         GameRegistry.registerItem(wrappedThoriumIngot,"wrappedThoriumIngot",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityThoriumNugget,"highDensityThoriumNugget",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityThorium,"highDensityThorium",GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(wrappedPlutoniumIngot,"wrappedPlutoniumIngot",GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(highDensityPlutoniumNugget,"highDensityPlutoniumNugget",GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(highDensityPlutonium,"highDensityPlutonium",GoodGenerator.MOD_ID);
         Loaders.MAR = new MultiNqGenerator(12732,"NaG","Large Naquadah Reactor").getStackForm(1L);
     }
 }
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index d76e5949a0..51a5b2f85a 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -1,10 +1,16 @@
 package GoodGenerator.Loader;
 
 import GoodGenerator.Items.MyMaterial;
+import codechicken.nei.ItemStackSet;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler;
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.block.material.Material;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.util.GT_Utility;
 
@@ -126,7 +132,7 @@ public class RecipeLoader {
         GT_Values.RA.addCentrifugeRecipe(
                 GT_Utility.getIntegratedCircuit(1),null,
                 MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000),
-                WerkstoffLoader.Xenon.getFluidOrGas(2),
+                WerkstoffLoader.Xenon.getFluidOrGas(10),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead,16L),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth,1L),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barium,6L),
@@ -199,5 +205,200 @@ public class RecipeLoader {
                 1500,
                 1040
         );
+
+        //Liquid Plutonium Process Line
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[]{
+                        MyMaterial.plutoniumOxideUraniumMixture.get(OrePrefixes.dust,8),
+                        GT_OreDictUnificator.get(OrePrefixes.foil,Materials.HSSS,16),
+                        GT_Utility.getIntegratedCircuit(1)
+                },
+                null,
+                new ItemStack(Loaders.wrappedPlutoniumIngot),
+                1800,
+                2040
+        );
+
+        GT_Values.RA.addImplosionRecipe(
+                new ItemStack(Loaders.wrappedPlutoniumIngot,2),
+                16,
+                new ItemStack(Loaders.highDensityPlutoniumNugget),
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.HSSS,8)
+        );
+
+        GT_Values.RA.addCompressorRecipe(
+                new ItemStack(Loaders.highDensityPlutoniumNugget,9),
+                new ItemStack(Loaders.highDensityPlutonium),
+                1200,
+                120
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                new ItemStack(Loaders.highDensityPlutonium),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Neutronium,8),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Caesium,16),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Americium,2),
+                GT_Utility.getIntegratedCircuit(1),
+                null,null,
+                MyMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(1000),
+                null,
+                360,
+                30720
+        );
+
+        GT_Values.RA.addFusionReactorRecipe(
+                Materials.Lutetium.getMolten(16),
+                MyMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(20),
+                MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(20),
+                20,
+                15360,
+                220000000
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                GT_Utility.getIntegratedCircuit(1),null,
+                MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000),
+                WerkstoffLoader.Krypton.getFluidOrGas(144),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Tritanium,9),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Cerium,4),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Gold,2),
+                null,null,null,
+                new int[]{5000,8000,7500},
+                2500,
+                7680
+        );
+
+        //Th-233
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sugar,16),
+                        MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust,0),
+                        GT_Utility.getIntegratedCircuit(1)
+                },
+                new FluidStack[]{
+                        FluidRegistry.getFluidStack("nitricacid", 6000)
+                },
+                new FluidStack[]{
+                        MyMaterial.oxalate.getFluidOrGas(3000),
+                        Materials.NitricOxide.getGas(6000)
+                },
+                null,
+                600,
+                120
+        );
+
+        GT_Values.RA.addBlastRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Thorium,1),
+                null,
+                Materials.Oxygen.getGas(2000),
+                null,
+                WerkstoffLoader.Thorianit.get(OrePrefixes.dust,1),
+                null,
+                100,
+                480,
+                1200
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                WerkstoffLoader.Thorianit.get(OrePrefixes.dust,1),
+                null,
+                FluidRegistry.getFluidStack("nitricacid", 4000),
+                MyMaterial.thoriumNitrate.getFluidOrGas(1000),
+                null,
+                40,
+                30
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(1)
+                },
+                new FluidStack[]{
+                        MyMaterial.thoriumNitrate.getFluidOrGas(1000),
+                        MyMaterial.oxalate.getFluidOrGas(4000)
+                },
+                new FluidStack[]{
+                        Materials.NitrogenDioxide.getGas(4000),
+                        Materials.CarbonDioxide.getGas(4000)
+                },
+                new ItemStack[]{
+                        MyMaterial.thoriumOxalate.get(OrePrefixes.dust,1)
+                },
+                100,
+                120
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                MyMaterial.thoriumOxalate.get(OrePrefixes.dust,1),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.SodiumHydroxide,4),
+                null,
+                null,
+                MyMaterial.thoriumHydroxide.get(OrePrefixes.dust,1),
+                MyMaterial.sodiumOxalate.get(OrePrefixes.dust,2),
+                40,
+                120
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                MyMaterial.sodiumOxalate.get(OrePrefixes.dust,1),
+                GT_Utility.getIntegratedCircuit(1),
+                Materials.HydrochloricAcid.getFluid(2000),
+                MyMaterial.oxalate.getFluidOrGas(1000),
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Salt,2),
+                null,
+                20,
+                30
+        );
+
+        GT_Values.RA.addChemicalRecipe(
+                MyMaterial.thoriumHydroxide.get(OrePrefixes.dust,1),
+                GT_Utility.getIntegratedCircuit(1),
+                Materials.HydrochloricAcid.getFluid(4000),
+                MyMaterial.thoriumTetrachloride.getFluidOrGas(1000),
+                null,
+                null,
+                200,
+                120
+        );
+
+        GT_Values.RA.addMultiblockChemicalRecipe(
+                new ItemStack[]{
+                        GT_Utility.getIntegratedCircuit(1),
+                },
+                new FluidStack[]{
+                        MyMaterial.thoriumTetrachloride.getFluidOrGas(1000),
+                        Materials.HydrofluoricAcid.getFluid(4000)
+                },
+                new FluidStack[]{
+                        MyMaterial.thoriumTetrafluoride.getFluidOrGas(1000),
+                        Materials.HydrochloricAcid.getFluid(4000)
+                },
+                null,
+                240,
+                480
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                GT_Utility.getIntegratedCircuit(1),
+                null,
+                MyMaterial.thoriumTetrafluoride.getFluidOrGas(1000),
+                MyMaterial.thorium232Tetrafluoride.getFluidOrGas(250),
+                GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Thorium,3),
+                null,null,null,null,null,null,
+                100,
+                480
+        );
+
+        GT_Values.RA.addBlastRecipe(
+                GT_Utility.getIntegratedCircuit(1),
+                null,
+                MyMaterial.thorium232Tetrafluoride.getFluidOrGas(1000),
+                Materials.Fluorine.getGas(4000),
+                WerkstoffLoader.Thorium232.get(OrePrefixes.dust,1),
+                null,
+                100,
+                120,
+                1200
+        );
     }
 }