recipes for Pre-Assembler and minor fix

4 files changed, 217 insertions, 30 deletions

diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index a81ce3672c..e2385f9585 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -69,6 +69,7 @@ public class Loaders {
     public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":upgradeEssentia/null", GoodGenerator.MOD_ID+":upgradeEssentia/air", GoodGenerator.MOD_ID+":upgradeEssentia/thermal", GoodGenerator.MOD_ID+":upgradeEssentia/unstable", GoodGenerator.MOD_ID+":upgradeEssentia/victus", GoodGenerator.MOD_ID+":upgradeEssentia/tainted", GoodGenerator.MOD_ID+":upgradeEssentia/mechanics", GoodGenerator.MOD_ID+":upgradeEssentia/spirit", GoodGenerator.MOD_ID+":upgradeEssentia/radiation", GoodGenerator.MOD_ID+":upgradeEssentia/electric"});
     public static final Item highEnergyMixture = new MyItems("highEnergyMixture", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":highEnergyMixture"});
     public static final Item saltyRoot = new MyItems("saltyRoot", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":saltyRoot"});
+    public static final Item huiCircuit = new MyItems("huiCircuit", addText("huiCircuit.tooltip", 5), GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":ciruits/1", GoodGenerator.MOD_ID+":ciruits/2", GoodGenerator.MOD_ID+":ciruits/3", GoodGenerator.MOD_ID+":ciruits/4", GoodGenerator.MOD_ID+":ciruits/5"});
 
     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_MINING_BLACKPLUTONIUM"});
