add recipe for FRF controller and casing

5 files changed, 87 insertions, 8 deletions

diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
index 7e677bb706..4ff04491be 100644
--- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
@@ -7,7 +7,7 @@ import gregtech.api.enums.Materials;
 public class FuelRecipeLoader {
     public static void RegisterFuel(){
         //MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100);
-        MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120);
+        //MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120);
         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 41875d2bf8..238fcbffff 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -26,6 +26,7 @@ public class Loaders {
     public static final Item highDensityPlutoniumNugget = new MyItems("highDensityPlutoniumNugget",GoodGenerator.GG);
     public static final Item highDensityPlutonium = new MyItems("highDensityPlutonium",GoodGenerator.GG);
     public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst",GoodGenerator.GG);
+    public static final Item advancedRadiationProtectionPlate = new MyItems("advancedRadiationProtectionPlate",GoodGenerator.GG);
 
     public static final Block MAR_Casing = new Casing("MAR_Casing",new String[]{GoodGenerator.MOD_ID+":MAR_Casing"});
     public static final Block FRF_Casings = new Casing("FRF_Casing",new String[]{"gregtech:iconsets/MACHINE_CASING_ROBUST_TUNGSTENSTEEL"});
@@ -57,6 +58,7 @@ public class Loaders {
         GameRegistry.registerItem(highDensityPlutoniumNugget,"highDensityPlutoniumNugget",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityPlutonium,"highDensityPlutonium",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(rawAtomicSeparationCatalyst,"rawAtomicSeparationCatalyst",GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(advancedRadiationProtectionPlate,"advancedRadiationProtectionPlate",GoodGenerator.MOD_ID);
         Loaders.MAR = new MultiNqGenerator(12732,"NaG","Large Naquadah Reactor").getStackForm(1L);
         Loaders.FRF = new FuelRefineFactory(16999,"FRF","Naquadah Fuel Refine Factory").getStackForm(1L);
     }
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index 4d57b75716..c7d8cc4c57 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -4,6 +4,7 @@ import GoodGenerator.Items.MyMaterial;
 import GoodGenerator.util.CrackRecipeAdder;
 import GoodGenerator.util.MaterialFix;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_OreDictUnificator;
 import net.minecraft.item.ItemStack;
@@ -28,14 +29,14 @@ public class RecipeLoader {
 
         //LNR Controller
         GT_Values.RA.addAssemblylineRecipe(
-                ItemList.Generator_Naquadah_Mark_V.get(1).copy(),
+                ItemList.Generator_Naquadah_Mark_III.get(1).copy(),
                 100000,
-                new ItemStack[]{
+                new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium,8),
                         new ItemStack(Loaders.radiationProtectionPlate,16),
                         ItemList.Field_Generator_ZPM.get(2),
-                        ItemList.Electric_Pump_UV.get(2),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit,Materials.Infinite,2),
+                        ItemList.Electric_Pump_ZPM.get(8),
+                        new Object[]{OrePrefixes.circuit.get(Materials.Superconductor),4},
                         GT_OreDictUnificator.get(OrePrefixes.wireGt08,Materials.SuperconductorLuV,8),
                         GT_OreDictUnificator.get(OrePrefixes.pipeHuge,Materials.Lead,4),
                         GT_OreDictUnificator.get(OrePrefixes.plate,Materials.NaquadahAlloy,8),
@@ -830,6 +831,82 @@ public class RecipeLoader {
                 8000,
                 2040
         );
+
+        GT_Values.RA.addBlastRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadria,32),
+                GT_Utility.getIntegratedCircuit(16),
+                MyMaterial.fluoroantimonicAcid.getFluidOrGas(4000),
+                MyMaterial.acidNaquadahEmulsion.getFluidOrGas(8000),
+                MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,1),
+                null,
+                3600,
+                4080,
+                3400
+        );
+
+        GT_Values.RA.addAssemblylineRecipe(
+                ItemList.Generator_Naquadah_Mark_V.get(1).copy(),
+                500000,
+                new Object[]{
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Osmiridium,8),
+                        new ItemStack(Loaders.advancedRadiationProtectionPlate,64),
+                        ItemList.Field_Generator_UV.get(8),
+                        ItemList.Electric_Pump_UHV.get(2),
+                        new Object[]{OrePrefixes.circuit.get(Materials.Bio),4},
+                        GT_OreDictUnificator.get(OrePrefixes.pipeHuge,Materials.MysteriousCrystal,8),
+                        ItemList.Circuit_Wafer_NPIC.get(16),
+                        ItemList.UHV_Coil.get(64),
+                        new Object[]{"craftingLensYellow",16},
+                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Thulium,64)
+                },
+                new FluidStack[]{
+                        Materials.Quantium.getMolten(9216L),
+                        Materials.DraconiumAwakened.getMolten(4608L),
+                        MyMaterial.extremelyUnstableNaquadah.getMolten(1440),
+                        Materials.SolderingAlloy.getMolten(14400L)
+                },
+                Loaders.FRF.copy(),
+                36000,
+                1919810
+        );
+
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[]{
+                        new ItemStack(Loaders.radiationProtectionPlate,2),
+                        OreDictHandler.getItemStack("AlloyAdvanced",OrePrefixes.plate,8),
+                        GT_OreDictUnificator.get(OrePrefixes.plateDense,Materials.Palladium,2),
+                        GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Osmiridium,4),
+                        GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Tungsten,4),
+                        GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Cobalt,4)
+                },
+                Materials.NiobiumTitanium.getMolten(72),
+                new ItemStack(Loaders.advancedRadiationProtectionPlate),
+                1000,
+                2040
+        );
+
+        GT_Values.RA.addAssemblylineRecipe(
+                new ItemStack(Loaders.MAR_Casing),
+                250000,
+                new ItemStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Thulium,1),
+                        new ItemStack(Loaders.advancedRadiationProtectionPlate,6),
+                        ItemList.Field_Generator_IV.get(2),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeTiny,Materials.Naquadah,16),
+                        GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.NaquadahAlloy,32),
+                        GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.NaquadahAlloy,32),
+                        GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.Manyullyn,32),
+                        GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.Manyullyn,32),
+                        MyMaterial.orundum.get(OrePrefixes.plate,4)
+                },
+                new FluidStack[]{
+                        Materials.TungstenSteel.getMolten(1152),
+                        Materials.SolderingAlloy.getMolten(2304)
+                },
+                new ItemStack(Loaders.FRF_Casings),
+                500,
+                65536
+        );
     }
 
     public static void Fixer(){
diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java
index 389e256da2..b9cf48d607 100644
--- a/src/main/java/GoodGenerator/Main/GoodGenerator.java
+++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java
@@ -42,13 +42,13 @@ public final class GoodGenerator {
     @Mod.EventHandler
     public static void init(FMLInitializationEvent event){
         proxy.init(event);
-        RecipeLoader.RecipeLoad();
-        RecipeLoader.Fixer();
         FuelRecipeLoader.RegisterFuel();
     }
     @Mod.EventHandler
     public static void postInit(FMLPostInitializationEvent event){
         proxy.postInit(event);
+        RecipeLoader.RecipeLoad();
+        RecipeLoader.Fixer();
     }
 
 }
diff --git a/src/main/java/GoodGenerator/util/MyRecipeAdder.java b/src/main/java/GoodGenerator/util/MyRecipeAdder.java
index 4bb42288cc..2d91943922 100644
--- a/src/main/java/GoodGenerator/util/MyRecipeAdder.java
+++ b/src/main/java/GoodGenerator/util/MyRecipeAdder.java
@@ -31,7 +31,7 @@ public class MyRecipeAdder {
             "gg.recipe.naquadah_fuel_refine_factory",
             StatCollector.translateToLocal("tile.naquadah_fuel_refine_factory"),
             null,
-            "gregtech:textures/gui/basicmachines/Default",
+            "gregtech:textures/gui/basicmachines/FusionReactor",
             6,0, 0, 1, 1,
             "Need Tier ",
             1,