From 672eefc229b38f5649b8b75f53bfae89e8fe6991 Mon Sep 17 00:00:00 2001 From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Date: Sun, 23 Oct 2022 01:53:31 +0800 Subject: ore line for some useless ore (#1210) * oreline * ilmenite * update BS+SA * Revert "update BS+SA" This reverts commit 00c0d26b5d4963a42c7cd6721cc9444fac8fd2c2. * add missing import * garnet * Spotless apply for branch ore for #1210 (#1481) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz Co-authored-by: Maxim Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * green vitriol recipe Co-authored-by: Martin Robertz Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim --- .../loaders/postload/GT_MachineRecipeLoader.java | 66 ++++++++++++++++++++-- 1 file changed, 62 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 6b92ec5bb0..c747f50b72 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -13,6 +13,7 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; import gregtech.common.GT_DummyWorld; import gregtech.common.items.GT_MetaGenerated_Item_03; +import gregtech.loaders.postload.chains.GT_BauxiteRefineChain; import ic2.api.recipe.ILiquidHeatExchangerManager; import ic2.api.recipe.Recipes; import java.util.Arrays; @@ -3395,7 +3396,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 1), GT_Utility.getIntegratedCircuit(1), - Materials.NitricAcid.getFluid(1000L), + Materials.SulfuricAcid.getFluid(1000L), new FluidStack(ItemList.sNickelSulfate, 2000), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1), 50, @@ -3403,7 +3404,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), GT_Utility.getIntegratedCircuit(1), - Materials.NitricAcid.getFluid(1000L), + Materials.SulfuricAcid.getFluid(1000L), new FluidStack(ItemList.sBlueVitriol, 2000), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1), 50, @@ -3413,7 +3414,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(9), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9) }, - new FluidStack[] {Materials.NitricAcid.getFluid(9000L)}, + new FluidStack[] {Materials.SulfuricAcid.getFluid(9000L)}, new FluidStack[] {new FluidStack(ItemList.sNickelSulfate, 18000)}, new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)}, 25, @@ -3423,7 +3424,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Utility.getIntegratedCircuit(9), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9) }, - new FluidStack[] {Materials.NitricAcid.getFluid(9000L)}, + new FluidStack[] {Materials.SulfuricAcid.getFluid(9000L)}, new FluidStack[] {new FluidStack(ItemList.sBlueVitriol, 18000)}, new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)}, 25, @@ -3457,6 +3458,20 @@ public class GT_MachineRecipeLoader implements Runnable { null, 900, 30); + GT_Values.RA.addElectrolyzerRecipe( + ItemList.Cell_Empty.get(1), + null, + new FluidStack(ItemList.sGreenVitriol, 2000), + Materials.SulfuricAcid.getFluid(1000), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + null, + 900, + 30); GT_Values.RA.addCentrifugeRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 9), null, @@ -8405,6 +8420,49 @@ public class GT_MachineRecipeLoader implements Runnable { } API.hideItem(new ItemStack(GT_MetaGenerated_Item_03.INSTANCE, 1, g)); } + + GT_Values.RA.addCentrifugeRecipe( + GT_Values.NI, + GT_Values.NI, + MaterialsOreAlum.SluiceJuice.getFluid(1000), + Materials.Water.getFluid(500), + Materials.Stone.getDust(1), + Materials.Iron.getDust(1), + Materials.Copper.getDust(1), + Materials.Tin.getDust(1), + Materials.Nickel.getDust(1), + Materials.Antimony.getDust(1), + new int[] {10000, 4000, 2000, 2000, 2000, 2000}, + 40, + 120); + GT_Values.RA.addElectromagneticSeparatorRecipe( + MaterialsOreAlum.SluiceSand.getDust(1), + Materials.Iron.getDust(1), + Materials.Neodymium.getDust(1), + Materials.Chrome.getDust(1), + new int[] {4000, 2000, 2000}, + 200, + 240); + GT_Values.RA.addMixerRecipe( + MaterialsOreAlum.SluiceSand.getDust(1), + GT_Values.NI, + GT_Values.NI, + GT_Values.NI, + Materials.Water.getFluid(500), + MaterialsOreAlum.SluiceJuice.getFluid(1000), + GT_Values.NI, + 100, + 16); + GT_Values.RA.addDistilleryRecipe( + 1, + MaterialsOreAlum.SluiceJuice.getFluid(1000), + Materials.Water.getFluid(500), + MaterialsOreAlum.SluiceSand.getDust(1), + 100, + 16, + false); + + GT_BauxiteRefineChain.run(); } public void run2() { -- cgit