diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 3 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 84 |
2 files changed, 13 insertions, 74 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 2000442437..0dcd9c5bfb 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -14540,6 +14540,9 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.Quicklime.getDust(2), 80, 480); + // Fluid Sodium + GT_Values.RA.addFluidHeaterRecipe(Materials.Sodium.getDust(1), Materials.Sodium.getFluid(1000), 200, 120); + // 2CH3COOH = CH3COCH3 + CO2 + H GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 66a241604b..0529dd5e5d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -113,92 +113,18 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Neutron_Reflector.set( new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); - ItemList.Reactor_Coolant_He_1.set( GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); - GT_ModHandler.addCraftingRecipe( - ItemList.Reactor_Coolant_He_1.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - " P ", - "PCP", - " P ", - 'C', - OrePrefixes.cell.get(Materials.Helium), - 'P', - OrePrefixes.plate.get(Materials.Tin) - }); - ItemList.Reactor_Coolant_He_3.set( GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); - GT_ModHandler.addCraftingRecipe( - ItemList.Reactor_Coolant_He_3.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PCP", "PCP", "PCP", 'C', ItemList.Reactor_Coolant_He_1, 'P', OrePrefixes.plate.get(Materials.Tin) - }); - ItemList.Reactor_Coolant_He_6.set( GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); - GT_ModHandler.addCraftingRecipe( - ItemList.Reactor_Coolant_He_6.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PCP", - "PDP", - "PCP", - 'C', - ItemList.Reactor_Coolant_He_3, - 'P', - OrePrefixes.plate.get(Materials.Tin), - 'D', - OrePrefixes.plateDense.get(Materials.Copper) - }); - ItemList.Reactor_Coolant_NaK_1.set( GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); - GT_ModHandler.addCraftingRecipe( - ItemList.Reactor_Coolant_NaK_1.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "TST", - "PCP", - "TST", - 'C', - GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), - 'T', - OrePrefixes.plate.get(Materials.Tin), - 'S', - OrePrefixes.dust.get(Materials.Sodium), - 'P', - OrePrefixes.dust.get(Materials.Potassium) - }); - ItemList.Reactor_Coolant_NaK_3.set( GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); - GT_ModHandler.addCraftingRecipe( - ItemList.Reactor_Coolant_NaK_3.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PCP", "PCP", "PCP", 'C', ItemList.Reactor_Coolant_NaK_1, 'P', OrePrefixes.plate.get(Materials.Tin) - }); - ItemList.Reactor_Coolant_NaK_6.set( GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); - GT_ModHandler.addCraftingRecipe( - ItemList.Reactor_Coolant_NaK_6.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - "PCP", - "PDP", - "PCP", - 'C', - ItemList.Reactor_Coolant_NaK_3, - 'P', - OrePrefixes.plate.get(Materials.Tin), - 'D', - OrePrefixes.plateDense.get(Materials.Copper) - }); ItemList.Reactor_Coolant_Sp_1.set( GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); @@ -1408,6 +1334,16 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { Materials.FierySteel.getFluid(250L), ItemList.TF_Vial_FieryBlood.get(1L, new Object[0]), ItemList.Bottle_Empty.get(1L, new Object[0]))); + + GT_Mod.gregtechproxy.addFluid( + "liquid_sodium", + "Liquid Sodium", + Materials.Sodium, + 1, + 495, + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L), + ItemList.Cell_Empty.get(1L, new Object[0]), + 1000); } FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( |