put all Oil and oredrill recipes to Assembler/assline

2 files changed, 35 insertions, 16 deletions

diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index f070b11ec8..c9e359093d 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1920,6 +1920,15 @@ public class GT_MachineRecipeLoader implements Runnable {
 
         GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 4L), ItemList.neutroniumHeatCapacitor.get(1L), 100, 120000);
 
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.Hull_MV.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 4L), ItemList.Electric_Motor_MV.get(6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 6L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OilDrill1.get(1L), 400, 120);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OilDrill1.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 8L), ItemList.Electric_Motor_HV.get(8L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 8L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OilDrill2.get(1L), 400, 480);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OilDrill2.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 12L), ItemList.Electric_Motor_EV.get(10L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 10L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OilDrill3.get(1L), 400, 1920);
+
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.Hull_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), ItemList.Electric_Motor_EV.get(6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 6L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill1.get(1L), 400, 1920);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OreDrill1.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 6L), ItemList.Electric_Motor_IV.get(8L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 8L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill2.get(1L), 400, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OreDrill2.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8L), ItemList.Electric_Motor_LuV.get(10L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 10L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill3.get(1L), 400, 30720);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OreDrill3.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 10L), ItemList.Electric_Motor_ZPM.get(12L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 12L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill4.get(1L), 400, 122880);
+
         GT_ModHandler.removeRecipe(new ItemStack(Items.lava_bucket), ItemList.Cell_Empty.get(1L));
         GT_ModHandler.removeRecipe(new ItemStack(Items.water_bucket), ItemList.Cell_Empty.get(1L));
 
@@ -2745,7 +2754,32 @@ public class GT_MachineRecipeLoader implements Runnable {
                     Materials.ElectrumFlux.getMolten(1152L),
             }, ItemList.FusionComputer_UV.get(1), 1000, 90000);
 
-            if (GregTech_API.sThaumcraftCompat != null) {
+        GT_Values.RA.addAssemblylineRecipe(ItemList.OreDrill4.get(1L), 144000, new Object[]{
+                ItemList.OreDrill4.get(1),
+                new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3},
+                new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3},
+                new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3},
+                new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3},
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 14L),
+                ItemList.Electric_Motor_UV.get(14),
+        }, new FluidStack[]{
+                Materials.SolderingAlloy.getMolten(1440),
+        }, ItemList.OreDrill5.get(1), 400, 500000);
+
+        GT_Values.RA.addAssemblylineRecipe(ItemList.OreDrill5.get(1L), 288000, new Object[]{
+                ItemList.OreDrill5.get(1),
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4},
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4},
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4},
+                new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4},
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 16L),
+                ItemList.Electric_Motor_UHV.get(16),
+        }, new FluidStack[]{
+                Materials.SolderingAlloy.getMolten(2880),
+        }, ItemList.OreDrill6.get(1), 800, 2000000);
+
+
+        if (GregTech_API.sThaumcraftCompat != null) {
                 String tKey = "GT_WOOD_TO_CHARCOAL";
                 GT_LanguageManager.addStringLocalization(GT_MachineRecipeLoader.aTextTCGTPage + tKey, "You have discovered a way of making charcoal magically instead of using regular ovens for this purpose.<BR><BR>To create charcoal from wood you first need an air-free environment, some vacuus essentia is needed for that, then you need to incinerate the wood using ignis essentia and wait until all the water inside the wood is burned away.<BR><BR>This method however doesn't create creosote oil as byproduct.");
 
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 9b093fe5b9..4bc8883f59 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1219,9 +1219,6 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
         ItemList.OilDrill1.set(new GT_MetaTileEntity_OilDrill1(1157, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig").getStackForm(1));

         ItemList.OilDrill2.set(new GT_MetaTileEntity_OilDrill2(141, "multimachine.oildrill2", "Oil/Gas/Fluid Drilling Rig II").getStackForm(1));

         ItemList.OilDrill3.set(new GT_MetaTileEntity_OilDrill3(142, "multimachine.oildrill3", "Oil/Gas/Fluid Drilling Rig III").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV});

-        GT_ModHandler.addCraftingRecipe(ItemList.OilDrill2.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Motor_HV});

-        GT_ModHandler.addCraftingRecipe(ItemList.OilDrill3.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill2, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV});

 

         ItemList.ConcreteBackfiller1.set(new GT_MetaTileEntity_ConcreteBackfiller1(143, "multimachine.concretebackfiller1", "Concrete Backfiller").getStackForm(1));

         ItemList.ConcreteBackfiller2.set(new GT_MetaTileEntity_ConcreteBackfiller2(144, "multimachine.concretebackfiller3", "Advanced Concrete Backfiller").getStackForm(1));

@@ -1229,27 +1226,15 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
         GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller2.get(1L), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_EV});

 

         ItemList.OreDrill1.set(new GT_MetaTileEntity_OreDrillingPlant1(1158, "multimachine.oredrill1", "Ore Drilling Plant").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OreDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_EV, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV});

-

         ItemList.OreDrill2.set(new GT_MetaTileEntity_OreDrillingPlant2(1177, "multimachine.oredrill2", "Ore Drilling Plant II").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OreDrill2.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill1, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Elite), 'C', ItemList.Electric_Motor_IV});

-

         ItemList.OreDrill3.set(new GT_MetaTileEntity_OreDrillingPlant3(1178, "multimachine.oredrill3", "Ore Drilling Plant III").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OreDrill3.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill2, 'W', OrePrefixes.frameGt.get(Materials.Osmiridium), 'E', OrePrefixes.circuit.get(Materials.Master), 'C', ItemList.Electric_Motor_LuV});

-

         ItemList.OreDrill4.set(new GT_MetaTileEntity_OreDrillingPlant4(1179, "multimachine.oredrill4", "Ore Drilling Plant IV").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OreDrill4.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill3, 'W', OrePrefixes.frameGt.get(Materials.Tritanium), 'E', OrePrefixes.circuit.get(Materials.Ultimate), 'C', ItemList.Electric_Motor_ZPM});

-

         ItemList.OreDrill5.set(new GT_MetaTileEntity_OreDrillingPlant5(1167, "multimachine.oredrill5", "Ore Drilling Plant V").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OreDrill5.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill4, 'W', OrePrefixes.frameGt.get(Materials.Neutronium), 'E', OrePrefixes.circuit.get(Materials.Infinite), 'C', ItemList.Electric_Motor_UV});

-

         ItemList.OreDrill6.set(new GT_MetaTileEntity_OreDrillingPlant6(1168, "multimachine.oredrill6", "Ore Drilling Plant VI").getStackForm(1));

-        GT_ModHandler.addCraftingRecipe(ItemList.OreDrill6.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill5, 'W', OrePrefixes.frameGt.get(Materials.BlackPlutonium), 'E', OrePrefixes.circuit.get(Materials.Bio), 'C', ItemList.Electric_Motor_UHV});

 

         ItemList.PyrolyseOven.set(new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1));

         GT_ModHandler.addCraftingRecipe(ItemList.PyrolyseOven.get(1L), bitsd, new Object[]{"WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Pump_MV});

 

-

         ItemList.OilCracker.set(new GT_MetaTileEntity_OilCracker(1160, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1));

         GT_ModHandler.addCraftingRecipe(ItemList.OilCracker.get(1L), bitsd, new Object[]{aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W', ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Pump_HV});