@@ -178,6 +179,7 @@ public class Loaders {
         GameRegistry.registerItem(fluidCore, "fluidCore", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highEnergyMixture, "highEnergyMixture", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(saltyRoot, "saltyRoot", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(huiCircuit, "huiCircuit", GoodGenerator.MOD_ID);
     }
 
     public static void compactMod() {
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 8d51049048..0716d6d9fb 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -1,6 +1,7 @@
 package goodgenerator.loader;
 
 import goodgenerator.crossmod.LoadedList;
+import goodgenerator.items.MyMaterial;
 import goodgenerator.main.GoodGenerator;
 import goodgenerator.util.ItemRefer;
 import goodgenerator.util.MyRecipeAdder;
@@ -39,6 +40,15 @@ public class NaquadahReworkRecipeLoader {
 
         if (!EnableNaquadahRework) return;
 
+        //Fix shit
+        GT_Values.RA.addPulveriserRecipe(
+                lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1),
+                new ItemStack[]{Materials.Tin.getDust(2)},
+                new int[]{10000},
+                334,
+                4
+        );
+
         //Naquadah Rework Line
         GT_Values.RA.addBlastRecipe(
                 naquadahEarth.get(OrePrefixes.dust, 2),
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index e8e761b1d8..392e5be138 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -6,6 +6,7 @@ import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
 import goodgenerator.util.MaterialFix;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+import goodgenerator.util.MyRecipeAdder;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -1015,7 +1016,7 @@ public class RecipeLoader {
                             GT_OreDictUnificator.get(OrePrefixes.wireFine,Materials.Gallium,32),
                             GT_OreDictUnificator.get(OrePrefixes.spring,Materials.Indium,16),
                             GT_OreDictUnificator.get(OrePrefixes.gearGt,Materials.Osmiridium,16),
-                            new ItemStack(Ic2Items.iridiumPlate.getItem(),32),
+                            ItemRefer.IC2_Ir_Plate.get(32),
                             GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
                             GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
                             GT_OreDictUnificator.get(OrePrefixes.foil,Materials.CrystallineAlloy,64),
@@ -1396,18 +1397,21 @@ public class RecipeLoader {
                 }
         );
 
-        GT_ModHandler.addCraftingRecipe(
+        MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                new ItemStack[]{
+                        ItemList.Circuit_Board_Coated_Basic.get(1),
+                        ItemList.Circuit_Chip_ULPIC.get(1),
+                        ItemList.ULV_Coil.get(2),
+                        ItemList.Battery_RE_ULV_Tantalum.get(1)
+                },
+                new FluidStack[]{
+                        Materials.RedAlloy.getMolten(144),
+                        Materials.Aluminium.getMolten(144)
+                },
                 ItemRefer.Micro_Heater.get(1),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[]{
-                        "PIP","UBU","CTC",
-                        'P', "plateQuintuplePaper",
-                        'I', ItemList.Circuit_Chip_ULPIC,
-                        'U', "circuitPrimitive",
-                        'B', ItemList.Circuit_Board_Coated_Basic,
-                        'C', ItemList.ULV_Coil,
-                        'T', ItemList.Battery_RE_ULV_Tantalum
-                }
+                120,
+                40,
+                1
         );
 
         GT_Values.RA.addAutoclaveRecipe(
@@ -1426,26 +1430,27 @@ public class RecipeLoader {
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium,4),
                 FluidRegistry.getFluidStack("ic2distilledwater", 1000),
                 ItemRefer.Quartz_Wafer.get(1),
-                3333,
+                10000,
                 1500,
                 30,
                 true
         );
 
-        CrackRecipeAdder.addUniversalCircuitAssemblerRecipe(
+        MyRecipeAdder.instance.addPreciseAssemblerRecipe(
                 new ItemStack[]{
                         ItemRefer.Quartz_Wafer.get(1),
                         ItemRefer.Special_Ceramics_Plate.get(2),
                         ItemRefer.Micro_Heater.get(1),
-                        GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy,4),
-                        ItemList.Circuit_Chip_ILC.get(4),
-                        GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Silver,2),
+                        ItemList.Circuit_Chip_ILC.get(4)
+                },
+                new FluidStack[]{
+                        Materials.EnergeticAlloy.getMolten(72),
+                        Materials.Silver.getMolten(18)
                 },
                 ItemRefer.Quartz_Crystal_Resonator.get(1),
-                36,
-                100,
-                120,
-                true
+                480,
+                40,
+                1
         );
 
         CrackRecipeAdder.addUniversalAssemblerRecipe(
@@ -1647,16 +1652,20 @@ public class RecipeLoader {
                 }
         );
 
-        GT_ModHandler.addCraftingRecipe(
+        MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                new ItemStack[] {
+                        ItemRefer.HiC_T2.get(2),
+                        ItemList.Emitter_EV.get(2),
+                        ItemRefer.Neutron_Source.get(1)
+                },
+                new FluidStack[] {
+                        Materials.StainlessSteel.getMolten(576),
+                        Materials.TungstenCarbide.getMolten(144)
+                },
                 Loaders.NA.copy(),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-                new Object[]{
-                        "PCP","ESE","PCP",
-                        'C', "circuitMaster",
-                        'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel,1),
-                        'E', ItemList.Emitter_EV.get(1),
-                        'S', ItemRefer.Neutron_Source.get(1),
-                }
+                7680,
+                100,
+                1
         );
     }
 
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index c0fe7d309f..aecadf2d14 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -45,6 +45,9 @@ public class RecipeLoader_02 {
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.marM200, 220, 7680, 5000, false);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.signalium, 1600, 30720, 4000, true);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.lumiium, 1600, 30720, 4000, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.artheriumSn, 500, 122880, 6500, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.titaniumBetaC, 400, 7680, 5300, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.dalisenite, 800, 491520, 8700, true);
 
         GT_Values.RA.addAssemblerRecipe(
                 new ItemStack[] {
@@ -1018,6 +1021,169 @@ public class RecipeLoader_02 {
                 100,
                 30
         );
+
+        if (LoadedList.GTNH_CORE) {
+            CrackRecipeAdder.addUniversalAssemblerRecipe(
+                    new ItemStack[]{
+                            ItemList.Circuit_Board_Multifiberglass_Elite.get(1),
+                            GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16),
+                            ItemList.Circuit_Chip_SoC2.get(8),
+                            ItemList.Circuit_Chip_NOR.get(32),
+                            MyMaterial.signalium.get(OrePrefixes.bolt, 32),
+                            GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8),
+                            Ic2Items.reactorVent
+                    },
+                    ItemRefer.HiC_T1.get(1),
+                    288,
+                    1200,
+                    7680,
+                    false
+            );
+
+            GT_Values.RA.addAssemblerRecipe(
+                    new ItemStack[] {
+                            ItemList.Robot_Arm_IV.get(4),
+                            ItemRefer.HiC_T1.get(4),
+                            ItemList.Tool_DataOrb.get(3),
+                            GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4),
+                            MyMaterial.adamantiumAlloy.get(OrePrefixes.gearGt, 4),
+                            MyMaterial.marM200.get(OrePrefixes.plateDouble, 2),
+                            ItemRefer.IC2_Ir_Plate.get(2),
+                            MyMaterial.lumiium.get(OrePrefixes.bolt, 48),
+                    },
+                    Materials.Palladium.getMolten(1152),
+                    ItemRefer.Precise_Assembler.get(1),
+                    1800,
+                    7680,
+                    false
+            );
+
+            GT_Values.RA.addAssemblerRecipe(
+                    new ItemStack[] {
+                            ItemList.Casing_ZPM.get(3),
+                            ItemList.Robot_Arm_EV.get(2),
+                            GT_OreDictUnificator.get(OrePrefixes.cableGt04, MyMaterial.lumiium.getBridgeMaterial(), 2),
+                            MyMaterial.marCeM200.get(OrePrefixes.plateDouble, 2),
+                            ItemRefer.HiC_T1.get(1),
+                            GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Draconium, 32),
+                            MyMaterial.titaniumBetaC.get(OrePrefixes.gearGtSmall, 8)
+                    },
+                    Materials.BlackSteel.getMolten(576),
+                    ItemRefer.Precise_Electronic_Unit_T1.get(2),
+                    800,
+                    7680,
+                    false
+            );
+
+            MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                    new ItemStack[] {
+                            ItemRefer.HiC_T1.get(2),
+                            GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8),
+                            ItemList.Circuit_Chip_NAND.get(16),
+                            Ic2Items.reactorVentCore
+                    },
+                    new FluidStack[] {
+                            Materials.Plastic.getMolten(288),
+                            MyMaterial.signalium.getMolten(144),
+                            MyMaterial.lumiium.getMolten(72),
+                            Materials.Enderium.getMolten(72)
+                    },
+                    ItemRefer.HiC_T2.get(1),
+                    30720,
+                    100,
+                    1
+            );
+
+            MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                    new ItemStack[] {
+                            ItemRefer.HiC_T2.get(2),
+                            ItemList.Circuit_Parts_Crystal_Chip_Master.get(8),
+                            ItemList.Circuit_Chip_CrystalSoC2.get(1),
+                            Ic2Items.reactorVentDiamond
+                    },
+                    new FluidStack[] {
+                            MyMaterial.adamantiumAlloy.getMolten(576),
+                            MyMaterial.signalium.getMolten(288),
+                            MyMaterial.lumiium.getMolten(144),
+                            Materials.TungstenCarbide.getMolten(72)
+                    },
+                    ItemRefer.HiC_T3.get(1),
+                    122880,
+                    100,
+                    2
+            );
+
+            MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                    new ItemStack[] {
+                            ItemRefer.HiC_T3.get(2),
+                            GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8),
+                            ItemList.Circuit_Chip_QuantumCPU.get(16),
+                            Ic2Items.reactorVentGold
+                    },
+                    new FluidStack[] {
+                            MyMaterial.marM200.getMolten(1152),
+                            MyMaterial.signalium.getMolten(576),
+                            MyMaterial.lumiium.getMolten(288),
+                            MyMaterial.artheriumSn.getMolten(144)
+                    },
+                    ItemRefer.HiC_T4.get(1),
+                    491520,
+                    100,
+                    3
+            );
+
+            MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                    new ItemStack[] {
+                            ItemRefer.HiC_T4.get(2),
+                            GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8),
+                            ItemList.Circuit_Chip_BioCPU.get(1),
+                            Ic2Items.reactorVentSpread
+                    },
+                    new FluidStack[] {
+                            MyMaterial.titaniumBetaC.getMolten(1728),
+                            MyMaterial.signalium.getMolten(1152),
+                            MyMaterial.lumiium.getMolten(576),
+                            MyMaterial.dalisenite.getMolten(288)
+                    },
+                    ItemRefer.HiC_T5.get(1),
+                    1966080,
+                    100,
+                    3
+            );
+
+            GT_Values.RA.addAssemblerRecipe(
+                    new ItemStack[]{
+                            GT_ModHandler.getModItem("dreamcraft", "gt.blockcasingsNH", 3, 12),
+                            ItemList.Robot_Arm_LuV.get(2),
+                            GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 4),
+                            ItemRefer.HiC_T2.get(1),
+                            ItemRefer.Precise_Electronic_Unit_T1.get(1),
+                            MyMaterial.marCeM200.get(OrePrefixes.bolt, 32),
+                            MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 8),
+                    },
+                    MyMaterial.adamantiumAlloy.getMolten(1152),
+                    ItemRefer.Precise_Electronic_Unit_T2.get(4),
+                    4800,
+                    122880
+            );
+
+            GT_Values.RA.addAssemblerRecipe(
+                    new ItemStack[]{
+                            ItemList.Casing_MAX.get(3),
+                            ItemList.Field_Generator_ZPM.get(2),
+                            GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4),
+                            ItemRefer.HiC_T3.get(1),
+                            ItemRefer.Precise_Electronic_Unit_T2.get(1),
+                            MyMaterial.titaniumBetaC.get(OrePrefixes.bolt, 32),
+                            MyMaterial.dalisenite.get(OrePrefixes.gearGtSmall, 8),
+                    },
+                    MyMaterial.artheriumSn.getMolten(1152),
+                    ItemRefer.Precise_Electronic_Unit_T3.get(4),
+                    4800,
+                    491520
+            );
+        }
+
     }
 
     public static void InitLoadRecipe() {