diff options
author | Dream-Master <dream-master@gmx.net> | 2018-10-16 22:14:26 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2018-10-16 22:14:26 +0200 |
commit | 5a07a1ce6a5120edf1b69ded5725f1d3e530b52b (patch) | |
tree | 9f0a2462d6eb639a13667577c6e1bdeada86712c /src/main/java/gregtech/loaders | |
parent | e6d649bfcf0cf700d2d62685352112af0594e05c (diff) | |
download | GT5-Unofficial-5a07a1ce6a5120edf1b69ded5725f1d3e530b52b.tar.gz GT5-Unofficial-5a07a1ce6a5120edf1b69ded5725f1d3e530b52b.tar.bz2 GT5-Unofficial-5a07a1ce6a5120edf1b69ded5725f1d3e530b52b.zip |
add new energy hatch recipes to crafting grid, assembler and assline
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 60 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 11 |
2 files changed, 61 insertions, 10 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index c0ae05221c..2911decf5c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -498,6 +498,11 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(ItemList.Electric_Pump_IV.get(1L, new Object[0]), OrePrefixes.circuit.get(Materials.Elite), 2, GT_Values.NF, ItemList.FluidRegulator_IV.get(1L, new Object[0]), 800, 64);//TODO Check GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), OrePrefixes.circuit.get(Materials.Good), 4, GT_Values.NF, ItemList.Schematic.get(1L, new Object[0]), 3200, 4);//TODO Check //GT_Values.RA.addAssemblerRecipe(ItemList.Cover_Shutter.get(1L, new Object[0]), OrePrefixes.circuit.get(Materials.Basic), 2, GT_Values.NF, ItemList.FluidFilter.get(1L, new Object[0]), 800, 4);//TODO Check + + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_HV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), ItemList.Circuit_Chip_LPIC.get(2L), ItemList.HV_Coil.get(1L), ItemList.Reactor_Coolant_He_1.get(2L), ItemList.Electric_Pump_EV.get(1L)}, GT_Values.NF, ItemList.Hatch_Energy_HV.get(1L, new Object[0]), 200, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_EV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1L), ItemList.Circuit_Chip_PIC.get(2L), ItemList.EV_Coil.get(1L), ItemList.Reactor_Coolant_He_1.get(2L), ItemList.Electric_Pump_IV.get(1L)}, GT_Values.NF, ItemList.Hatch_Energy_EV.get(1L, new Object[0]), 200, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_IV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1L), ItemList.Circuit_Chip_HPIC.get(2L), ItemList.IV_Coil.get(1L), ItemList.Reactor_Coolant_He_3.get(2L), ItemList.Electric_Pump_LuV.get(1L)}, GT_Values.NF, ItemList.Hatch_Energy_IV.get(1L, new Object[0]), 200, 7680); + //TODO CHECK RECIPES BELOW GT_Values.RA.addCentrifugeRecipe(ItemList.Cell_Empty.get(1, new Object[0]), null, Materials.Air.getGas(10000), Materials.Nitrogen.getGas(3900), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1), null, null, null, null, null, null, 1600, 8); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1), Materials.SulfuricAcid.getFluid(4000), new FluidStack(ItemList.sIndiumConcentrate, 8000), null, 60, 150); @@ -2689,6 +2694,59 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(9216)}, ItemList.Field_Generator_UEV.get(1, new Object[]{}), 1000, 400000); + //Energy Hatches Luv-UHV + GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Energy_IV.get(1, new Object(){}),72000,new Object[]{ + ItemList.Hull_LuV.get(1L, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.wire, Materials.SuperconductorZPM, 1L), + ItemList.Circuit_Chip_HPIC.get(4L, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Master), 2}, + ItemList.LuV_Coil.get(2L, new Object(){}), + ItemList.Reactor_Coolant_He_3.get(2L, new Object(){}), + ItemList.Electric_Pump_ZPM.get(1L, new Object(){})}, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + Materials.SolderingAlloy.getMolten(720)}, + ItemList.Hatch_Energy_LuV.get(1, new Object[]{}), 400, 30720); + + + GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Energy_LuV.get(1, new Object(){}),144000,new Object[]{ + ItemList.Hull_ZPM.get(1L, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.wire, Materials.SuperconductorUHV, 1L), + ItemList.Circuit_Chip_UHPIC.get(2L, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), 2}, + ItemList.ZPM_Coil.get(2L, new Object(){}), + ItemList.Reactor_Coolant_He_6.get(2L, new Object(){}), + ItemList.Electric_Pump_UV.get(1L, new Object(){})}, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + Materials.SolderingAlloy.getMolten(1440)}, + ItemList.Hatch_Energy_ZPM.get(1, new Object[]{}), 600, 122880); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Energy_ZPM.get(1, new Object(){}),288000,new Object[]{ + ItemList.Hull_UV.get(1L, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.wire, Materials.SuperconductorUHV, 2L), + ItemList.Circuit_Chip_UHPIC.get(4L, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 2}, + ItemList.UV_Coil.get(2L, new Object(){}), + ItemList.Reactor_Coolant_He_6.get(4L, new Object(){}), + ItemList.Electric_Pump_UHV.get(1L, new Object(){})}, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), + Materials.SolderingAlloy.getMolten(2880)}, + ItemList.Hatch_Energy_UV.get(1, new Object[]{}), 800, 500000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Energy_ZPM.get(1, new Object(){}),576000,new Object[]{ + ItemList.Hull_MAX.get(1L, new Object(){}), + GT_OreDictUnificator.get(OrePrefixes.wire, Materials.SuperconductorUHV, 4L), + ItemList.Circuit_Chip_UHPIC.get(8L, new Object(){}), + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 2}, + ItemList.UHV_Coil.get(2L, new Object(){}), + ItemList.Reactor_Coolant_He_6.get(8L, new Object(){}), + ItemList.Electric_Pump_UEV.get(1L, new Object(){})}, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + Materials.SolderingAlloy.getMolten(5760)}, + ItemList.Hatch_Energy_MAX.get(1, new Object[]{}), 1000, 2000000); Object o = new Object[0]; @@ -2703,7 +2761,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Circuit_Wafer_SoC2.get(64, o), ItemList.Circuit_Wafer_SoC2.get(64, o), ItemList.Circuit_Parts_DiodeSMD.get(8, o), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32),}, + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)}, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)}, ItemList.Energy_Module.get(1, o), 2000, 100000); 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 544581ceaf..52f4f4865b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -240,15 +240,8 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Energy_MAX.set(new GT_MetaTileEntity_Hatch_Energy(49, "hatch.energy.tier.09", "UHV Energy Hatch", 9).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_ULV.get(1L, new Object[0]), bitsd, new Object[]{"XOL ", "CMP", "XOL", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_LV.get(1L, new Object[0]), bitsd, new Object[]{"XOL ", "CMP", "XOL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Pump_LV});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_MV.get(1L, new Object[0]), bitsd, new Object[]{"XOL ", "CMP", "XOL", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', OrePrefixes.circuit.get(Materials.Good), 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Pump_MV});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_HV.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_EV.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_IV.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_LuV.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_ZPM, 'C', OrePrefixes.cableGt02.get(Materials.Naquadah)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_UV.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_UV, 'C', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy)});
- GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_MAX.get(1L, new Object[0]), bitsd, new Object[]{"CM ", 'M', ItemList.Hull_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV)});
+ GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_LV.get(1L, new Object[0]), bitsd, new Object[]{"XOL ", "CMP", "XOL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV});
+ GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_MV.get(1L, new Object[0]), bitsd, new Object[]{"XOL ", "CMP", "XOL", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_MV});
ItemList.Hatch_Input_ULV.set(new GT_MetaTileEntity_Hatch_Input(50, "hatch.input.tier.00", "Input Hatch (ULV)", 0).getStackForm(1L));
ItemList.Hatch_Input_LV.set(new GT_MetaTileEntity_Hatch_Input(51, "hatch.input.tier.01", "Input Hatch (LV)", 1).getStackForm(1L));
|