new fuel rods

3 files changed, 203 insertions, 0 deletions

diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java
index ead118983d..9933daaae6 100644
--- a/src/main/java/goodgenerator/loader/FuelRodLoader.java
+++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java
@@ -17,12 +17,24 @@ public class FuelRodLoader {
     public static Item rodCompressedPlutoniumDepleted;
     public static Item rodCompressedPlutoniumDepleted_2;
     public static Item rodCompressedPlutoniumDepleted_4;
+    public static Item rodLiquidUraniumDepleted;
+    public static Item rodLiquidUraniumDepleted_2;
+    public static Item rodLiquidUraniumDepleted_4;
+    public static Item rodLiquidPlutoniumDepleted;
+    public static Item rodLiquidPlutoniumDepleted_2;
+    public static Item rodLiquidPlutoniumDepleted_4;
     public static Item rodCompressedUranium;
     public static Item rodCompressedUranium_2;
     public static Item rodCompressedUranium_4;
     public static Item rodCompressedPlutonium;
     public static Item rodCompressedPlutonium_2;
     public static Item rodCompressedPlutonium_4;
+    public static Item rodLiquidUranium;
+    public static Item rodLiquidUranium_2;
+    public static Item rodLiquidUranium_4;
+    public static Item rodLiquidPlutonium;
+    public static Item rodLiquidPlutonium_2;
+    public static Item rodLiquidPlutonium_4;
 
     public static void RegisterRod() {
         rodCompressedUraniumDepleted = new RadioactiveItem("rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100);
@@ -31,6 +43,12 @@ public class FuelRodLoader {
         rodCompressedPlutoniumDepleted = new RadioactiveItem("rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120);
         rodCompressedPlutoniumDepleted_2 = new RadioactiveItem("rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240);
         rodCompressedPlutoniumDepleted_4 = new RadioactiveItem("rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480);
+        rodLiquidUraniumDepleted = new RadioactiveItem("rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800);
+        rodLiquidUraniumDepleted_2 = new RadioactiveItem("rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600);
+        rodLiquidUraniumDepleted_4 = new RadioactiveItem("rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200);
+        rodLiquidPlutoniumDepleted = new RadioactiveItem("rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000);
+        rodLiquidPlutoniumDepleted_2 = new RadioactiveItem("rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000);
+        rodLiquidPlutoniumDepleted_4 = new RadioactiveItem("rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 4000);
 
         GameRegistry.registerItem(rodCompressedUraniumDepleted, "rodCompressedUraniumDepleted", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID);
@@ -38,6 +56,12 @@ public class FuelRodLoader {
         GameRegistry.registerItem(rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidUraniumDepleted, "rodLiquidUraniumDepleted", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidUraniumDepleted_2, "rodLiquidUraniumDepleted2", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidUraniumDepleted_4, "rodLiquidUraniumDepleted4", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidPlutoniumDepleted, "rodLiquidPlutoniumDepleted", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidPlutoniumDepleted_2, "rodLiquidPlutoniumDepleted2", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidPlutoniumDepleted_4, "rodLiquidPlutoniumDepleted4", GoodGenerator.MOD_ID);
 
         rodCompressedUranium = new FuelRod("rodCompressedUranium", 1, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted, 1), GoodGenerator.GG);
         rodCompressedUranium_2 = new FuelRod("rodCompressedUranium2", 2, 100, 4, 1600, 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG);
@@ -45,6 +69,12 @@ public class FuelRodLoader {
         rodCompressedPlutonium = new FuelRod("rodCompressedPlutonium", 1, 50, 4, 1000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted, 1), GoodGenerator.GG);
         rodCompressedPlutonium_2 = new FuelRod("rodCompressedPlutonium2", 2, 50, 4, 2000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted_2, 1), GoodGenerator.GG);
         rodCompressedPlutonium_4 = new FuelRod("rodCompressedPlutonium4", 4, 50, 4, 4000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted_4, 1), GoodGenerator.GG);
+        rodLiquidUranium = new FuelRod("rodLiquidUranium", 1, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted, 1), GoodGenerator.GG);
+        rodLiquidUranium_2 = new FuelRod("rodLiquidUranium2", 2, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted_2, 1), GoodGenerator.GG);
+        rodLiquidUranium_4 = new FuelRod("rodLiquidUranium4", 4, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted_4, 1), GoodGenerator.GG);
+        rodLiquidPlutonium = new FuelRod("rodLiquidPlutonium", 1, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted, 1), GoodGenerator.GG);
+        rodLiquidPlutonium_2 = new FuelRod("rodLiquidPlutonium2", 2, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted_2, 1), GoodGenerator.GG);
+        rodLiquidPlutonium_4 = new FuelRod("rodLiquidPlutonium4", 4, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted_4, 1), GoodGenerator.GG);
 
         GameRegistry.registerItem(rodCompressedUranium, "rodCompressedUranium", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rodCompressedUranium_2, "rodCompressedUranium2", GoodGenerator.MOD_ID);
@@ -52,5 +82,11 @@ public class FuelRodLoader {
         GameRegistry.registerItem(rodCompressedPlutonium, "rodCompressedPlutonium", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rodCompressedPlutonium_2, "rodCompressedPlutonium2", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rodCompressedPlutonium_4, "rodCompressedPlutonium4", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidUranium, "rodLiquidUranium", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidUranium_2, "rodLiquidUranium2", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidUranium_4, "rodLiquidUranium4", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidPlutonium, "rodLiquidPlutonium", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidPlutonium_2, "rodLiquidPlutonium2", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(rodLiquidPlutonium_4, "rodLiquidPlutonium4", GoodGenerator.MOD_ID);
     }
 }
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index a12005c1b1..a4c80fcdd5 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -798,6 +798,95 @@ public class RecipeLoader_02 {
                 }
         );
 
+        GT_Values.RA.addFluidCannerRecipe(
+                ItemRefer.Advanced_Fuel_Rod.get(1),
+                ItemRefer.Fuel_Rod_LU_1.get(1),
+                MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(250),
+                null,
+                100,
+                1920
+        );
+
+        GT_Values.RA.addFluidCannerRecipe(
+                ItemRefer.Advanced_Fuel_Rod.get(1),
+                ItemRefer.Fuel_Rod_LPu_1.get(1),
+                MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(250),
+                null,
+                100,
+                1920
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.Fuel_Rod_LPu_1.get(2),
+                        MyMaterial.zircaloy2.get(OrePrefixes.stick, 4),
+                        GT_Utility.getIntegratedCircuit(2)
+                },
+                null,
+                ItemRefer.Fuel_Rod_LPu_2.get(1),
+                200,
+                7680
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.Fuel_Rod_LPu_2.get(2),
+                        MyMaterial.zircaloy2.get(OrePrefixes.stick, 4),
+                        GT_Utility.getIntegratedCircuit(5)
+                },
+                null,
+                ItemRefer.Fuel_Rod_LPu_4.get(1),
+                200,
+                7680
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.Fuel_Rod_LPu_1.get(4),
+                        MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6),
+                        GT_Utility.getIntegratedCircuit(4)
+                },
+                null,
+                ItemRefer.Fuel_Rod_LPu_4.get(1),
+                220,
+                7680
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.Fuel_Rod_LU_1.get(2),
+                        MyMaterial.zircaloy2.get(OrePrefixes.stick, 4),
+                        GT_Utility.getIntegratedCircuit(2)
+                },
+                null,
+                ItemRefer.Fuel_Rod_LU_2.get(1),
+                200,
+                7680
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.Fuel_Rod_LU_2.get(2),
+                        MyMaterial.zircaloy2.get(OrePrefixes.stick, 4),
+                        GT_Utility.getIntegratedCircuit(5)
+                },
+                null,
+                ItemRefer.Fuel_Rod_LU_4.get(1),
+                200,
+                7680
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.Fuel_Rod_LU_1.get(4),
+                        MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6),
+                        GT_Utility.getIntegratedCircuit(4)
+                },
+                null,
+                ItemRefer.Fuel_Rod_LU_4.get(1),
+                220,
+                7680
+        );
     }
 
     public static void InitLoadRecipe() {
@@ -896,5 +985,71 @@ public class RecipeLoader_02 {
                 200,
                 1920
         );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                ItemRefer.Fuel_Rod_LPu_Depleted_1.get(1),
+                null,
+                null,
+                MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(250),
+                ItemRefer.Advanced_Fuel_Rod.get(1), null, null, null, null, null,
+                new int[]{10000},
+                200,
+                7680
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                ItemRefer.Fuel_Rod_LPu_Depleted_2.get(1),
+                null,
+                null,
+                MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(500),
+                ItemRefer.Advanced_Fuel_Rod.get(2), null, null, null, null, null,
+                new int[]{10000},
+                200,
+                7680
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                ItemRefer.Fuel_Rod_LPu_Depleted_4.get(1),
+                null,
+                null,
+                MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000),
+                ItemRefer.Advanced_Fuel_Rod.get(4), null, null, null, null, null,
+                new int[]{10000},
+                200,
+                7680
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                ItemRefer.Fuel_Rod_LU_Depleted_1.get(1),
+                null,
+                null,
+                MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(250),
+                ItemRefer.Advanced_Fuel_Rod.get(1), null, null, null, null, null,
+                new int[]{10000},
+                200,
+                7680
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                ItemRefer.Fuel_Rod_LU_Depleted_2.get(1),
+                null,
+                null,
+                MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(500),
+                ItemRefer.Advanced_Fuel_Rod.get(2), null, null, null, null, null,
+                new int[]{10000},
+                200,
+                7680
+        );
+
+        GT_Values.RA.addCentrifugeRecipe(
+                ItemRefer.Fuel_Rod_LU_Depleted_4.get(1),
+                null,
+                null,
+                MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000),
+                ItemRefer.Advanced_Fuel_Rod.get(4), null, null, null, null, null,
+                new int[]{10000},
+                200,
+                7680
+        );
     }
 }
diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index 8db9de3479..d16d8c0153 100644
--- a/src/main/java/goodgenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -51,6 +51,18 @@ public final class ItemRefer {
     public static ItemRefer Fuel_Rod_Pu_1 = getItemStack(rodCompressedPlutonium);
     public static ItemRefer Fuel_Rod_Pu_2 = getItemStack(rodCompressedPlutonium_2);
     public static ItemRefer Fuel_Rod_Pu_4 = getItemStack(rodCompressedPlutonium_4);
+    public static ItemRefer Fuel_Rod_LU_Depleted_1 = getItemStack(rodLiquidUraniumDepleted);
+    public static ItemRefer Fuel_Rod_LU_Depleted_2 = getItemStack(rodLiquidUraniumDepleted_2);
+    public static ItemRefer Fuel_Rod_LU_Depleted_4 = getItemStack(rodLiquidUraniumDepleted_4);
+    public static ItemRefer Fuel_Rod_LU_1 = getItemStack(rodLiquidUranium);
+    public static ItemRefer Fuel_Rod_LU_2 = getItemStack(rodLiquidUranium_2);
+    public static ItemRefer Fuel_Rod_LU_4 = getItemStack(rodLiquidUranium_4);
+    public static ItemRefer Fuel_Rod_LPu_Depleted_1 = getItemStack(rodLiquidPlutoniumDepleted);
+    public static ItemRefer Fuel_Rod_LPu_Depleted_2 = getItemStack(rodLiquidPlutoniumDepleted_2);
+    public static ItemRefer Fuel_Rod_LPu_Depleted_4 = getItemStack(rodLiquidPlutoniumDepleted_4);
+    public static ItemRefer Fuel_Rod_LPu_1 = getItemStack(rodLiquidPlutonium);
+    public static ItemRefer Fuel_Rod_LPu_2 = getItemStack(rodLiquidPlutonium_2);
+    public static ItemRefer Fuel_Rod_LPu_4 = getItemStack(rodLiquidPlutonium_4);
     public static ItemRefer Fluid_Storage_Core_T1 = getItemStack(fluidCore, 0);
     public static ItemRefer Fluid_Storage_Core_T2 = getItemStack(fluidCore, 1);
     public static ItemRefer Fluid_Storage_Core_T3 = getItemStack(fluidCore, 2);