From 567816d8c4e638d5a7a9ada607e1ec815aca10c4 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Thu, 14 Sep 2023 22:57:46 -0400 Subject: [PATCH] bunch more work on aluminium processing, should be finished --- AntimatterAPI | 2 +- .../gregtech/data/GregTechMaterialEvents.java | 37 ++++++++++------ .../muramasa/gregtech/data/Materials.java | 7 ++- .../machines/ChemicalReactorLoader.java | 43 +++++++++++++------ .../loader/machines/ElectrolyzerLoader.java | 13 ++++++ .../gregtech/loader/multi/Blasting.java | 3 -- 6 files changed, 74 insertions(+), 31 deletions(-) diff --git a/AntimatterAPI b/AntimatterAPI index b6724f75d..636783dcb 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit b6724f75d56239d7c4b2375df6d3fe246f2c8015 +Subproject commit 636783dcba88e3e43d052497152c76cb0910eb7d diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java index 3a08776ad..088d9520f 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java @@ -41,7 +41,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ event.setMaterial(Neon).asPlasma(); event.setMaterial(Sodium).asDust(370); event.setMaterial(Magnesium).asMetal(1383, 0/*1383*/); - event.setMaterial(Aluminium).asMetal(933, 1700, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, FOIL); + event.setMaterial(Aluminium).asMetal(933, 0, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, FOIL); event.setMaterial(Silicon).asMetal(1683, 1683, PLATE, FOIL); event.setMaterial(Phosphor).asDust(933); event.setMaterial(Sulfur).asDust(388).asOre().harvestLevel(2).asPlasma(); @@ -219,6 +219,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ event.setMaterial(BlueSchist).asDust(ROCK); event.setMaterial(BorosilicateGlass).asDust(); event.setMaterial(Brick).asDust(); + event.setMaterial(CalciumSulfate).asDust(); event.setMaterial(CobaltOxide).asDust(); event.setMaterial(Concrete).asDust(300); event.setMaterial(DialuminiumTrioxide).asDust(); @@ -226,6 +227,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ event.setMaterial(FerriteMixture).asDust(); event.setMaterial(Ferrosilite).asDust(); event.setMaterial(Fireclay).asDust(); + event.setMaterial(Fluorite).asDust(); event.setMaterial(GreenSchist).asDust(ROCK); event.setMaterial(IndiumGalliumPhosphide).asDust(); event.setMaterial(IridiumSodiumOxide).asDust(); @@ -433,19 +435,23 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ /** * Inorganic **/ + event.setMaterial(AluminiumFluoride).asFluid(0,1560).flags(MOLTEN, ACID); event.setMaterial(Antimatter).asFluid(); event.setMaterial(BlueVitriol).asFluid(); event.setMaterial(CalciumAcetateSolution).asFluid(); event.setMaterial(Coolant).asFluid(); + event.setMaterial(Cryolite).asFluid(0, 1285).flags(MOLTEN, ACID); event.setMaterial(DistilledWater).asFluid(); - event.setMaterial(DilutedHydrochloricAcid).asFluid(); - event.setMaterial(DilutedSulfuricAcid).asFluid(); + event.setMaterial(DilutedHydrochloricAcid).asFluid().flags(ACID); + event.setMaterial(DilutedSulfuricAcid).asFluid().flags(ACID); event.setMaterial(DrillingFluid).asFluid(); // TODO: Perhaps for a bedrock drill; + event.setMaterial(HexafluorosilicicAcid).asFluid().flags(ACID); event.setMaterial(HotCoolant).asFluid(0,500); - event.setMaterial(HydrochloricAcid).asFluid(); - event.setMaterial(HydrofluoricAcid).asFluid(); + event.setMaterial(HydrochloricAcid).asFluid().flags(ACID); + event.setMaterial(HydrofluoricAcid).asFluid().flags(ACID); + event.setMaterial(HydrogenFluoride).asGas().flags(ACID); event.setMaterial(HydrogenPeroxide).asFluid(); - event.setMaterial(HypochlorousAcid).asFluid(); + event.setMaterial(HypochlorousAcid).asFluid().flags(ACID); event.setMaterial(IndiumConcentrate).asFluid(); event.setMaterial(LeadZincSolution).asFluid(); @@ -453,16 +459,16 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ event.setMaterial(Lubricant).asFluid(); event.setMaterial(NickelSulfate).asFluid(); event.setMaterial(NitrationMixture).asFluid(); - event.setMaterial(NitricAcid).asFluid(); - event.setMaterial(PeroxydisulfuricAcid).asFluid(); - event.setMaterial(PhosphoricAcid).asFluid(); + event.setMaterial(NitricAcid).asFluid().flags(ACID); + event.setMaterial(PeroxydisulfuricAcid).asFluid().flags(ACID); + event.setMaterial(PhosphoricAcid).asFluid().flags(ACID); event.setMaterial(SaltWater).asFluid(); event.setMaterial(SodiumPersulfate).asFluid(); event.setMaterial(SodiumBicarbonateSolution).asFluid(); event.setMaterial(SodiumCarbonateSolution).asFluid(); event.setMaterial(Steam).asGas(1, 395); event.setMaterial(SuperheatedSteam).asGas(2, 600); - event.setMaterial(SulfuricAcid).asFluid(); + event.setMaterial(SulfuricAcid).asFluid().flags(ACID); event.setMaterial(SulfurTrioxide).asGas(); event.setMaterial(SulfurDioxide).asGas(); event.setMaterial(Titaniumtetrachloride).asFluid(); @@ -508,7 +514,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ * Inorganic **/ event.setMaterial(Air).asGas(); - event.setMaterial(Ammonia).asGas(); + event.setMaterial(Ammonia).asGas().flags(ACID); event.setMaterial(DinitrogenTetroxide).asGas(); event.setMaterial(HydrogenSulfide).asGas(); event.setMaterial(NitricOxide).asGas(); @@ -639,6 +645,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(BlackGranite).mats(of(SiliconDioxide, 4, Biotite, 1)); event.setMaterial(BorosilicateGlass).mats(of(Boron, 1, Silicon, 7, Oxygen,14)); event.setMaterial(Brick).mats(of(Aluminium, 4, Silicon, 3, Oxygen, 12)); + event.setMaterial(CalciumSulfate).mats(of(Calcium, 1, SiliconDioxide, 1, Oxygen, 2)).elecTicks(1460); event.setMaterial(CobaltOxide).mats(of(Cobalt, 1, Oxygen, 1)).elecTicks(68); event.setMaterial(Concrete).mats(of(Stone, 1)).asFluid(); event.setMaterial(DialuminiumTrioxide).mats(of(Aluminium,2,Oxygen,3)); @@ -646,6 +653,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(FerriteMixture).mats(of(Nickel, 1, Zinc, 1, Iron, 4)); event.setMaterial(Ferrosilite).mats(of(Iron, 1, Silicon, 1, Oxygen, 3)).elecTicks(120); event.setMaterial(Fireclay).mats(of(Brick, 1)); + event.setMaterial(Fluorite).mats(of(Calcium, 1, Fluorine, 2)); event.setMaterial(IndiumGalliumPhosphide).mats(of(Indium, 1, Gallium, 1, Phosphor, 1)); event.setMaterial(IridiumSodiumOxide).mats(of(Iridium,1,Sodium,1,Oxygen,2)); event.setMaterial(Komatiite).mats(of(Olivine, 1, /* MgCO3, 2, */Flint, 6, DarkAsh, 3)); @@ -841,6 +849,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(DilutedSulfuricAcid).mats(of(Hydrogen,2,Sulfur,1,Oxygen,4)); event.setMaterial(HydrochloricAcid).mats(of(Hydrogen, 1, Chlorine, 1)).elecTicks(720); event.setMaterial(HydrofluoricAcid).mats(of(Hydrogen, 1, Fluorine, 1)).elecTicks(80); + event.setMaterial(HydrogenFluoride).mats(of(Hydrogen, 1, Fluorine, 1)).elecTicks(80); event.setMaterial(HydrogenPeroxide).mats(of(Hydrogen,2,Oxygen,2)); event.setMaterial(HypochlorousAcid).mats(of(Hydrogen, 1, Chlorine, 1, Oxygen, 1)).elecTicks(192); @@ -1462,17 +1471,17 @@ private static void flags(GregTechMaterialEvent event){ Fermium260,Mendelevium259,Mendelevium260 );*/ ELEC30.add(Charcoal, Opal, Coal, Lignite, Magnesia, SteelMagnetic, IronMagnetic, Quicklime, Quartzite, - SiliconDioxide, CobaltOxide, Garnierite, CupricOxide, RockSalt, /*Zincite,*/Pyrolusite, /*ChromiumDioxide,*/ + SiliconDioxide, CalciumSulfate, CobaltOxide, Garnierite, CupricOxide, RockSalt, /*Zincite,*/Pyrolusite, /*ChromiumDioxide,*/ Phosphate, Potash, /*NiobiumNitride,*/ GreenSapphire, Sapphire, NeodymiumMagnetic, Cassiterite, PhosphorousPentoxide, BandedIron, Massicot, ArsenicTrioxide, Sugar, Magnetite, AntimonyTrioxide, Salt, SodiumBisulfate, HydrochloricAcid, SaltWater, HydrochloricAcid, Diamond, BlueVitriol, NickelSulfate, Water, DistilledWater, MilkyQuartz); ELEC60.add(SodiumHydroxide, Propene, Ethylene, Butene, Benzene, Styrene, Ethane, Ammonia, SodiumSulfide, Methane, - Magnesite, HydrofluoricAcid, Sphalerite, /*NitroCarbon,*/ SodaAsh, Calcite, Saltpeter, Monazite, + Magnesite, HydrofluoricAcid, HydrogenFluoride, Sphalerite, /*NitroCarbon,*/ SodaAsh, Calcite, Saltpeter, Monazite, /*Wollastonite,*/ NitricOxide, Butane, CarbonMonoxide, Pyrite, RedGranite, Ferrosilite, Butadiene, Amethyst, Molybdenite, Ruby, /*Kyanite,*/ NitrogenDioxide, NitrousOxide, DinitrogenTetroxide, Propane, Barite, Isoprene, Chromite, EnderPearl, SiliconDioxide, Apatite, SulfurTrioxide, /*Pyrochlore, */ Toluene, Phosphate, - Tantalite, PhosphorousPentoxide, Osmiridium, Pentlandite, Steel, Graphite, Alumina); + Tantalite, PhosphorousPentoxide, Osmiridium, Pentlandite, Steel, Graphite); ELEC90.add(Polydimethylsiloxane, AceticAcid, Olivine, Ethanol, Methanol, VinylAcetate, /*Gypsum,*/ Cobaltite, Ethenone, /*Dymethylamine,*/ Chalcopyrite, /*Mirabilite,*/ Spodumene, /*Dolomite,*/ HypochlorousAcid, Chloramine, Bastnasite, Chloromethane, Malachite, /*Borax, */ /*Kaolinite,*/ Obsidian, NitricAcid, VinylChloride, Acetone, /*Asbestos,*/ PotassiumFeldspar, diff --git a/common/src/main/java/muramasa/gregtech/data/Materials.java b/common/src/main/java/muramasa/gregtech/data/Materials.java index 9203ce602..bd15853b0 100644 --- a/common/src/main/java/muramasa/gregtech/data/Materials.java +++ b/common/src/main/java/muramasa/gregtech/data/Materials.java @@ -347,7 +347,7 @@ public class Materials { public static Material BorosilicateGlass = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "borosilicate_glass", 0xfafafa, NONE)); public static Material Brick = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "brick", 0x9b5643, ROUGH)); public static Material Calcite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcite", 0xfae6dc, DULL)); - public static Material CalciumOxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_oxide", 0xfae6dc, DULL)); + public static Material CalciumSulfate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_sulfate", 0xf0dcd2, DULL)); public static Material Clay = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "clay", 0xc8c8dc, ROUGH)); public static Material CobaltOxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "cobalt_oxide", 0x668000, DULL)); public static Material Concrete = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "concrete", 0x646464, ROUGH)); @@ -361,6 +361,7 @@ public class Materials { public static Material FerriteMixture = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ferrite_mixture", 0xb4b4b4, METALLIC)); public static Material Ferrosilite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ferrosilite", 0x97632a, DULL)); public static Material Fireclay = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "fireclay", 0xada09b, ROUGH)); + public static Material Fluorite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "fluorite", 0xFFB98C, NONE)); public static Material GelledToluene = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "gelled_toluene", 0xeeeeee, NONE)); public static Material Graphene = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "graphene", 0x808080, DULL)); public static Material IndiumGalliumPhosphide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "indium_gallium_phosphide", 0x570b79, NONE)); @@ -582,18 +583,22 @@ public class Materials { ** Inorganic **/ + public static Material AluminiumFluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aluminium_fluoride", 0xc8bebe, NONE)); public static Material Antimatter = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "anti_matter", 0x8000c4, NONE)); public static Material BlueVitriol = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "blue_vitriol_water_solution", 0x4242DE, NONE)); public static Material CalciumAcetateSolution = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "calcium_acetate_solution", 0xDCC8B4, NONE)); public static Material Coolant = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "coolant", 0x0506be, NONE)); + public static Material Cryolite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "cryolite", 0xc8bebe, NONE)); public static Material DilutedHydrochloricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "diluted_hydrochloric_acid", 0x99a7a3, NONE)); public static Material DilutedSulfuricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "diluted_sulfuric_acid", 0xc07820, NONE)); public static Material DistilledWater = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "distilled_water", 0x5C5CFF, NONE)); public static Material DrillingFluid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "drilling_fluid", 0xffffff, NONE)); // TODO: Perhaps for a bedrock drill; + public static Material HexafluorosilicicAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hexafluorosilicic_acid", 0xbec8be, NONE)); public static Material HotCoolant = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hot_coolant", 0x7a111a, NONE)); public static Material HydrochloricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrochloric_acid", 0x6f8a91, NONE)); public static Material HydrofluoricAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrofluoric_acid", 0x0088aa, NONE)); + public static Material HydrogenFluoride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrogen_fluoride", 0x00f0f0, NONE)); public static Material HydrogenPeroxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hydrogen_peroxide", 0xf8efb4, NONE)); public static Material HypochlorousAcid = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "hypochlorous_acid", 0x6f8a91, NONE)); public static Material IndiumConcentrate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "indium_concentrate", 0xffffff, NONE)); diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java index 137103ccb..d11687785 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java @@ -1,6 +1,8 @@ package muramasa.gregtech.loader.machines; +import muramasa.antimatter.AntimatterAPI; +import muramasa.antimatter.Ref; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.gregtech.GregTechConfig; @@ -13,6 +15,7 @@ import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; import static muramasa.gregtech.data.Materials.*; import static muramasa.gregtech.data.RecipeMaps.CHEMICAL_REACTING; +import static muramasa.gregtech.data.RecipeMaps.MIXING; import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS; public class ChemicalReactorLoader { @@ -205,13 +208,29 @@ private static void addShared(){ CHEMICAL_REACTING.RB().fi(Oxygen.getGas(1000), SulfurDioxide.getGas(3000)).fo(SulfurTrioxide.getGas(4000)).add("sulfur_trioxide", 200, 30); CHEMICAL_REACTING.RB().fi(Oxygen.getGas(2000)).ii(DUST.getMaterialIngredient(Sulfur, 1)).fo(SulfurDioxide.getGas(3000)).add("sulfur_dioxide", 60, 8); CHEMICAL_REACTING.RB().fi(Oxygen.getGas(1000), HydrogenSulfide.getGas(1000)).fo(SulfurDioxide.getGas(1000), Water.getLiquid(1000)).add("sulfur_dioxide_1", 40, 30); + //Alumina chain + CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Fluorite, 3)).fo(HydrogenFluoride.getGas(4000)).io(DUST.get(CalciumSulfate, 6)).add("hydrogen_fluoride", 160, 16); + CHEMICAL_REACTING.RB().fi(Fluorine.getGas(1000), Hydrogen.getGas(1000)).fo(HydrogenFluoride.getGas(2000)).add("hydrogen_fluoride_1", 16, 16); + CHEMICAL_REACTING.RB().fi(Fluorine.getGas(2000)).ii(DUST.getMaterialIngredient(Calcium, 1)).io(DUST.get(Fluorite, 3)).add("fluorite", 48, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(SiliconDioxide, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid", 80, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(Quartzite, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid_1", 80, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(Quartz, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid_2", 80, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(Flint, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid_3", 80, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(Glass, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid_4", 80, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(MilkyQuartz, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid_5", 80, 16); + if (AntimatterAPI.isModLoaded(Ref.MOD_AE)){ + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(4000)).ii(DUST.getMaterialIngredient(CertusQuartz, 1)).fo(Water.getLiquid(2000), HexafluorosilicicAcid.getLiquid(3000)).add("hexafluorosilicic_acid_6", 80, 16); + } + CHEMICAL_REACTING.RB().fi(HexafluorosilicicAcid.getLiquid(9000)).ii(DUST.getMaterialIngredient(Alumina, 5)).io(DUST.get(SiliconDioxide, 3)).fo(AluminiumFluoride.getLiquid(L * 8), Water.getLiquid(3000)).add("aluminium_fluoride", 224, 16); + CHEMICAL_REACTING.RB().fi(Fluorine.getGas(3000)).ii(DUST.getMaterialIngredient(Aluminium, 1)).fo(AluminiumFluoride.getLiquid(L * 4)).add("aluminium_fluoride_pure", 64, 16); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(24000)).ii(DUST.getMaterialIngredient(SodiumHydroxide, 18), DUST.getMaterialIngredient(Alumina, 5)).fo(Cryolite.getLiquid(L * 20), Water.getLiquid(27000)).add("cryolite", 752, 16); } private static void addComplicated(){ //ACETONE - CHEMICAL_REACTING.RB().ii(DUST_SMALL.getMaterialIngredient(Calcite, 5)).fi(AceticAcid.getLiquid(8000)).fo(Acetone.getLiquid(5000), CarbonDioxide.getLiquid(3000)).add("acetone", 400, 480); - CHEMICAL_REACTING.RB().ii(DUST_SMALL.getMaterialIngredient(Quicklime, 5)).fi(AceticAcid.getLiquid(8000)).fo(Acetone.getLiquid(5000), CarbonDioxide.getLiquid(3000)).add("acetone_1", 400, 480); + CHEMICAL_REACTING.RB().ii(DUST_SMALL.getMaterialIngredient(Calcite, 5)).fi(AceticAcid.getLiquid(8000)).fo(Acetone.getLiquid(5000), CarbonDioxide.getGas(3000)).add("acetone", 400, 480); + CHEMICAL_REACTING.RB().ii(DUST_SMALL.getMaterialIngredient(Quicklime, 5)).fi(AceticAcid.getLiquid(8000)).fo(Acetone.getLiquid(5000), CarbonDioxide.getGas(3000)).add("acetone_1", 400, 480); //METHYL ACETATE CHEMICAL_REACTING.RB().fi(Methanol.getLiquid(6000), AceticAcid.getLiquid(8000)).fo(MethylAcetate.getLiquid(11000), Water.getLiquid(3000)).add("methyl_acetate", 240, 30); //VINYL ACETATE @@ -223,7 +242,7 @@ private static void addComplicated(){ //SODIUM BISULFATE CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Salt, 2)).io(DUST.get(SodiumBisulfate, 7)).fo(HydrochloricAcid.getLiquid(2000)).add("sodium_bisulfate", 60, 30); //VINYL CHLORIDE - CHEMICAL_REACTING.RB().fi(Chlorine.getGas(1000), Ethylene.getGas(3000)).fo(HydrochloricAcid.getLiquid(1000), VinylChloride.getLiquid(3000)).add("vinyl_chloride3", 80, 30); + CHEMICAL_REACTING.RB().fi(Chlorine.getGas(1000), Ethylene.getGas(3000)).fo(HydrochloricAcid.getLiquid(1000), VinylChloride.getGas(3000)).add("vinyl_chloride3", 80, 30); //CHLOROBENZENE CHEMICAL_REACTING.RB().fi(Chlorine.getGas(2000), Benzene.getLiquid(6000)).ii(INT_CIRCUITS.get(4)).fo(HydrochloricAcid.getLiquid(1000), Chlorobenzene.getLiquid(6000)).add("chlorobenzene", 120, 30); //HYPOCHLOROUS ACID @@ -238,12 +257,12 @@ private static void addComplicated(){ CHEMICAL_REACTING.RB().fi(Water.getLiquid(4000), Oxygen.getGas(2500)).ii(DUST.getMaterialIngredient(Phosphorus, 1)).fo(PhosphoricAcid.getLiquid(8000)).add("phosphoric_acid_1", 320, 30); //CHEMICAL_REACTING.RB().fi(Water.getLiquid(10000), SulfuricAcid.getLiquid(35000)).ii(DUST.getMaterialIngredient(Apatite, 21)).fo(PhosphoricAcid.getLiquid(24000), HydrochloricAcid.getLiquid(2000)).io(DUST.get(Gypsum, 40)).add("phosphoric_acid_2", 320, 30); //CUMENE - CHEMICAL_REACTING.RB().fi(Benzene.getLiquid(8000), Propene.getGas(6000), PhosphoricAcid.getGas(1000)).fo(Cumene.getLiquid(14000)).add("cumene", 360, 30); + CHEMICAL_REACTING.RB().fi(Benzene.getLiquid(8000), Propene.getGas(6000), PhosphoricAcid.getLiquid(1000)).fo(Cumene.getLiquid(14000)).add("cumene", 360, 30); //PHENOL CHEMICAL_REACTING.RB().fi(Oxygen.getGas(2000), Cumene.getLiquid(11000)).fo(Phenol.getLiquid(6000), Acetone.getLiquid(6000)).add("phenol", 160, 30); CHEMICAL_REACTING.RB().fi(Water.getLiquid(3000), Chlorine.getGas(2000), Benzene.getLiquid(12000)).fo(Phenol.getLiquid(13000), HydrochloricAcid.getLiquid(2000), DilutedHydrochloricAcid.getLiquid(2000)).add("phenol_1", 560, 30); CHEMICAL_REACTING.RB().fi(Chlorobenzene.getLiquid(12000), Water.getLiquid(3000)).fo(Phenol.getLiquid(13000), DilutedHydrochloricAcid.getLiquid(2000)).add("phenol_2", 240, 30); - CHEMICAL_REACTING.RB().fi(Oxygen.getGas(2000), PhosphoricAcid.getLiquid(1000), Benzene.getLiquid(12000), Propene.getLiquid(9000)).fo(Phenol.getLiquid(13000), Acetone.getLiquid(10000)).add("phenol_3", 480, 30); + CHEMICAL_REACTING.RB().fi(Oxygen.getGas(2000), PhosphoricAcid.getLiquid(1000), Benzene.getLiquid(12000), Propene.getGas(9000)).fo(Phenol.getLiquid(13000), Acetone.getLiquid(10000)).add("phenol_3", 480, 30); CHEMICAL_REACTING.RB().fi(Chlorine.getGas(2000), Benzene.getLiquid(12000)).ii(DUST.getMaterialIngredient(SodiumHydroxide, 1)).fo(Phenol.getLiquid(13000), HydrochloricAcid.getLiquid(2000)).add("phenol_4", 560, 30); CHEMICAL_REACTING.RB().fi(Chlorobenzene.getLiquid(4000)).ii(DUST.getMaterialIngredient(SodiumHydroxide, 1)).fo(Phenol.getLiquid(4000)).add("phenol_5", 960, 30); //BISPHENOL A @@ -251,11 +270,11 @@ private static void addComplicated(){ //EPOXY RESIN CHEMICAL_REACTING.RB().fi(BisphenolA.getLiquid(12000), Epichlorohydrin.getLiquid(4000)).ii(DUST.getMaterialIngredient(SodiumHydroxide, 1)).fo(EpoxyResin.getLiquid(16000), SaltWater.getLiquid(1000)).add("epoxy_resin", 200, 30); //CHLOROMETHANE - CHEMICAL_REACTING.RB().fi(Chlorine.getGas(2000), Methane.getGas(5000)).ii(INT_CIRCUITS.get(1)).fo(Chloromethane.getGas(5000), HydrochloricAcid.getGas(2000)).add("chloromethane", 80, 30); - CHEMICAL_REACTING.RB().fi(Methanol.getLiquid(6000), HydrochloricAcid.getLiquid(2000)).fo(Chloromethane.getLiquid(5000), Water.getLiquid(3000)).add("chloromethane_1",160, 30); + CHEMICAL_REACTING.RB().fi(Chlorine.getGas(2000), Methane.getGas(5000)).ii(INT_CIRCUITS.get(1)).fo(Chloromethane.getGas(5000), HydrochloricAcid.getLiquid(2000)).add("chloromethane", 80, 30); + CHEMICAL_REACTING.RB().fi(Methanol.getLiquid(6000), HydrochloricAcid.getLiquid(2000)).fo(Chloromethane.getGas(5000), Water.getLiquid(3000)).add("chloromethane_1",160, 30); //ALLYL CHLORIDE CHEMICAL_REACTING.RB().fi(Propene.getGas(9000), Chlorine.getGas(2000)).fo(AllylChloride.getLiquid(9000), HydrochloricAcid.getLiquid(2000)).add("hydrochloric_acid_5", 160, 30); - CHEMICAL_REACTING.RB().fi(Fluorine.getGas(1000), Hydrogen.getGas(1000)).fo(HydrofluoricAcid.getLiquid(2000)).add("hydrofluoric_acid", 60, 8); + CHEMICAL_REACTING.RB().fi(HydrogenFluoride.getGas(1000), Water.getLiquid(1000)).fo(HydrofluoricAcid.getLiquid(2000)).add("hydrofluoric_acid", 60, 8); //TETRAFLUORETHYLENE CHEMICAL_REACTING.RB().fi(Chloroform.getLiquid(5000), HydrofluoricAcid.getLiquid(4000)).fo(Tetrafluoroethylene.getGas(3000), DilutedHydrochloricAcid.getLiquid(6000)).add("tetrafluoroethylene", 480, 240); CHEMICAL_REACTING.RB().fi(Chlorine.getGas(6000), Methane.getGas(5000), HydrofluoricAcid.getLiquid(4000)).fo(Tetrafluoroethylene.getGas(6000), HydrochloricAcid.getLiquid(6000), DilutedHydrochloricAcid.getLiquid(6000)).add("tetrafluoroethylene_1", 540, 240); @@ -265,7 +284,7 @@ private static void addComplicated(){ CHEMICAL_REACTING.RB().fi(Ammonia.getGas(2000), Methanol.getLiquid(6000)).fo(Dimethylamine.getGas(5000), Water.getLiquid(3000)).add("dimethylamine", 240, 120); CHEMICAL_REACTING.RB().fi(Ammonia.getGas(4000), HypochlorousAcid.getLiquid(3000)).fo(Chloramine.getLiquid(4000), Water.getLiquid(3000)).add("chloramine", 160, 30); CHEMICAL_REACTING.RB().fi(Dimethylamine.getGas(5000), Chloramine.getLiquid(2000)).fo(Dimethylhydrazine.getLiquid(6000), DilutedHydrochloricAcid.getLiquid(1000)).add("dimethylhydrazine", 960, 480); - CHEMICAL_REACTING.RB().fi(Methanol.getGas(12000), Ammonia.getGas(8000), HypochlorousAcid.getLiquid(3000)).fo(Dimethylhydrazine.getLiquid(12000), DilutedHydrochloricAcid.getLiquid(2000), Water.getLiquid(9000)).add("dimethylhydrazine_2", 1040, 480); + CHEMICAL_REACTING.RB().fi(Methanol.getLiquid(12000), Ammonia.getGas(8000), HypochlorousAcid.getLiquid(3000)).fo(Dimethylhydrazine.getLiquid(12000), DilutedHydrochloricAcid.getLiquid(2000), Water.getLiquid(9000)).add("dimethylhydrazine_2", 1040, 480); CHEMICAL_REACTING.RB().fi(NitrogenDioxide.getGas(1000)).ii(INT_CIRCUITS.get(2)).fo(DinitrogenTetroxide.getGas(1000)).add("dinitrogen_tetroxide", 640, 30); CHEMICAL_REACTING.RB().fi(Oxygen.getGas(7000), Ammonia.getGas(8000)).fo(DinitrogenTetroxide.getGas(6000), Water.getLiquid(9000)).add("dinitrogen_tetroxide_1", 480, 30); CHEMICAL_REACTING.RB().fi(Oxygen.getGas(7000), Hydrogen.getGas(6000), Nitrogen.getGas(2000)).fo(DinitrogenTetroxide.getGas(6000), Water.getLiquid(9000)).add("dinitrogen_tetroxide_2", 1100, 480); @@ -275,12 +294,12 @@ private static void addComplicated(){ CHEMICAL_REACTING.RB().fi(NitrogenDioxide.getGas(6000), Water.getLiquid(3000), Oxygen.getGas(1000)).fo(NitricAcid.getLiquid(10000)).add("nitric_acid_2", 240, 30); CHEMICAL_REACTING.RB().fi(Ethylene.getGas(3000), Chlorine.getGas(1000)).fo(VinylChloride.getGas(3000), HydrochloricAcid.getLiquid(1000)).add("vinyl_chloride", 80, 30); CHEMICAL_REACTING.RB().fi(Ethylene.getGas(6000), Oxygen.getGas(1000), HydrochloricAcid.getLiquid(4000)).fo(VinylChloride.getGas(6000)).add("vinyl_chloride_1", 80, 30); - CHEMICAL_REACTING.RB().fi(AceticAcid.getLiquid(8000), SulfuricAcid.getLiquid(7000)).fo(DilutedSulfuricAcid.getLiquid(10000), Ethenone.getLiquid(5000)).add("diluted_sulfuric_acid", 160, 120); + CHEMICAL_REACTING.RB().fi(AceticAcid.getLiquid(8000), SulfuricAcid.getLiquid(7000)).fo(DilutedSulfuricAcid.getLiquid(10000), Ethenone.getGas(5000)).add("diluted_sulfuric_acid", 160, 120); CHEMICAL_REACTING.RB().fi(NitricAcid.getLiquid(8000), Ethenone.getGas(1000)).fo(Tetranitromethane.getLiquid(9000)).add("tetranitromethane", 480, 16); CHEMICAL_REACTING.RB().fi(Chlorine.getGas(1000), Benzene.getLiquid(3000)).fo(Dichlorobenzene.getLiquid(3000), HydrochloricAcid.getLiquid(1000)).add("dichlorobenzene", 240, 30); CHEMICAL_REACTING.RB().fi(Dichlorobenzene.getLiquid(1000), Oxygen.getGas(8000)).ii(DUST.getMaterialIngredient(SodiumSulfide, 1)).fo(PolyphenyleneSulfide.getLiquid(1000)).io(DUST.get(Salt)).add("polyphenol_sulfide", 240, 360); - CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Salt, 2)).io(DUST.get(SodiumBisulfate, 7)).fo(HydrochloricAcid.getLiquid(2000)).add("sodium_bisulfate", 60, 30); - CHEMICAL_REACTING.RB().fi(Chlorine.getGas(1000), Benzene.getLiquid(6000)).fo(HydrochloricAcid.getLiquid(1000), Chlorobenzene.getLiquid(6000)).add("chlorobenzene", 240, 30); + CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Salt, 2)).io(DUST.get(SodiumBisulfate, 7)).fo(HydrochloricAcid.getLiquid(2000)).add("sodium_bisulfate_1", 60, 30); + CHEMICAL_REACTING.RB().fi(Chlorine.getGas(1000), Benzene.getLiquid(6000)).fo(HydrochloricAcid.getLiquid(1000), Chlorobenzene.getLiquid(6000)).add("chlorobenzene_1", 240, 30); } private static void addPolymerRecipe(Material in, Material out){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java index b7ac9408a..cad5abd18 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java @@ -12,8 +12,12 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import static muramasa.antimatter.Ref.L; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; +import static muramasa.antimatter.data.AntimatterMaterials.Charcoal; +import static muramasa.antimatter.data.AntimatterMaterials.Coal; import static muramasa.gregtech.data.GregTechMaterialTags.*; +import static muramasa.gregtech.data.Materials.*; import static muramasa.gregtech.data.RecipeMaps.ELECTROLYZING; public class ElectrolyzerLoader { @@ -40,6 +44,15 @@ public static void init() { }); ELECTROLYZING.RB().ii(RecipeIngredient.of(ItemTags.SAND, 8)).io(DUST.get(Materials.SiliconDioxide)).add("sand_to_silicon_dioxide", 500, 25); ELECTROLYZING.RB().ii(RecipeIngredient.of(Items.BONE_MEAL, 3)).io(DUST.get(Materials.Calcium)).add("bone_meal", 98, 26); + ELECTROLYZING.RB().ii(DUST.getMaterialIngredient(Carbon, 3), DUST.getMaterialIngredient(Alumina, 10)) + .fi(AluminiumFluoride.getLiquid(L / 36), Cryolite.getLiquid(L / 72)).io(DUST.get(Aluminium, 4)) + .fo(CarbonDioxide.getGas(2000), Fluorine.getGas(1000)).add("alumina_carbon", 2040, 16); + ELECTROLYZING.RB().ii(DUST.getMaterialIngredient(Charcoal, 3), DUST.getMaterialIngredient(Alumina, 10)) + .fi(AluminiumFluoride.getLiquid(L / 36), Cryolite.getLiquid(L / 72)).io(DUST.get(Aluminium, 4)) + .fo(CarbonDioxide.getGas(2000), Fluorine.getGas(1000)).add("alumina_charcoal", 2040, 16); + ELECTROLYZING.RB().ii(DUST.getMaterialIngredient(Coal, 3), DUST.getMaterialIngredient(Alumina, 10)) + .fi(AluminiumFluoride.getLiquid(L / 36), Cryolite.getLiquid(L / 72)).io(DUST.get(Aluminium, 4)) + .fo(CarbonDioxide.getGas(2000), Fluorine.getGas(1000)).add("alumina_coal", 2040, 16); } } diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java b/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java index eb535a702..4aa0a7500 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java +++ b/common/src/main/java/muramasa/gregtech/loader/multi/Blasting.java @@ -89,9 +89,6 @@ public static void init() { addCalciteRecipe(Stibnite, 4, INGOT.get(Antimony, 1)); addCalciteRecipe(Tetrahedrite, 12, INGOT.get(Copper, 3), INGOT.get(Antimony, 1), INGOT.get(Iron, 1)); addCalciteRecipe(Malachite, 15, INGOT.get(Copper, 2)); - BLASTING.RB().ii(DUST.getMaterialIngredient(Alumina, 4), DUST.getMaterialIngredient(Calcite, 1)).io(INGOT.get(Aluminium)).add("alumina_calcite", 4 * 100, 120); - BLASTING.RB().ii(DUST.getMaterialIngredient(Alumina, 4), DUST.getMaterialIngredient(Limestone, 1)).io(INGOT.get(Aluminium)).add("alumina_limestone", 4 * 100, 120); - BLASTING.RB().ii(DUST.getMaterialIngredient(Alumina, 4), DUST.getMaterialIngredient(Marble, 1)).io(INGOT.get(Aluminium)).add("alumina_marble", 4 * 100, 120); /* Annealed Copper*/ BLASTING.RB().temperature(1200).ii(DUST.getMaterialIngredient(Copper, 1)) .fi(Oxygen.getGas(1000))